* python/Makefile.am (%-wrap.cc %.py): Honor Automake's `AMDEP'
internal conditional.
---
swilena/ChangeLog | 7 +++++++
swilena/python/Makefile.am | 11 ++++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/swilena/ChangeLog b/swilena/ChangeLog
index d2e2998..6d31d60 100644
--- a/swilena/ChangeLog
+++ b/swilena/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-25 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Fix Swilena's dependency tracking.
+
+ * python/Makefile.am (%-wrap.cc %.py): Honor Automake's `AMDEP'
+ internal conditional.
+
2010-04-26 Roland Levillain <roland(a)lrde.epita.fr>
Canonize Swilena's tests' output file names.
diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am
index df28551..531880f 100644
--- a/swilena/python/Makefile.am
+++ b/swilena/python/Makefile.am
@@ -32,11 +32,12 @@ AM_LDFLAGS = -avoid-version -module -shared
## 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";\
- else \
- rm -f "$(DEPDIR)/$*-wrap.Tcc"; exit 1;\
- fi
+@AMDEP_TRUE@ if $(SWIG) $(AM_SWIGFLAGS) $(SWIGFLAGS) -MD -MF
"$(DEPDIR)/$*-wrap.Tcc" -o $@ $<; then \
+@AMDEP_TRUE@ mv -f "$(DEPDIR)/$*-wrap.Tcc"
"$(DEPDIR)/$*-wrap.Pcc";\
+@AMDEP_TRUE@ else \
+@AMDEP_TRUE@ rm -f "$(DEPDIR)/$*-wrap.Tcc"; exit 1;\
+@AMDEP_TRUE@ fi
+@AMDEP_FALSE@ $(SWIG) $(AM_SWIGFLAGS) $(SWIGFLAGS) -o $@ $<
# ltihooks.py: Python import hooks that understand Libtool libraries.
--
1.5.6.5
Show replies by date