@@ -, +, @@ --- src/app-utils/test/Makefile.am | 2 +- src/backend/xml/test/Makefile.am | 5 +++-- src/bin/Makefile.am | 10 +++++----- src/business/business-core/test/Makefile.am | 2 +- src/core-utils/test/Makefile.am | 2 +- src/engine/test/Makefile.am | 6 +++--- src/import-export/qif-import/test/Makefile.am | 2 +- src/register/register-core/test/Makefile.am | 3 ++- src/register/register-gnome/test/Makefile.am | 1 + src/report/report-gnome/test/Makefile.am | 1 + 13 files changed, 23 insertions(+), 16 deletions(-) --- a/src/app-utils/test/Makefile.am +++ a/src/app-utils/test/Makefile.am @@ -33,13 +33,13 @@ TESTS_ENVIRONMENT = \ $(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} --- a/src/backend/xml/test/Makefile.am +++ a/src/backend/xml/test/Makefile.am @@ -218,14 +218,15 @@ check_PROGRAMS = \ 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 \ ${top_builddir}/lib/libc/libc-missing.la AM_CPPFLAGS = \ --- a/src/bin/Makefile.am +++ a/src/bin/Makefile.am @@ -61,16 +61,16 @@ bin_PROGRAMS = ${BIN_NAME} gnucash_SOURCES = gnucash-bin.c ${GNUCASH_RESOURCE_FILE} gnucash_LDADD = \ ${top_builddir}/src/libqof/qof/libgnc-qof.la \ + ${top_builddir}/src/core-utils/libgnc-core-utils.la \ - ${GUILE_LIBS} \ - ${GLIB_LIBS} \ - ${GNOME_LIBS} \ - ${GTK_LIBS} \ ${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)'` --- a/src/business/business-core/test/Makefile.am +++ a/src/business/business-core/test/Makefile.am @@ -11,11 +11,11 @@ AM_CPPFLAGS = \ ${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 = \ --- a/src/core-utils/test/Makefile.am +++ a/src/core-utils/test/Makefile.am @@ -9,9 +9,9 @@ AM_CPPFLAGS = \ ${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 --- a/src/engine/test/Makefile.am +++ a/src/engine/test/Makefile.am @@ -12,12 +12,12 @@ AM_CPPFLAGS = \ ${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 @@ check_PROGRAMS = \ 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 \ --- a/src/import-export/qif-import/test/Makefile.am +++ a/src/import-export/qif-import/test/Makefile.am @@ -6,11 +6,11 @@ test_link_SOURCES = \ 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} --- a/src/register/register-core/test/Makefile.am +++ a/src/register/register-core/test/Makefile.am @@ -12,7 +12,8 @@ check_PROGRAMS = \ 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 \ --- a/src/register/register-gnome/test/Makefile.am +++ a/src/register/register-gnome/test/Makefile.am @@ -13,6 +13,7 @@ check_PROGRAMS = \ 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 \ --- a/src/report/report-gnome/test/Makefile.am +++ a/src/report/report-gnome/test/Makefile.am @@ -20,6 +20,7 @@ TESTS_ENVIRONMENT = \ $(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/gnome-utils/libgncmod-gnome-utils.la --