r20401 - gnucash/trunk/src - Bug #644557 - gnucash-2.4.3: downstream patches to fix tests linking
Geert Janssens
gjanssens at code.gnucash.org
Sat Mar 12 10:44:52 EST 2011
Author: gjanssens
Date: 2011-03-12 10:44:51 -0500 (Sat, 12 Mar 2011)
New Revision: 20401
Trac: http://svn.gnucash.org/trac/changeset/20401
Modified:
gnucash/trunk/src/app-utils/test/Makefile.am
gnucash/trunk/src/backend/xml/test/Makefile.am
gnucash/trunk/src/bin/Makefile.am
gnucash/trunk/src/business/business-core/test/Makefile.am
gnucash/trunk/src/core-utils/test/Makefile.am
gnucash/trunk/src/engine/test/Makefile.am
gnucash/trunk/src/import-export/ofx/test/Makefile.am
gnucash/trunk/src/import-export/qif-import/test/Makefile.am
gnucash/trunk/src/import-export/test/Makefile.am
gnucash/trunk/src/register/ledger-core/test/Makefile.am
gnucash/trunk/src/register/register-core/test/Makefile.am
gnucash/trunk/src/register/register-gnome/test/Makefile.am
gnucash/trunk/src/report/report-gnome/test/Makefile.am
Log:
Bug #644557 - gnucash-2.4.3: downstream patches to fix tests linking
Patches kindly provided by Gilles Dartiguelongue <eva at gentoo.org> of
the Gentoo project.
Modified: gnucash/trunk/src/app-utils/test/Makefile.am
===================================================================
--- gnucash/trunk/src/app-utils/test/Makefile.am 2011-03-12 15:44:39 UTC (rev 20400)
+++ gnucash/trunk/src/app-utils/test/Makefile.am 2011-03-12 15:44:51 UTC (rev 20401)
@@ -33,13 +33,13 @@
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
LDADD = \
+ ${top_builddir}/src/libqof/qof/libgnc-qof.la \
+ ${top_builddir}/src/core-utils/libgnc-core-utils.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/src/test-core/libtest-core.la \
${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
- ${top_builddir}/src/core-utils/libgnc-core-utils.la \
- ${top_builddir}/src/libqof/qof/libgnc-qof.la \
${GUILE_LIBS} \
${GCONF_LIBS}
Modified: gnucash/trunk/src/backend/xml/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/xml/test/Makefile.am 2011-03-12 15:44:39 UTC (rev 20400)
+++ gnucash/trunk/src/backend/xml/test/Makefile.am 2011-03-12 15:44:51 UTC (rev 20401)
@@ -218,14 +218,16 @@
noinst_HEADERS = test-file-stuff.h
-LDADD = ${top_builddir}/src/test-core/libtest-core.la \
+LDADD = \
+ ${top_builddir}/src/libqof/qof/libgnc-qof.la \
+ ${top_builddir}/src/test-core/libtest-core.la \
${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
${top_builddir}/src/core-utils/libgnc-core-utils.la \
./libgnc-test-file-stuff.la \
${LIBXML2_LIBS} \
- ${top_builddir}/src/libqof/qof/libgnc-qof.la \
+ ${ZLIB_LIBS} \
${top_builddir}/lib/libc/libc-missing.la
AM_CPPFLAGS = \
Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am 2011-03-12 15:44:39 UTC (rev 20400)
+++ gnucash/trunk/src/bin/Makefile.am 2011-03-12 15:44:51 UTC (rev 20401)
@@ -61,16 +61,16 @@
gnucash_SOURCES = gnucash-bin.c ${GNUCASH_RESOURCE_FILE}
gnucash_LDADD = \
${top_builddir}/src/libqof/qof/libgnc-qof.la \
- ${GUILE_LIBS} \
- ${GLIB_LIBS} \
- ${GNOME_LIBS} \
- ${GTK_LIBS} \
+ ${top_builddir}/src/core-utils/libgnc-core-utils.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/gnome/libgnc-gnome.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
- ${top_builddir}/src/core-utils/libgnc-core-utils.la \
- ${top_builddir}/src/gnc-module/libgnc-module.la
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
+ ${GUILE_LIBS} \
+ ${GLIB_LIBS} \
+ ${GNOME_LIBS} \
+ ${GTK_LIBS}
GNUCASH_BIN_INSTALL_NAME=`echo ${BIN_NAME} | sed -e '$(transform)'`
Modified: gnucash/trunk/src/business/business-core/test/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-core/test/Makefile.am 2011-03-12 15:44:39 UTC (rev 20400)
+++ gnucash/trunk/src/business/business-core/test/Makefile.am 2011-03-12 15:44:51 UTC (rev 20401)
@@ -11,11 +11,11 @@
${GLIB_CFLAGS}
LDADD = \
+ ${top_builddir}/src/libqof/qof/libgnc-qof.la \
${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/test-core/libtest-core.la \
${top_builddir}/src/engine/libgncmod-engine.la \
../libgncmod-business-core.la \
- ${top_builddir}/src/libqof/qof/libgnc-qof.la \
${GLIB_LIBS}
TESTS = \
Modified: gnucash/trunk/src/core-utils/test/Makefile.am
===================================================================
--- gnucash/trunk/src/core-utils/test/Makefile.am 2011-03-12 15:44:39 UTC (rev 20400)
+++ gnucash/trunk/src/core-utils/test/Makefile.am 2011-03-12 15:44:51 UTC (rev 20401)
@@ -9,9 +9,9 @@
${GLIB_CFLAGS}
LDADD = \
+ ${top_builddir}/src/libqof/qof/libgnc-qof.la \
../libgnc-core-utils.la \
${top_builddir}/src/test-core/libtest-core.la \
- ${top_builddir}/src/libqof/qof/libgnc-qof.la \
${GLIB_LIBS}
# these tests are ordered kind more or less in the order
Modified: gnucash/trunk/src/engine/test/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/test/Makefile.am 2011-03-12 15:44:39 UTC (rev 20400)
+++ gnucash/trunk/src/engine/test/Makefile.am 2011-03-12 15:44:51 UTC (rev 20401)
@@ -12,12 +12,12 @@
${GLIB_CFLAGS}
LDADD = \
+ ${top_builddir}/src/libqof/qof/libgnc-qof.la \
${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/test-core/libtest-core.la \
../libgncmod-engine.la \
../test-core/libgncmod-test-engine.la \
${top_builddir}/src/core-utils/libgnc-core-utils.la \
- ${top_builddir}/src/libqof/qof/libgnc-qof.la \
${GLIB_LIBS}
# these tests are ordered kind more or less in the order
@@ -84,8 +84,8 @@
test_link_SOURCES = test-link.c
test_link_LDADD = ../libgncmod-engine.la \
- ${top_builddir}/src/core-utils/libgnc-core-utils.la \
- ${top_builddir}/src/libqof/qof/libgnc-qof.la
+ ${top_builddir}/src/libqof/qof/libgnc-qof.la \
+ ${top_builddir}/src/core-utils/libgnc-core-utils.la
EXTRA_DIST = \
test-create-account \
Modified: gnucash/trunk/src/import-export/ofx/test/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/ofx/test/Makefile.am 2011-03-12 15:44:39 UTC (rev 20400)
+++ gnucash/trunk/src/import-export/ofx/test/Makefile.am 2011-03-12 15:44:51 UTC (rev 20401)
@@ -5,6 +5,7 @@
test_link_SOURCES=test-link.c
test_link_LDADD=\
+ $(top_builddir)/src/libqof/qof/libgnc-qof.la \
$(top_builddir)/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
../libgncmod-ofx.la
Modified: gnucash/trunk/src/import-export/qif-import/test/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif-import/test/Makefile.am 2011-03-12 15:44:39 UTC (rev 20400)
+++ gnucash/trunk/src/import-export/qif-import/test/Makefile.am 2011-03-12 15:44:51 UTC (rev 20401)
@@ -6,11 +6,11 @@
test-link.c
test_link_LDADD=../libgncmod-qif-import.la \
+ ${top_builddir}/src/libqof/qof/libgnc-qof.la \
${top_builddir}/src/core-utils/libgnc-core-utils.la \
${top_builddir}/src/gnome/libgnc-gnome.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
- ${top_builddir}/src/libqof/qof/libgnc-qof.la \
${LIBXML2_LIBS}
Modified: gnucash/trunk/src/import-export/test/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/test/Makefile.am 2011-03-12 15:44:39 UTC (rev 20400)
+++ gnucash/trunk/src/import-export/test/Makefile.am 2011-03-12 15:44:51 UTC (rev 20401)
@@ -10,14 +10,14 @@
${GLIB_CFLAGS}
LDADD = \
+ ${top_builddir}/src/libqof/qof/libgnc-qof.la \
+ ${top_builddir}/src/core-utils/libgnc-core-utils.la \
${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/test-core/libtest-core.la \
../libgncmod-generic-import.la \
- $(top_builddir)/src/core-utils/libgnc-core-utils.la \
$(top_builddir)/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/engine/libgncmod-engine.la \
- ${top_builddir}/src/libqof/qof/libgnc-qof.la \
${GLIB_LIBS}
TESTS = \
Modified: gnucash/trunk/src/register/ledger-core/test/Makefile.am
===================================================================
--- gnucash/trunk/src/register/ledger-core/test/Makefile.am 2011-03-12 15:44:39 UTC (rev 20400)
+++ gnucash/trunk/src/register/ledger-core/test/Makefile.am 2011-03-12 15:44:51 UTC (rev 20401)
@@ -4,6 +4,7 @@
test_link_module_SOURCES=test-link-module.c
test_link_module_LDADD=\
+ $(top_builddir)/src/libqof/qof/libgnc-qof.la \
$(top_builddir)/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
../libgncmod-ledger-core.la
Modified: gnucash/trunk/src/register/register-core/test/Makefile.am
===================================================================
--- gnucash/trunk/src/register/register-core/test/Makefile.am 2011-03-12 15:44:39 UTC (rev 20400)
+++ gnucash/trunk/src/register/register-core/test/Makefile.am 2011-03-12 15:44:51 UTC (rev 20401)
@@ -12,7 +12,8 @@
test-link-module
test_link_module_SOURCES=test-link-module.c
-test_link_module_LDADD= \
+test_link_module_LDADD=\
+ $(top_builddir)/src/libqof/qof/libgnc-qof.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
Modified: gnucash/trunk/src/register/register-gnome/test/Makefile.am
===================================================================
--- gnucash/trunk/src/register/register-gnome/test/Makefile.am 2011-03-12 15:44:39 UTC (rev 20400)
+++ gnucash/trunk/src/register/register-gnome/test/Makefile.am 2011-03-12 15:44:51 UTC (rev 20401)
@@ -13,6 +13,7 @@
test_link_module_SOURCES = test-link-module.c
test_link_module_LDADD = \
+ $(top_builddir)/src/libqof/qof/libgnc-qof.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
Modified: gnucash/trunk/src/report/report-gnome/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-gnome/test/Makefile.am 2011-03-12 15:44:39 UTC (rev 20400)
+++ gnucash/trunk/src/report/report-gnome/test/Makefile.am 2011-03-12 15:44:51 UTC (rev 20401)
@@ -20,9 +20,10 @@
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
LDADD = \
+ $(top_builddir)/src/libqof/qof/libgnc-qof.la \
${top_builddir}/src/report/report-gnome/libgncmod-report-gnome.la \
- $(top_builddir)/src/app-utils/libgncmod-app-utils.la \
- ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la
+ $(top_builddir)/src/app-utils/libgncmod-app-utils.la \
+ ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la
check_PROGRAMS = test-link-module
More information about the gnucash-changes
mailing list