Bug #644557 - gnucash-2.4.3: downstream patches to fix tests linking

Patches kindly provided by Gilles Dartiguelongue <eva@gentoo.org> of
the Gentoo project.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20401 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Geert Janssens 2011-03-12 15:44:51 +00:00
parent 7e95b8635a
commit 42c02af50b
13 changed files with 28 additions and 21 deletions

View File

@ -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}

View File

@ -218,14 +218,16 @@ 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 \
${ZLIB_LIBS} \
${top_builddir}/lib/libc/libc-missing.la
AM_CPPFLAGS = \

View File

@ -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 \
${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)'`

View File

@ -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 = \

View File

@ -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

View File

@ -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 \

View File

@ -5,6 +5,7 @@ check_PROGRAMS=test-link
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

View File

@ -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}

View File

@ -10,14 +10,14 @@ AM_CPPFLAGS = \
${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 = \

View File

@ -4,6 +4,7 @@ check_PROGRAMS = test-link-module
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

View File

@ -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 \

View File

@ -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 \

View File

@ -20,9 +20,10 @@ 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/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