r14997 - gnucash/branches/swig-redo - Remove more remnants of G-wrap
Derek Atkins
warlord at cvs.gnucash.org
Tue Oct 10 19:08:34 EDT 2006
Author: warlord
Date: 2006-10-10 19:08:31 -0400 (Tue, 10 Oct 2006)
New Revision: 14997
Trac: http://svn.gnucash.org/trac/changeset/14997
Modified:
gnucash/branches/swig-redo/configure.in
gnucash/branches/swig-redo/src/app-utils/Makefile.am
gnucash/branches/swig-redo/src/app-utils/test/Makefile.am
gnucash/branches/swig-redo/src/backend/file/test/Makefile.am
gnucash/branches/swig-redo/src/backend/postgres/test/Makefile.am
gnucash/branches/swig-redo/src/business/business-core/Makefile.am
gnucash/branches/swig-redo/src/business/business-core/test/Makefile.am
gnucash/branches/swig-redo/src/business/business-gnome/Makefile.am
gnucash/branches/swig-redo/src/business/business-reports/Makefile.am
gnucash/branches/swig-redo/src/business/business-utils/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/engine/test/Makefile.am
gnucash/branches/swig-redo/src/gnome-search/Makefile.am
gnucash/branches/swig-redo/src/gnome-utils/Makefile.am
gnucash/branches/swig-redo/src/gnome-utils/test/Makefile.am
gnucash/branches/swig-redo/src/gnome/Makefile.am
gnucash/branches/swig-redo/src/import-export/Makefile.am
gnucash/branches/swig-redo/src/import-export/hbci/Makefile.am
gnucash/branches/swig-redo/src/import-export/mt940/Makefile.am
gnucash/branches/swig-redo/src/import-export/qif-import/Makefile.am
gnucash/branches/swig-redo/src/import-export/qif-io-core/test/Makefile.am
gnucash/branches/swig-redo/src/import-export/qif/Makefile.am
gnucash/branches/swig-redo/src/import-export/qif/test/Makefile.am
gnucash/branches/swig-redo/src/import-export/test/Makefile.am
gnucash/branches/swig-redo/src/network-utils/test/Makefile.am
gnucash/branches/swig-redo/src/register/register-core/Makefile.am
gnucash/branches/swig-redo/src/register/register-core/test/Makefile.am
gnucash/branches/swig-redo/src/register/register-gnome/test/Makefile.am
gnucash/branches/swig-redo/src/report/locale-specific/us/test/Makefile.am
gnucash/branches/swig-redo/src/report/report-gnome/Makefile.am
gnucash/branches/swig-redo/src/report/report-gnome/test/Makefile.am
gnucash/branches/swig-redo/src/report/report-system/Makefile.am
gnucash/branches/swig-redo/src/report/report-system/test/Makefile.am
gnucash/branches/swig-redo/src/report/standard-reports/test/Makefile.am
gnucash/branches/swig-redo/src/report/stylesheets/test/Makefile.am
gnucash/branches/swig-redo/src/report/utility-reports/Makefile.am
gnucash/branches/swig-redo/src/report/utility-reports/test/Makefile.am
gnucash/branches/swig-redo/src/tax/us/test/Makefile.am
Log:
Remove more remnants of G-wrap
- make sure we compile with GUILE_INCS and link with GUILE_LIBS
- remove G_WRAP compile and link macros
- remove G_WRAP module and lib dirs
- make sure .scm-links are built in every place where they're used.
Modified: gnucash/branches/swig-redo/configure.in
===================================================================
--- gnucash/branches/swig-redo/configure.in 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/configure.in 2006-10-10 23:08:31 UTC (rev 14997)
@@ -1927,8 +1927,8 @@
GNUCASH_ENGINE_BASE_LIBS="${GLIB_LIBS}"
GNUCASH_ENGINE_LIBS="-L${GNC_MODULE_DIR} -L${GNC_GWRAP_LIBDIR} ${GNUCASH_ENGINE_BASE_LIBS} ${GUILE_LIBS} -lgncmod-engine -lgw-engine -lgw-kvp -lgncmodule"
-GNUCASH_ENGINE_BASE_CFLAGS="-DGNUCASH ${GLIB_CFLAGS}"
-GNUCASH_ENGINE_CFLAGS="${GNUCASH_ENGINE_BASE_CFLAGS} ${GUILE_INCS}"
+GNUCASH_ENGINE_BASE_CFLAGS="-DGNUCASH ${GLIB_CFLAGS} ${GUILE_INCS}"
+GNUCASH_ENGINE_CFLAGS="${GNUCASH_ENGINE_BASE_CFLAGS}"
AC_SUBST(GNUCASH_ENGINE_BASE_LIBS)
AC_SUBST(GNUCASH_ENGINE_LIBS)
Modified: gnucash/branches/swig-redo/src/app-utils/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/app-utils/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/app-utils/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -10,7 +10,6 @@
-I${top_srcdir}/src/core-utils \
-I${top_srcdir}/src/engine \
${GUILE_INCS} \
- ${G_WRAP_COMPILE_ARGS} \
${GLIB_CFLAGS} \
${QOF_CFLAGS} \
${GCONF_CFLAGS} \
@@ -72,7 +71,6 @@
${top_builddir}/src/core-utils/libcore-utils.la \
${GCONF_LIBS} \
${GTK_LIBS} \
- ${G_WRAP_LINK_ARGS} \
${GUILE_LIBS} \
${QOF_LIBS} \
${GLIB_LIBS}
Modified: gnucash/branches/swig-redo/src/app-utils/test/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/app-utils/test/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/app-utils/test/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -22,14 +22,12 @@
--gnc-module-dir ${top_builddir}/src/app-utils \
--gnc-module-dir ${top_srcdir}/src/engine \
--gnc-module-dir ${top_srcdir}/src/app-utils \
- --guile-load-dir ${G_WRAP_MODULE_DIR} \
--guile-load-dir ${top_srcdir}/src/scm \
--guile-load-dir ${top_builddir}/src/scm \
--guile-load-dir ${top_builddir}/src/gnome-utils \
--guile-load-dir ${top_builddir}/src/gnome \
--library-dir ${top_builddir}/src/gnome-utils \
- --library-dir ${top_builddir}/src/gnome \
- --library-dir ${G_WRAP_LIB_DIR}
+ --library-dir ${top_builddir}/src/gnome
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/swig-redo/src/backend/file/test/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/backend/file/test/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/backend/file/test/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -181,9 +181,7 @@
--gnc-module-dir ${top_builddir}/src/gnc-module \
--gnc-module-dir ${top_builddir}/src/engine \
--gnc-module-dir ${top_srcdir}/src/gnc-module \
- --gnc-module-dir ${top_srcdir}/src/engine \
- --guile-load-dir ${G_WRAP_MODULE_DIR} \
- --library-dir ${G_WRAP_LIB_DIR}
+ --gnc-module-dir ${top_srcdir}/src/engine
TESTS_ENVIRONMENT := \
GNC_ACCOUNT_PATH=${top_srcdir}/accounts/C \
Modified: gnucash/branches/swig-redo/src/backend/postgres/test/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/backend/postgres/test/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/backend/postgres/test/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -8,9 +8,7 @@
--gnc-module-dir ${top_builddir}/src/engine \
--guile-load-dir ${top_srcdir}/src/engine \
--gnc-module-dir ${top_builddir}/src/backend/file \
- --gnc-module-dir ${top_builddir}/src/backend/postgres \
- --guile-load-dir ${G_WRAP_MODULE_DIR} \
- --library-dir ${G_WRAP_LIB_DIR}
+ --gnc-module-dir ${top_builddir}/src/backend/postgres
TESTS_ENVIRONMENT := \
TEST_DB_SOCKET_DIR=`pwd`/gnc_test_db_sock \
Modified: gnucash/branches/swig-redo/src/business/business-core/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/business/business-core/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/business/business-core/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -7,7 +7,6 @@
-I${top_srcdir}/src \
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/gnc-module \
- ${G_WRAP_COMPILE_ARGS} \
${GUILE_INCS} \
${QOF_CFLAGS} \
${GLIB_CFLAGS}
@@ -59,7 +58,6 @@
libgncmod_business_core_la_LIBADD = \
${top_builddir}/src/gnc-module/libgncmodule.la \
${top_builddir}/src/engine/libgncmod-engine.la \
- ${G_WRAP_LINK_ARGS} \
${QOF_LIBS} \
${GUILE_LIBS} \
${GLIB_LIBS} \
@@ -91,6 +89,7 @@
endif
touch .scm-links
+noinst_DATA = .scm-links
BUILT_SOURCES = swig-business-core.c
CLEANFILES = $(BUILT_SOURCES) \
Modified: gnucash/branches/swig-redo/src/business/business-core/test/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/business/business-core/test/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/business/business-core/test/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -33,9 +33,7 @@
--gnc-module-dir ${top_builddir}/src/engine \
--gnc-module-dir ${top_builddir}/src/business/business-core \
--gnc-module-dir ${top_srcdir}/src/gnc-module \
- --gnc-module-dir ${top_srcdir}/src/engine \
- --library-dir ${G_WRAP_LIB_DIR} \
- --guile-load-dir ${G_WRAP_MODULE_DIR}
+ --gnc-module-dir ${top_srcdir}/src/engine
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/swig-redo/src/business/business-gnome/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/business/business-gnome/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/business/business-gnome/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -22,7 +22,6 @@
${GTKHTML_CFLAGS} \
${GDK_PIXBUF_CFLAGS} \
${GLIB_CFLAGS} \
- ${G_WRAP_COMPILE_ARGS} \
${GUILE_INCS} \
${QOF_CFLAGS} \
-I${top_srcdir}/src/register/register-core \
@@ -81,7 +80,6 @@
${top_builddir}/src/gnc-module/libgncmodule.la \
${GLADE_LIBS} \
${GNOME_LIBS} \
- ${G_WRAP_LINK_ARGS} \
${GUILE_LIBS} \
${GLIB_LIBS} \
${QOF_LIBS} \
@@ -114,5 +112,6 @@
endif
touch .scm-links
-BUILT_SOURCES =
+noinst_DATA = .scm-links
+
CLEANFILES = $(BUILT_SOURCES) gnucash .scm-links ${SCM_FILE_LINKS}
Modified: gnucash/branches/swig-redo/src/business/business-reports/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/business/business-reports/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/business/business-reports/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -29,5 +29,5 @@
EXTRA_DIST = \
${gncscmmod_DATA}
-CLEANFILES = gnucash report .scm-links
+CLEANFILES = gnucash report
DISTCLEANFILES = ${SCM_FILE_LINKS}
Modified: gnucash/branches/swig-redo/src/business/business-utils/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/business/business-utils/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/business/business-utils/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -6,7 +6,6 @@
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/app-utils \
-I${top_srcdir}/src/business/business-core \
- ${G_WRAP_COMPILE_ARGS} \
${GUILE_INCS} \
${GLIB_CFLAGS} \
${QOF_CFLAGS} \
@@ -22,7 +21,6 @@
libgncmod_business_utils_la_LIBADD = \
${top_builddir}/src/gnc-module/libgncmodule.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
- ${G_WRAP_LINK_ARGS} \
${GUILE_LIBS} \
${GLIB_LIBS} \
${QOF_LIBS} \
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-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/business/dialog-tax-table/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -17,7 +17,6 @@
${GDK_PIXBUF_CFLAGS} \
${GLIB_CFLAGS} \
${QOF_CFLAGS} \
- ${G_WRAP_COMPILE_ARGS} \
${GUILE_INCS}
libgncmod_dialog_tax_table_la_SOURCES = \
@@ -37,7 +36,6 @@
${GLADE_LIBS} \
${GUILE_LIBS} \
${GNOME_LIBS} \
- ${G_WRAP_LINK_ARGS} \
${GLIB_LIBS} \
${QOF_LIBS} \
${EFENCE_LIBS}
@@ -71,5 +69,6 @@
endif
touch .scm-links
+noinst_DATA = .scm-links
BUILT_SOURCES = swig-dialog-tax-table.c
CLEANFILES = $(BUILT_SOURCES) gnucash .scm-links ${SCM_FILE_LINKS}
Modified: gnucash/branches/swig-redo/src/core-utils/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/core-utils/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/core-utils/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -41,6 +41,7 @@
gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
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
Modified: gnucash/branches/swig-redo/src/engine/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/engine/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/engine/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -111,7 +111,7 @@
libgncmod_engine_la_LIBADD = \
../gnc-module/libgncmodule.la \
../core-utils/libcore-utils.la \
- ${G_WRAP_LINK_ARGS} \
+ ${GUILE_LIBS} \
${QOF_LIBS} \
${GNUCASH_ENGINE_BASE_LIBS} \
${top_builddir}/lib/libc/libc-missing.la
@@ -158,6 +158,8 @@
endif
touch .scm-links
+noinst_DATA = .scm-links
+
swig-engine.c: engine.i ${gncinclude_HEADERS} ${noinst_HEADERS}
swig -guile $(SWIG_ARGS) -Linkage module \
-I${top_srcdir}/lib/libqof/qof -o $@ $<
Modified: gnucash/branches/swig-redo/src/engine/test/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/engine/test/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/engine/test/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -52,9 +52,7 @@
--gnc-module-dir ${top_builddir}/src/engine \
--gnc-module-dir ${top_srcdir}/src/gnc-module \
--gnc-module-dir ${top_srcdir}/src/engine \
- --guile-load-dir ${top_srcdir}/src/engine/test \
- --guile-load-dir ${G_WRAP_MODULE_DIR} \
- --library-dir ${G_WRAP_LIB_DIR}
+ --guile-load-dir ${top_srcdir}/src/engine/test
TESTS_ENVIRONMENT := \
SRCDIR=${srcdir} \
Modified: gnucash/branches/swig-redo/src/gnome/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/gnome/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/gnome/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -16,7 +16,6 @@
${top_builddir}/src/calculation/libgncmod-calculation.la \
${top_builddir}/src/core-utils/libcore-utils.la \
${GLADE_LIBS} \
- ${G_WRAP_LINK_ARGS} \
${GUILE_LIBS} ${GNOME_LIBS} ${GLIB_LIBS} ${QOF_LIBS}
libgncgnome_la_SOURCES = \
@@ -114,7 +113,6 @@
-I${top_srcdir}/src/report/report-gnome \
-I${top_srcdir}/lib/libc \
${GUILE_INCS} \
- ${G_WRAP_COMPILE_ARGS} \
${GNOME_CFLAGS} \
${GNOME_PRINT_CFLAGS} \
${GDK_PIXBUF_CFLAGS} \
Modified: gnucash/branches/swig-redo/src/gnome-search/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/gnome-search/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/gnome-search/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -10,7 +10,6 @@
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/business/business-core \
- ${G_WRAP_COMPILE_ARGS} \
${GUILE_INCS} \
${GTKHTML_CFLAGS} \
${GDK_PIXBUF_CFLAGS} \
Modified: gnucash/branches/swig-redo/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/gnome-utils/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/gnome-utils/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -24,7 +24,6 @@
${GNOME_CFLAGS} \
${GTKHTML_CFLAGS} \
${GUILE_INCS} \
- ${G_WRAP_COMPILE_ARGS} \
${QOF_CFLAGS} \
${GOFFICE_CFLAGS} \
${GSF_CFLAGS}
@@ -186,7 +185,6 @@
${GUILE_LIBS} \
${GDK_PIXBUF_LIBS} \
${GLADE_LIBS} \
- ${G_WRAP_LINK_ARGS} \
${GUILE_LIBS} \
${GLIB_LIBS} \
${DB_LIBS} \
@@ -285,6 +283,7 @@
endif
touch .scm-links
+noinst_DATA = .scm-links
BUILT_SOURCES += swig-gnome-utils.c
CLEANFILES = $(BUILT_SOURCES) gnucash .scm-links ${SCM_FILE_LINKS}
Modified: gnucash/branches/swig-redo/src/gnome-utils/test/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/gnome-utils/test/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/gnome-utils/test/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -18,14 +18,12 @@
--gnc-module-dir ${top_builddir}/src/gnome-utils \
--gnc-module-dir ${top_builddir}/src/gnome \
--gnc-module-dir ${top_builddir}/src/scm \
- --guile-load-dir ${G_WRAP_MODULE_DIR} \
--guile-load-dir ${top_srcdir}/src/scm \
--guile-load-dir ${top_srcdir}/src/gnome \
--guile-load-dir ${top_srcdir}/src/engine \
--guile-load-dir ${top_srcdir}/src/app-utils \
--guile-load-dir ${top_srcdir}/src/gnome-utils \
- --library-dir ${top_srcdir}/src/gnome \
- --library-dir ${G_WRAP_LIB_DIR}
+ --library-dir ${top_srcdir}/src/gnome
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/swig-redo/src/import-export/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/import-export/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/import-export/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -63,7 +63,6 @@
-I${top_srcdir}/src/app-utils \
-I${top_srcdir}/src/gnome \
-I${top_srcdir}/src/gnome-utils \
- ${G_WRAP_COMPILE_ARGS} \
${GNOME_CFLAGS} \
${GTKHTML_CFLAGS} \
${GDK_PIXBUF_CFLAGS} \
Modified: gnucash/branches/swig-redo/src/import-export/hbci/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/import-export/hbci/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/import-export/hbci/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -67,7 +67,6 @@
-I${top_srcdir}/src/register/register-core \
-I${top_srcdir}/src/register/register-gnome \
-I${top_srcdir}/src/register/ledger-core \
- ${G_WRAP_COMPILE_ARGS} \
${GUILE_INCS} \
${GNOME_CFLAGS} \
${GTKHTML_CFLAGS} \
Modified: gnucash/branches/swig-redo/src/import-export/mt940/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/import-export/mt940/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/import-export/mt940/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -39,7 +39,6 @@
-I${top_srcdir}/src/register/register-core \
-I${top_srcdir}/src/register/register-gnome \
-I${top_srcdir}/src/register/ledger-core \
- ${G_WRAP_COMPILE_ARGS} \
${GUILE_INCS} \
${GNOME_CFLAGS} \
${GTKHTML_CFLAGS} \
Modified: gnucash/branches/swig-redo/src/import-export/qif/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/import-export/qif/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -33,6 +33,5 @@
-I${top_srcdir}/src/import-export \
${GLIB_CFLAGS} \
${GUILE_INCS} \
- ${QOF_CFLAGS} \
- ${G_WRAP_COMPILE_ARGS}
+ ${QOF_CFLAGS}
Modified: gnucash/branches/swig-redo/src/import-export/qif/test/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif/test/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/import-export/qif/test/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -38,8 +38,6 @@
--gnc-module-dir ${top_builddir}/src/gnome-utils \
--gnc-module-dir ${top_builddir}/src/network-utils \
--gnc-module-dir ${top_builddir}/src/gnome \
- --library-dir ${G_WRAP_LIB_DIR} \
- --guile-load-dir ${G_WRAP_MODULE_DIR} \
--guile-load-dir ${top_srcdir}/src/scm \
--guile-load-dir ${top_srcdir}/src/import-export \
--guile-load-dir ${top_srcdir}/src/import-export/qif
Modified: gnucash/branches/swig-redo/src/import-export/qif-import/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-import/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/import-export/qif-import/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -23,7 +23,6 @@
${top_builddir}/src/core-utils/libcore-utils.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/gnc-module/libgncmodule.la \
- ${G_WRAP_LINK_ARGS} \
${GUILE_LIBS} \
${GNOME_LIBS} \
${GLADE_LIBS} \
@@ -59,7 +58,6 @@
-I${top_srcdir}/src/gnome \
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/import-export \
- ${G_WRAP_COMPILE_ARGS} \
${GUILE_INCS} \
${GLIB_CFLAGS} \
${GLADE_CFLAGS} \
Modified: gnucash/branches/swig-redo/src/import-export/qif-io-core/test/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-io-core/test/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/import-export/qif-io-core/test/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -14,13 +14,11 @@
--gnc-module-dir ${top_builddir}/src/import-export/qif-io-core \
--guile-load-dir ${top_srcdir}/src/import-export/qif-io-core/test \
--guile-load-dir ${top_srcdir}/lib \
- --guile-load-dir ${G_WRAP_MODULE_DIR} \
--guile-load-dir ${top_builddir}/src/gnome-utils \
--guile-load-dir ${top_builddir}/src/gnome \
--guile-load-dir ${top_builddir}/src/scm \
--library-dir ${top_builddir}/src/gnome-utils \
- --library-dir ${top_srcdir}/src/gnome \
- --library-dir ${G_WRAP_LIB_DIR}
+ --library-dir ${top_srcdir}/src/gnome
TESTS_ENVIRONMENT := \
SRCDIR=${srcdir} \
Modified: gnucash/branches/swig-redo/src/import-export/test/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/import-export/test/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/import-export/test/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -35,8 +35,6 @@
--gnc-module-dir ${top_builddir}/src/gnome-utils \
--gnc-module-dir ${top_builddir}/src/network-utils \
--gnc-module-dir ${top_builddir}/src/gnome \
- --library-dir ${G_WRAP_LIB_DIR} \
- --guile-load-dir ${G_WRAP_MODULE_DIR} \
--guile-load-dir ${top_builddir}/src/scm \
--guile-load-dir ${top_srcdir}/src/scm \
--guile-load-dir ${top_srcdir}/src/import-export
Modified: gnucash/branches/swig-redo/src/network-utils/test/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/network-utils/test/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/network-utils/test/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -8,9 +8,7 @@
GNC_TEST_DEPS := \
--gnc-module-dir ${top_builddir}/src/gnc-module \
- --gnc-module-dir ${top_builddir}/src/network-utils \
- --guile-load-dir ${G_WRAP_MODULE_DIR} \
- --library-dir ${G_WRAP_LIB_DIR}
+ --gnc-module-dir ${top_builddir}/src/network-utils
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/swig-redo/src/register/register-core/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/register/register-core/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/register/register-core/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -58,7 +58,6 @@
-I${top_srcdir}/src/gnome-utils \
${GUILE_INCS} \
${GLADE_CFLAGS} \
- ${G_WRAP_COMPILE_ARGS} \
${GNOME_CFLAGS} \
${QOF_CFLAGS} \
${GLIB_CFLAGS}
@@ -75,5 +74,5 @@
endif
touch .scm-links
-BUILT_SOURCES =
+noinst_DATA = .scm-links
CLEANFILES = $(BUILT_SOURCES) gnucash register .scm-links ${SCM_FILE_LINKS}
Modified: gnucash/branches/swig-redo/src/register/register-core/test/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/register/register-core/test/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/register/register-core/test/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -4,7 +4,7 @@
TESTS_ENVIRONMENT= \
GNC_MODULE_PATH=../../engine:../../gnc-module:../../calculation:.. \
- GUILE_LOAD_PATH=${G_WRAP_MODULE_DIR}:../../engine:..:../../gnc-module:${top_srcdir}/lib \
+ GUILE_LOAD_PATH=../../engine:..:../../gnc-module:${top_srcdir}/lib \
LTDL_LIBRARY_PATH=.. \
LD_LIBRARY_PATH=${top_builddir}/src/gnc-module:${top_builddir}/src/gnc-module/.libs:${top_builddir}/src/engine:${top_builddir}/src/engine/.libs:${top_builddir}/src/calculation:${top_builddir}/src/calculation/.libs:${top_builddir}/src/network-utils:${top_builddir}/src/network-utils/.libs
Modified: gnucash/branches/swig-redo/src/register/register-gnome/test/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/register/register-gnome/test/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/register/register-gnome/test/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -4,7 +4,7 @@
TESTS_ENVIRONMENT= \
GNC_MODULE_PATH=../../engine:../../gnc-module:../../calculation:.. \
- GUILE_LOAD_PATH=${G_WRAP_MODULE_DIR}:../../engine:..:../../gnc-module:${top_srcdir}/lib \
+ GUILE_LOAD_PATH=../../engine:..:../../gnc-module:${top_srcdir}/lib \
LTDL_LIBRARY_PATH=.. \
LD_LIBRARY_PATH=${top_builddir}/src/gnc-module:${top_builddir}/src/gnc-module/.libs:${top_builddir}/src/engine:${top_builddir}/src/engine/.libs:${top_builddir}/src/calculation:${top_builddir}/src/calculation/.libs:${top_builddir}/src/network-utils:${top_builddir}/src/network-utils/.libs
Modified: gnucash/branches/swig-redo/src/report/locale-specific/us/test/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/report/locale-specific/us/test/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/report/locale-specific/us/test/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -15,7 +15,6 @@
--gnc-module-dir ${top_srcdir}/src/gnc-module \
--gnc-module-dir ${top_srcdir}/src/engine \
--gnc-module-dir ${top_builddir}/src/network-utils \
- --guile-load-dir ${G_WRAP_MODULE_DIR} \
--guile-load-dir ${top_srcdir}/src/scm \
--guile-load-dir ${top_srcdir}/src/tax/us \
--guile-load-dir ${top_srcdir}/src/report/report-system \
@@ -23,8 +22,7 @@
--guile-load-dir ${top_srcdir}/src/gnome-utils \
--guile-load-dir ${top_srcdir}/src/gnome \
--library-dir ${top_srcdir}/src/gnome-utils \
- --library-dir ${top_srcdir}/src/gnome \
- --library-dir ${G_WRAP_LIB_DIR}
+ --library-dir ${top_srcdir}/src/gnome
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/swig-redo/src/report/report-gnome/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/report/report-gnome/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/report/report-gnome/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -18,7 +18,6 @@
${GUILE_INCS} \
${GTKHTML_CFLAGS} \
${GNOME_PRINT_CFLAGS} \
- ${G_WRAP_COMPILE_ARGS} \
${GNOME_CFLAGS} \
${QOF_CFLAGS} \
${GLIB_CFLAGS}
@@ -45,7 +44,6 @@
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/report/report-system/libgncmod-report-system.la \
${GLADE_LIBS} \
- ${G_WRAP_LINK_ARGS} \
${GUILE_LIBS} \
${GNOME_PRINT_LIBS} \
${GNOME_LIBS} \
Modified: gnucash/branches/swig-redo/src/report/report-gnome/test/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/report/report-gnome/test/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/report/report-gnome/test/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -15,15 +15,13 @@
--gnc-module-dir ${top_builddir}/src/report/report-gnome \
--gnc-module-dir ${top_srcdir}/src/gnc-module \
--gnc-module-dir ${top_srcdir}/src/engine \
- --guile-load-dir ${G_WRAP_MODULE_DIR} \
--guile-load-dir ${top_srcdir}/src/scm \
--guile-load-dir ${top_srcdir}/src/app-utils \
--guile-load-dir ${top_srcdir}/src/report/report-system \
--guile-load-dir ${top_srcdir}/src/gnome-utils \
--guile-load-dir ${top_srcdir}/src/gnome \
--library-dir ${top_srcdir}/src/gnome-utils \
- --library-dir ${top_srcdir}/src/gnome \
- --library-dir ${G_WRAP_LIB_DIR}
+ --library-dir ${top_srcdir}/src/gnome
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/swig-redo/src/report/report-system/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/report/report-system/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/report/report-system/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -24,8 +24,7 @@
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/app-utils \
- ${GLIB_CFLAGS} ${GUILE_INCS} \
- ${G_WRAP_COMPILE_ARGS}
+ ${GLIB_CFLAGS} ${GUILE_INCS}
gncscmdir = ${GNC_SHAREDIR}/scm
gncscm_DATA = \
Modified: gnucash/branches/swig-redo/src/report/report-system/test/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/report/report-system/test/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/report/report-system/test/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -15,15 +15,13 @@
--gnc-module-dir ${top_builddir}/src/network-utils \
--gnc-module-dir ${top_srcdir}/src/gnc-module \
--gnc-module-dir ${top_srcdir}/src/engine \
- --guile-load-dir ${G_WRAP_MODULE_DIR} \
--guile-load-dir ${top_srcdir}/src/scm \
--guile-load-dir ${top_srcdir}/src/gnome-utils \
--guile-load-dir ${top_srcdir}/src/gnome \
--guile-load-dir ${top_srcdir}/src/app-utils \
--guile-load-dir ${top_srcdir}/src/report/report-system \
--library-dir ${top_srcdir}/src/gnome-utils \
- --library-dir ${top_srcdir}/src/gnome \
- --library-dir ${G_WRAP_LIB_DIR}
+ --library-dir ${top_srcdir}/src/gnome
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/swig-redo/src/report/standard-reports/test/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/test/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/report/standard-reports/test/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -15,15 +15,13 @@
--gnc-module-dir ${top_builddir}/src/network-utils \
--gnc-module-dir ${top_srcdir}/src/gnc-module \
--gnc-module-dir ${top_srcdir}/src/engine \
- --guile-load-dir ${G_WRAP_MODULE_DIR} \
--guile-load-dir ${top_srcdir}/src/scm \
--guile-load-dir ${top_srcdir}/src/app-utils \
--guile-load-dir ${top_srcdir}/src/gnome-utils \
--guile-load-dir ${top_srcdir}/src/gnome \
--guile-load-dir ${top_srcdir}/src/report/report-system \
--library-dir ${top_builddir}/src/gnome-utils \
- --library-dir ${top_builddir}/src/gnome \
- --library-dir ${G_WRAP_LIB_DIR}
+ --library-dir ${top_builddir}/src/gnome
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/swig-redo/src/report/stylesheets/test/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/report/stylesheets/test/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/report/stylesheets/test/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -16,15 +16,13 @@
--gnc-module-dir ${top_srcdir}/src/gnc-module \
--gnc-module-dir ${top_srcdir}/src/engine \
--guile-load-dir ${top_srcdir}/src/scm \
- --guile-load-dir ${G_WRAP_MODULE_DIR} \
--guile-load-dir ${top_srcdir}/src/app-utils \
--guile-load-dir ${top_srcdir}/src/report/report-system \
--guile-load-dir ${top_srcdir}/src/report/stylesheets \
--guile-load-dir ${top_builddir}/src/gnome-utils \
--guile-load-dir ${top_builddir}/src/gnome \
--library-dir ${top_builddir}/src/gnome-utils \
- --library-dir ${top_builddir}/src/gnome \
- --library-dir ${G_WRAP_LIB_DIR}
+ --library-dir ${top_builddir}/src/gnome
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/swig-redo/src/report/utility-reports/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/report/utility-reports/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/report/utility-reports/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -46,5 +46,5 @@
EXTRA_DIST = ${gncscmmod_DATA}
-CLEANFILES = gnucash report .scm-links
+CLEANFILES = gnucash report
DISTCLEANFILES = ${SCM_FILE_LINKS}
Modified: gnucash/branches/swig-redo/src/report/utility-reports/test/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/report/utility-reports/test/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/report/utility-reports/test/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -15,15 +15,13 @@
--gnc-module-dir ${top_srcdir}/src/gnc-module \
--gnc-module-dir ${top_srcdir}/src/engine \
--guile-load-dir ${top_srcdir}/src/scm \
- --guile-load-dir ${G_WRAP_MODULE_DIR} \
--guile-load-dir ${top_srcdir}/src/app-utils \
--guile-load-dir ${top_srcdir}/src/gnome-utils \
--guile-load-dir ${top_srcdir}/src/gnome \
--guile-load-dir ${top_srcdir}/src/report/report-system \
--guile-load-dir ${top_srcdir}/src/report/utility-reports \
--library-dir ${top_builddir}/src/gnome-utils \
- --library-dir ${top_builddir}/src/gnome \
- --library-dir ${G_WRAP_LIB_DIR}
+ --library-dir ${top_builddir}/src/gnome
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/swig-redo/src/tax/us/test/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/tax/us/test/Makefile.am 2006-10-10 21:55:16 UTC (rev 14996)
+++ gnucash/branches/swig-redo/src/tax/us/test/Makefile.am 2006-10-10 23:08:31 UTC (rev 14997)
@@ -13,12 +13,10 @@
--gnc-module-dir ${top_srcdir}/src/tax/us \
--guile-load-dir ${top_builddir}/src/scm \
--guile-load-dir ${top_builddir}/lib \
- --guile-load-dir ${G_WRAP_MODULE_DIR} \
--guile-load-dir ${top_builddir}/src/gnome-utils \
--guile-load-dir ${top_builddir}/src/gnome \
--library-dir ${top_builddir}/src/gnome-utils \
- --library-dir ${top_builddir}/src/gnome \
- --library-dir ${G_WRAP_LIB_DIR}
+ --library-dir ${top_builddir}/src/gnome
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
More information about the gnucash-changes
mailing list