Update of /cvsroot/monetdb/buildtools/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30147/buildtools/conf
Modified Files:
Tag: MonetDB_1-20
rules.mk
Log Message:
for portability reasons:
ensure that our own configure-generated header-file $(CONFIG_H)
is the very first include also in swig-generated code
(using the same "trick" as with [f]lex-generated code)
Index: rules.mk
===================================================================
RCS file: /cvsroot/monetdb/buildtools/conf/rules.mk,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- rules.mk 23 Jun 2007 07:07:18 -0000 1.3
+++ rules.mk 7 Nov 2007 07:58:33 -0000 1.3.2.1
@@ -125,32 +125,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_H)" 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_H)"'>' > $@
+ grep -v '^#include.*[<"]'"$(CONFIG_H)"'[">]' [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_H)"'>' > $@
+ grep -v '^#include.*[<"]'"$(CONFIG_H)"'[">]' [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_H)"'>' > $@
+ grep -v '^#include.*[<"]'"$(CONFIG_H)"'[">]' [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_H)"'>' > $@
+ grep -v '^#include.*[<"]'"$(CONFIG_H)"'[">]' [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_H)"'>' > $@
+ grep -v '^#include.*[<"]'"$(CONFIG_H)"'[">]' [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
