Update of /cvsroot/monetdb/buildtools/mel
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31236/mel
Modified Files:
rules.mk
Log Message:
propagated changes of Tuesday Nov 06 2007 - Thursday Nov 08 2007
from the MonetDB_1-20 branch to the development trunk
Index: rules.mk
===================================================================
RCS file: /cvsroot/monetdb/buildtools/mel/rules.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- rules.mk 23 Jun 2007 07:07:21 -0000 1.6
+++ rules.mk 8 Nov 2007 11:20:42 -0000 1.7
@@ -128,32 +128,54 @@
# .xx file. There may be a race condition here when using a parallel
# make. We try to alleviate the problem by sending the .xx.c output
# to a dummy file in the second rule.
+# We also make sure that "$(CONFIG_HEADER)" is included first, also with
swig-generated files.
+# This is crucial to prevent inconsistent (re-)definitions of macros.
%.ruby.c: %.ruby.i
$(SWIG) -ruby $(SWIGFLAGS) -outdir . -o $@ $<
+ $(MV) $@ [EMAIL PROTECTED]
+ echo '#include <'"$(CONFIG_HEADER)"'>' > $@
+ grep -v '^#include.*[<"]'"$(CONFIG_HEADER)"'[">]' [EMAIL PROTECTED] >>
$@
+ $(RM) [EMAIL PROTECTED]
%.ruby: %.ruby.i
$(SWIG) -ruby $(SWIGFLAGS) -outdir . -o dymmy.c $<
%.tcl.c: %.tcl.i
$(SWIG) -tcl $(SWIGFLAGS) -outdir . -o $@ $<
+ $(MV) $@ [EMAIL PROTECTED]
+ echo '#include <'"$(CONFIG_HEADER)"'>' > $@
+ grep -v '^#include.*[<"]'"$(CONFIG_HEADER)"'[">]' [EMAIL PROTECTED] >>
$@
+ $(RM) [EMAIL PROTECTED]
%.tcl: %.tcl.i
$(SWIG) -tcl $(SWIGFLAGS) -outdir . -o dymmy.c $<
%.php.c: %.php.i
$(SWIG) -php $(SWIGFLAGS) -outdir . -o $@ $<
+ $(MV) $@ [EMAIL PROTECTED]
+ echo '#include <'"$(CONFIG_HEADER)"'>' > $@
+ grep -v '^#include.*[<"]'"$(CONFIG_HEADER)"'[">]' [EMAIL PROTECTED] >>
$@
+ $(RM) [EMAIL PROTECTED]
%.php: %.php.i
$(SWIG) -php $(SWIGFLAGS) -outdir . -o dymmy.c $<
%.py.c: %.py.i
$(SWIG) -python $(SWIGFLAGS) -outdir . -o $@ $<
+ $(MV) $@ [EMAIL PROTECTED]
+ echo '#include <'"$(CONFIG_HEADER)"'>' > $@
+ grep -v '^#include.*[<"]'"$(CONFIG_HEADER)"'[">]' [EMAIL PROTECTED] >>
$@
+ $(RM) [EMAIL PROTECTED]
%.py: %.py.i
$(SWIG) -python $(SWIGFLAGS) -outdir . -o dymmy.c $<
%.pm.c: %.pm.i
$(SWIG) -perl5 $(SWIGFLAGS) -outdir . -o $@ $<
+ $(MV) $@ [EMAIL PROTECTED]
+ echo '#include <'"$(CONFIG_HEADER)"'>' > $@
+ grep -v '^#include.*[<"]'"$(CONFIG_HEADER)"'[">]' [EMAIL PROTECTED] >>
$@
+ $(RM) [EMAIL PROTECTED]
%.pm: %.pm.i
$(SWIG) -perl5 $(SWIGFLAGS) -outdir . -o dymmy.c $<
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
