* Makefile.am: Here.
* python/Makefile.am: Likewise.
(python_PYTHON): Move data.py...
(EXTRA_DIST): ...here.
---
swilena/ChangeLog | 9 +++++++++
swilena/python/Makefile.am | 12 +++++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/swilena/ChangeLog b/swilena/ChangeLog
index 6d31d60..c5aed82 100644
--- a/swilena/ChangeLog
+++ b/swilena/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-27 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Clean up Swilena Makefiles.
+
+ * Makefile.am: Here.
+ * python/Makefile.am: Likewise.
+ (python_PYTHON): Move data.py...
+ (EXTRA_DIST): ...here.
+
2010-10-25 Roland Levillain <roland(a)lrde.epita.fr>
Fix Swilena's dependency tracking.
diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am
index 531880f..e522233 100644
--- a/swilena/python/Makefile.am
+++ b/swilena/python/Makefile.am
@@ -15,6 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
+
## ------------------ ##
## Generic material. ##
## ------------------ ##
@@ -26,11 +27,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
@AMDEP_TRUE@ if $(SWIG) $(AM_SWIGFLAGS) $(SWIGFLAGS) -MD -MF
"$(DEPDIR)/$*-wrap.Tcc" -o $@ $<; then \
@AMDEP_TRUE@ mv -f "$(DEPDIR)/$*-wrap.Tcc"
"$(DEPDIR)/$*-wrap.Pcc";\
@@ -44,8 +45,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
## ----------------- ##
@@ -217,7 +219,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