r15017 - gnucash/branches/swig-redo - Call swig as $(SWIG) and make these rules conditional on

Andreas Köhler andi5 at cvs.gnucash.org
Fri Oct 13 15:08:30 EDT 2006 

Author: andi5
Date: 2006-10-13 15:08:28 -0400 (Fri, 13 Oct 2006)
New Revision: 15017
Trac: http://svn.gnucash.org/trac/changeset/15017

Modified:
   gnucash/branches/swig-redo/
   gnucash/branches/swig-redo/src/app-utils/Makefile.am
   gnucash/branches/swig-redo/src/business/business-core/Makefile.am
   gnucash/branches/swig-redo/src/business/dialog-tax-table/Makefile.am
   gnucash/branches/swig-redo/src/core-utils/Makefile.am
   gnucash/branches/swig-redo/src/engine/Makefile.am
   gnucash/branches/swig-redo/src/gnc-module/Makefile.am
   gnucash/branches/swig-redo/src/gnc-module/test/mod-bar/Makefile.am
   gnucash/branches/swig-redo/src/gnc-module/test/mod-baz/Makefile.am
   gnucash/branches/swig-redo/src/gnc-module/test/mod-foo/Makefile.am
   gnucash/branches/swig-redo/src/gnome-utils/Makefile.am
   gnucash/branches/swig-redo/src/gnome/Makefile.am
   gnucash/branches/swig-redo/src/report/report-gnome/Makefile.am
   gnucash/branches/swig-redo/src/report/report-system/Makefile.am
Log:
Call swig as $(SWIG) and make these rules conditional on
BUILDING_FROM_SVN.



Property changes on: gnucash/branches/swig-redo
___________________________________________________________________
Name: svk:merge
   - 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:789
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:12971
   + 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:794
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:12971

Modified: gnucash/branches/swig-redo/src/app-utils/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/app-utils/Makefile.am	2006-10-13 13:36:33 UTC (rev 15016)
+++ gnucash/branches/swig-redo/src/app-utils/Makefile.am	2006-10-13 19:08:28 UTC (rev 15017)
@@ -75,9 +75,11 @@
   ${QOF_LIBS} \
   ${GLIB_LIBS}
 
+if BUILDING_FROM_SVN
 swig-app-utils.c: app-utils.i ${gncinclude_HEADERS}
-	swig -guile $(SWIG_ARGS) -Linkage module \
+	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src/engine -I${top_srcdir}/lib/libqof/qof -o $@ $<
+endif
 
 gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
 gncmod_DATA = app-utils.scm 

Modified: gnucash/branches/swig-redo/src/business/business-core/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/business/business-core/Makefile.am	2006-10-13 13:36:33 UTC (rev 15016)
+++ gnucash/branches/swig-redo/src/business/business-core/Makefile.am	2006-10-13 19:08:28 UTC (rev 15017)
@@ -65,9 +65,11 @@
 
 # business-core-helpers.c
 
+if BUILDING_FROM_SVN
 swig-business-core.c: business-core.i ${noinst_HEADERS}
-	swig -guile $(SWIG_ARGS) -Linkage module \
+	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src/engine -o $@ $<
+endif
 
 gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
 gncmod_DATA = business-core.scm

Modified: gnucash/branches/swig-redo/src/business/dialog-tax-table/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/business/dialog-tax-table/Makefile.am	2006-10-13 13:36:33 UTC (rev 15016)
+++ gnucash/branches/swig-redo/src/business/dialog-tax-table/Makefile.am	2006-10-13 19:08:28 UTC (rev 15017)
@@ -40,8 +40,10 @@
   ${QOF_LIBS} \
   ${EFENCE_LIBS}
 
+if BUILDING_FROM_SVN
 swig-dialog-tax-table.c: dialog-tax-table.i ${noinst_HEADERS}
-	swig -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+	$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+endif
 
 gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
 gncmod_DATA = dialog-tax-table.scm

Modified: gnucash/branches/swig-redo/src/core-utils/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/core-utils/Makefile.am	2006-10-13 13:36:33 UTC (rev 15016)
+++ gnucash/branches/swig-redo/src/core-utils/Makefile.am	2006-10-13 19:08:28 UTC (rev 15017)
@@ -24,8 +24,10 @@
   gnc-gobject-utils.h \
   gnc-gtk-utils.h
 
+if BUILDING_FROM_SVN
 swig-core-utils.c: core-utils.i
-	swig -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+	$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+endif
 
 AM_CFLAGS = \
   ${GUILE_INCS} \

Modified: gnucash/branches/swig-redo/src/engine/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/engine/Makefile.am	2006-10-13 13:36:33 UTC (rev 15016)
+++ gnucash/branches/swig-redo/src/engine/Makefile.am	2006-10-13 19:08:28 UTC (rev 15017)
@@ -160,9 +160,11 @@
 
 noinst_DATA = .scm-links
 
+if BUILDING_FROM_SVN
 swig-engine.c: engine.i ${gncinclude_HEADERS} ${noinst_HEADERS}
-	swig -guile $(SWIG_ARGS) -Linkage module \
+	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/lib/libqof/qof -o $@ $<
+endif
 
 iso-4217-currencies.c: iso-4217-currencies.scm iso-currencies-to-c
 	-chmod u+x ${srcdir}/iso-currencies-to-c

Modified: gnucash/branches/swig-redo/src/gnc-module/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/gnc-module/Makefile.am	2006-10-13 13:36:33 UTC (rev 15016)
+++ gnucash/branches/swig-redo/src/gnc-module/Makefile.am	2006-10-13 19:08:28 UTC (rev 15017)
@@ -26,8 +26,10 @@
 
 noinst_DATA = .scm-links
 
+if BUILDING_FROM_SVN
 swig-gnc-module.c: gnc-module.i
-	swig -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+	$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+endif
 
 EXTRA_DIST = \
   ${gncmod_DATA} \

Modified: gnucash/branches/swig-redo/src/gnc-module/test/mod-bar/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/gnc-module/test/mod-bar/Makefile.am	2006-10-13 13:36:33 UTC (rev 15016)
+++ gnucash/branches/swig-redo/src/gnc-module/test/mod-bar/Makefile.am	2006-10-13 19:08:28 UTC (rev 15017)
@@ -21,8 +21,10 @@
 libgncmodbar_la_LIBADD=libbar.la \
   $(GLIB_LIBS)
 
+if BUILDING_FROM_SVN
 swig-bar.c: bar.i
-	swig -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+	$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+endif
 
 EXTRA_DIST = \
   bar.i \

Modified: gnucash/branches/swig-redo/src/gnc-module/test/mod-baz/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/gnc-module/test/mod-baz/Makefile.am	2006-10-13 13:36:33 UTC (rev 15016)
+++ gnucash/branches/swig-redo/src/gnc-module/test/mod-baz/Makefile.am	2006-10-13 19:08:28 UTC (rev 15017)
@@ -25,8 +25,10 @@
   ../../libgncmodule.la \
   $(GLIB_LIBS)
 
+if BUILDING_FROM_SVN
 swig-baz.c: baz.i
-	swig -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+	$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+endif
 
 EXTRA_DIST = \
   baz.i \

Modified: gnucash/branches/swig-redo/src/gnc-module/test/mod-foo/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/gnc-module/test/mod-foo/Makefile.am	2006-10-13 13:36:33 UTC (rev 15016)
+++ gnucash/branches/swig-redo/src/gnc-module/test/mod-foo/Makefile.am	2006-10-13 19:08:28 UTC (rev 15017)
@@ -26,8 +26,10 @@
   foo.i \
   gnucash/foo.scm
 
+if BUILDING_FROM_SVN
 swig-foo.c: foo.i
-	swig -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+	$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+endif
 
 BUILT_SOURCES = swig-foo.c
 MAINTAINERCLEANFILES = swig-foo.c

Modified: gnucash/branches/swig-redo/src/gnome/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/gnome/Makefile.am	2006-10-13 13:36:33 UTC (rev 15016)
+++ gnucash/branches/swig-redo/src/gnome/Makefile.am	2006-10-13 19:08:28 UTC (rev 15017)
@@ -88,9 +88,11 @@
   top-level.h \
   window-reconcile.h
 
+if BUILDING_FROM_SVN
 swig-gnome.c: gnome.i ${noinst_HEADERS}
-	swig -guile $(SWIG_ARGS) -Linkage module \
+	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src/engine -o $@ $<
+endif
 
 EXTRA_DIST = \
   gnucash.desktop.in \

Modified: gnucash/branches/swig-redo/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/gnome-utils/Makefile.am	2006-10-13 13:36:33 UTC (rev 15016)
+++ gnucash/branches/swig-redo/src/gnome-utils/Makefile.am	2006-10-13 19:08:28 UTC (rev 15017)
@@ -193,9 +193,11 @@
   ${GOFFICE_LIBS} \
   ${LIBXML2_LIBS}
 
+if BUILDING_FROM_SVN
 swig-gnome-utils.c: gnome-utils.i ${noinst_HEADERS} ${gncinclude_HEADERS}
-	swig -guile $(SWIG_ARGS) -Linkage module \
+	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src/engine -o $@ $<
+endif
 
 gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
 gncmod_DATA = gnome-utils.scm 

Modified: gnucash/branches/swig-redo/src/report/report-gnome/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/report/report-gnome/Makefile.am	2006-10-13 13:36:33 UTC (rev 15016)
+++ gnucash/branches/swig-redo/src/report/report-gnome/Makefile.am	2006-10-13 19:08:28 UTC (rev 15017)
@@ -50,9 +50,11 @@
   ${QOF_LIBS} \
   ${GLIB_LIBS}
 
+if BUILDING_FROM_SVN
 swig-report-gnome.c: report-gnome.i ${gncinclude_HEADERS}
-	swig -guile $(SWIG_ARGS) -Linkage module \
+	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src/engine -o $@ $<
+endif
 
 gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report
 gncmod_DATA = report-gnome.scm

Modified: gnucash/branches/swig-redo/src/report/report-system/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/report/report-system/Makefile.am	2006-10-13 13:36:33 UTC (rev 15016)
+++ gnucash/branches/swig-redo/src/report/report-system/Makefile.am	2006-10-13 19:08:28 UTC (rev 15017)
@@ -17,8 +17,10 @@
   ${GUILE_LIBS} \
   ${GLIB_LIBS}
 
+if BUILDING_FROM_SVN
 swig-report-system.c: report-system.i ${gncinclude_HEADERS}
-	swig -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+	$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+endif
 
 AM_CFLAGS = \
   -I${top_srcdir}/src \

More information about the gnucash-changes mailing list