r15011 - gnucash/branches/swig-redo - Distribute SWIG interface files. Remove generated wrapper sources from

Andreas Köhler andi5 at cvs.gnucash.org
Wed Oct 11 20:52:26 EDT 2006


Author: andi5
Date: 2006-10-11 20:52:23 -0400 (Wed, 11 Oct 2006)
New Revision: 15011
Trac: http://svn.gnucash.org/trac/changeset/15011

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:
Distribute SWIG interface files. Remove generated wrapper sources from
BUILT_SOURCES and add them to MAINTAINERCLEANFILES.



Property changes on: gnucash/branches/swig-redo
___________________________________________________________________
Name: svk:merge
   - 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:780
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:12971
   + 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:784
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-11 20:55:52 UTC (rev 15010)
+++ gnucash/branches/swig-redo/src/app-utils/Makefile.am	2006-10-12 00:52:23 UTC (rev 15011)
@@ -95,6 +95,7 @@
 noinst_DATA = .scm-links
 
 EXTRA_DIST = \
+  app-utils.i \
   ${gncmod_DATA} \
   ${gncscm_DATA}
 
@@ -115,5 +116,5 @@
 endif
 	touch .scm-links
 
-BUILT_SOURCES = swig-app-utils.c
-CLEANFILES = $(BUILT_SOURCES) ${SCM_FILE_LINKS} gnucash .scm-links
+CLEANFILES = ${SCM_FILE_LINKS} gnucash .scm-links
+MAINTAINERCLEANFILES = swig-app-utils.c

Modified: gnucash/branches/swig-redo/src/business/business-core/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/business/business-core/Makefile.am	2006-10-11 20:55:52 UTC (rev 15010)
+++ gnucash/branches/swig-redo/src/business/business-core/Makefile.am	2006-10-12 00:52:23 UTC (rev 15011)
@@ -72,7 +72,7 @@
 gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
 gncmod_DATA = business-core.scm
 
-EXTRA_DIST = ${gncmod_DATA}
+EXTRA_DIST = business-core.i ${gncmod_DATA}
 
 if GNUCASH_SEPARATE_BUILDDIR
 #For executing test cases
@@ -91,6 +91,5 @@
 
 noinst_DATA = .scm-links
 
-BUILT_SOURCES = swig-business-core.c
-CLEANFILES = $(BUILT_SOURCES) \
-	gnucash .scm-links ${SCM_FILE_LINKS}
+CLEANFILES = gnucash .scm-links ${SCM_FILE_LINKS}
+MAINTAINERCLEANFILES = swig-business-core.c

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-11 20:55:52 UTC (rev 15010)
+++ gnucash/branches/swig-redo/src/business/dialog-tax-table/Makefile.am	2006-10-12 00:52:23 UTC (rev 15011)
@@ -50,6 +50,7 @@
 glade_DATA = tax-tables.glade
 
 EXTRA_DIST = \
+  dialog-tax-table.i \
   ${glade_DATA} \
   ${gncmod_DATA}
 
@@ -70,5 +71,5 @@
 	touch .scm-links
 
 noinst_DATA = .scm-links
-BUILT_SOURCES = swig-dialog-tax-table.c
-CLEANFILES = $(BUILT_SOURCES) gnucash .scm-links ${SCM_FILE_LINKS}
+CLEANFILES = gnucash .scm-links ${SCM_FILE_LINKS}
+MAINTAINERCLEANFILES = swig-dialog-tax-table.c

Modified: gnucash/branches/swig-redo/src/core-utils/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/core-utils/Makefile.am	2006-10-11 20:55:52 UTC (rev 15010)
+++ gnucash/branches/swig-redo/src/core-utils/Makefile.am	2006-10-12 00:52:23 UTC (rev 15011)
@@ -42,6 +42,6 @@
 gncmod_DATA = core-utils.scm
 
 noinst_DATA = .scm-links
-EXTRA_DIST = $(gncmod_DATA)
-BUILT_SOURCES = swig-core-utils.c
-CLEANFILES = $(BUILT_SOURCES) gnucash .scm-links
+EXTRA_DIST = $(gncmod_DATA) core-utils.i
+CLEANFILES = gnucash .scm-links
+MAINTAINERCLEANFILES = swig-core-utils.c

Modified: gnucash/branches/swig-redo/src/engine/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/engine/Makefile.am	2006-10-11 20:55:52 UTC (rev 15010)
+++ gnucash/branches/swig-redo/src/engine/Makefile.am	2006-10-12 00:52:23 UTC (rev 15011)
@@ -135,6 +135,7 @@
   gncla-dir.h.in \
   kvp_doc.txt \
   SX-book-p.h \
+  engine.i \
   ${gncmod_DATA} \
   ${gncscm_DATA}
 
@@ -174,7 +175,8 @@
 	mv $@.tmp $@
 
 BUILT_SOURCES = iso-4217-currencies.c \
-  gncla-dir.h swig-engine.c
+  gncla-dir.h
 
 CLEANFILES = $(BUILT_SOURCES) gnucash .scm-links gncla-dir.h \
 	${SCM_FILE_LINKS}
+MAINTAINERCLEANFILES = swig-engine.c

Modified: gnucash/branches/swig-redo/src/gnc-module/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/gnc-module/Makefile.am	2006-10-11 20:55:52 UTC (rev 15010)
+++ gnucash/branches/swig-redo/src/gnc-module/Makefile.am	2006-10-12 00:52:23 UTC (rev 15011)
@@ -30,7 +30,8 @@
 	swig -guile $(SWIG_ARGS) -Linkage module -o $@ $<
 
 EXTRA_DIST = \
-  ${gncmod_DATA}
+  ${gncmod_DATA} \
+  gnc-module.i
 
 if GNUCASH_SEPARATE_BUILDDIR
 #For executing test cases
@@ -47,6 +48,5 @@
 endif
 	touch .scm-links
 
-BUILT_SOURCES = swig-gnc-module.c
-CLEANFILES = $(BUILT_SOURCES) .scm-links gnucash \
-	${SCM_FILE_LINKS}
+CLEANFILES = .scm-links gnucash ${SCM_FILE_LINKS}
+MAINTAINERCLEANFILES = swig-gnc-module.c

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-11 20:55:52 UTC (rev 15010)
+++ gnucash/branches/swig-redo/src/gnc-module/test/mod-bar/Makefile.am	2006-10-12 00:52:23 UTC (rev 15011)
@@ -10,8 +10,11 @@
 
 libbar_la_SOURCES = bar.c
 
+# Make swig-bar.c for dist. It is an automatic dependency
+# of gnc-mod-bar.c
 noinst_HEADERS = \
-  bar.h
+  bar.h \
+  swig-bar.c
 
 libgncmodbar_la_SOURCES=gnc-mod-bar.c
 
@@ -25,8 +28,7 @@
   bar.i \
   gnucash/bar.scm
 
-BUILT_SOURCES = swig-bar.c
-CLEANFILES = $(BUILT_SOURCES)
+MAINTAINERCLEANFILES = swig-bar.c
 
 # Keep automake from generating install targets for test libs
 install-checklibLTLIBRARIES:

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-11 20:55:52 UTC (rev 15010)
+++ gnucash/branches/swig-redo/src/gnc-module/test/mod-baz/Makefile.am	2006-10-12 00:52:23 UTC (rev 15011)
@@ -12,8 +12,11 @@
 libbaz_la_SOURCES = baz.c
 libbaz_la_LIBADD = ../mod-foo/libfoo.la
 
+# Make swig-baz.c for dist. It is an automatic dependency
+# of gnc-mod-baz.c
 noinst_HEADERS = \
-  baz.h
+  baz.h \
+  swig-baz.c
 
 libgncmodbaz_la_SOURCES = gnc-mod-baz.c
 
@@ -29,8 +32,7 @@
   baz.i \
   gnucash/baz.scm
 
-BUILT_SOURCES = swig-baz.c
-CLEANFILES = $(BUILT_SOURCES)
+MAINTAINERCLEANFILES = swig-baz.c
 
 # Keep automake from generating install targets for test libs
 install-checklibLTLIBRARIES:

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-11 20:55:52 UTC (rev 15010)
+++ gnucash/branches/swig-redo/src/gnc-module/test/mod-foo/Makefile.am	2006-10-12 00:52:23 UTC (rev 15011)
@@ -10,8 +10,11 @@
 
 libfoo_la_SOURCES = foo.c
 
+# Make swig-foo.c for dist. It is an automatic dependency
+# of gnc-mod-foo.c
 noinst_HEADERS = \
-  foo.h
+  foo.h \
+  swig-foo.c
 
 libgncmodfoo_la_SOURCES = gnc-mod-foo.c
 
@@ -26,8 +29,7 @@
 swig-foo.c: foo.i
 	swig -guile $(SWIG_ARGS) -Linkage module -o $@ $<
 
-BUILT_SOURCES = swig-foo.c
-CLEANFILES = $(BUILT_SOURCES)
+MAINTAINERCLEANFILES = swig-foo.c
 
 # Keep automake from generating install targets for test libs
 install-checklibLTLIBRARIES:

Modified: gnucash/branches/swig-redo/src/gnome/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/gnome/Makefile.am	2006-10-11 20:55:52 UTC (rev 15010)
+++ gnucash/branches/swig-redo/src/gnome/Makefile.am	2006-10-12 00:52:23 UTC (rev 15011)
@@ -93,7 +93,8 @@
 	-I${top_srcdir}/src/engine -o $@ $<
 
 EXTRA_DIST = \
-  gnucash.desktop.in
+  gnucash.desktop.in \
+  gnome.i
 
 AM_CFLAGS = \
   -I${top_srcdir}/src \
@@ -137,6 +138,6 @@
 endif
 	touch .scm-links
 
-BUILT_SOURCES = swig-gnome.c
-CLEANFILES = $(BUILT_SOURCES) gnucash.desktop \
+CLEANFILES = gnucash.desktop \
 	gnucash .scm-links ${SCM_FILE_LINKS}
+MAINTAINERCLEANFILES = swig-gnome.c

Modified: gnucash/branches/swig-redo/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/gnome-utils/Makefile.am	2006-10-11 20:55:52 UTC (rev 15010)
+++ gnucash/branches/swig-redo/src/gnome-utils/Makefile.am	2006-10-12 00:52:23 UTC (rev 15011)
@@ -206,6 +206,7 @@
 EXTRA_DIST = \
   gnc-dir.h.in \
   gnc-svninfo.h \
+  gnome-utils.i \
   ${gncmod_DATA} \
   ${gncscm_DATA}
 
@@ -285,8 +286,8 @@
 
 noinst_DATA = .scm-links
 
-BUILT_SOURCES += swig-gnome-utils.c
 CLEANFILES = $(BUILT_SOURCES) gnucash .scm-links ${SCM_FILE_LINKS}
+MAINTAINERCLEANFILES = swig-gnome-utils.c
 
 #
 # I hate inconsistent standards. Autotools puts help files into

Modified: gnucash/branches/swig-redo/src/report/report-gnome/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/report/report-gnome/Makefile.am	2006-10-11 20:55:52 UTC (rev 15010)
+++ gnucash/branches/swig-redo/src/report/report-gnome/Makefile.am	2006-10-12 00:52:23 UTC (rev 15011)
@@ -68,6 +68,7 @@
 	gnc-plugin-page-report-ui.xml
 
 EXTRA_DIST = \
+  report-gnome.i \
   ${glade_DATA} \
   ${gncmod_DATA} \
   ${ui_DATA}
@@ -89,5 +90,5 @@
 endif
 	touch .scm-links
 
-BUILT_SOURCES = swig-report-gnome.c
-CLEANFILES = $(BUILT_SOURCES) gnucash report .scm-links ${SCM_FILE_LINKS}
+CLEANFILES = gnucash report .scm-links ${SCM_FILE_LINKS}
+MAINTAINERCLEANFILES = swig-report-gnome.c

Modified: gnucash/branches/swig-redo/src/report/report-system/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/report/report-system/Makefile.am	2006-10-11 20:55:52 UTC (rev 15010)
+++ gnucash/branches/swig-redo/src/report/report-system/Makefile.am	2006-10-12 00:52:23 UTC (rev 15011)
@@ -69,7 +69,7 @@
 
 noinst_DATA = .scm-links
 
-EXTRA_DIST = ${gncscmmod_DATA} ${gncscm_DATA}
+EXTRA_DIST = report-system.i ${gncscmmod_DATA} ${gncscm_DATA}
 
-BUILT_SOURCES = swig-report-system.c
-CLEANFILES = $(BUILT_SOURCES) gnucash report .scm-links ${SCM_FILE_LINKS}
+CLEANFILES = gnucash report .scm-links ${SCM_FILE_LINKS}
+MAINTAINERCLEANFILES = swig-report-system.c



More information about the gnucash-changes mailing list