* Makefile.am: Here. * python/Makefile.am: Likewise. (python_PYTHON): Move data.py... (EXTRA_DIST): ...here. --- swilena/ChangeLog | 9 +++++++++ swilena/Makefile.am | 3 --- swilena/python/Makefile.am | 13 ++++++------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index efa4e9b..3232f15 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,12 @@ +2009-10-27 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Clean up Swilena Makefiles. + + * Makefile.am: Here. + * python/Makefile.am: Likewise. + (python_PYTHON): Move data.py... + (EXTRA_DIST): ...here. + 2009-09-12 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; * neighb2d.i: Aesthetic changes. diff --git a/swilena/Makefile.am b/swilena/Makefile.am index c6fd023..109fb2e 100644 --- a/swilena/Makefile.am +++ b/swilena/Makefile.am @@ -14,9 +14,6 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. - -## Process this file through Automake to produce Makefile.in. - SUBDIRS = python # Meta-wrappers (templates), not generating a module, but factoring diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index aec8a05..0ad96da 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -13,9 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# -## Process this file through Automake to produce Makefile.in. ## ------------------ ## ## Generic material. ## @@ -28,11 +26,11 @@ AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_srcdir)/milena TOOLS_CXXFLAGS = @TOOLS_CXXFLAGS@ AM_CXXFLAGS = $(TOOLS_CXXFLAGS) AM_SWIGFLAGS = -Wall -c++ -python -I$(top_srcdir)/milena -## We build modules, not plain libs. +# We build modules, not plain libs. AM_LDFLAGS = -avoid-version -module -shared -## Run Swig to create the C++ wrapper files, the Python interface -## files, and the dependency Makefile snippets. +# Run Swig to create the C++ wrapper files, the Python interface +# files, and the dependency Makefile snippets. %-wrap.cc %.py: $(top_srcdir)/swilena/%.i if $(SWIG) $(AM_SWIGFLAGS) $(SWIGFLAGS) -MD -MF "$(DEPDIR)/$*-wrap.Tcc" -o $@ $<; then \ mv -f "$(DEPDIR)/$*-wrap.Tcc" "$(DEPDIR)/$*-wrap.Pcc";\ @@ -45,8 +43,9 @@ AM_LDFLAGS = -avoid-version -module -shared python_PYTHON = ltihooks.py # swilena.py: The whole Swilena suite. python_PYTHON += swilena.py + # data.py: Access to the data of the distribution (images, meshes, etc.) -python_PYTHON += data.py +EXTRA_DIST = data.py ## ----------------- ## @@ -218,7 +217,7 @@ $(TESTS): $(srcdir)/run.stamp # The dependency is on `run.in' and not `run', since `run' is # regenerated at distribution time, and voids the time stamps (which # we don't want!). -EXTRA_DIST = $(srcdir)/run.stamp +EXTRA_DIST += $(srcdir)/run.stamp $(srcdir)/run.stamp: $(RUN_IN) @rm -f $@ @rm -f $@.tmp -- 1.5.6.5