From 5e9b699a7a1144b5fe19efc9295804bfb2b16c68 Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Thu, 16 Mar 2006 15:25:12 +0000 Subject: [PATCH] Add more linker flags for referenced libraries. Necessary when the required libraries are not inferred from the dependencies by that particular libtool, e. g. on windows/mingw32. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@13646 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 7 +++++++ src/business/business-core/Makefile.am | 1 + src/business/business-core/file/Makefile.am | 10 +++++++--- src/business/dialog-tax-table/Makefile.am | 9 +++++++-- src/gnome/Makefile.am | 17 +++++++++++++---- src/import-export/Makefile.am | 5 +++-- src/import-export/log-replay/Makefile.am | 7 ++++--- src/import-export/qif-import/Makefile.am | 7 +++++-- src/import-export/qif/Makefile.am | 6 +++++- 9 files changed, 52 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed78c3a21b..1c2ea90e13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-03-16 Christian Stimming + + * src/gnome/Makefile.am: Add more linker flags for referenced + libraries. Necessary when the required libraries are not inferred + from the dependencies by that particular libtool, e. g. on + windows/mingw32. + 2006-03-15 David Hampton * src/gnome-utils/gnc-main-window.c: Treat the file name as utf8 diff --git a/src/business/business-core/Makefile.am b/src/business/business-core/Makefile.am index 7b2cf680b3..4714d54fb0 100644 --- a/src/business/business-core/Makefile.am +++ b/src/business/business-core/Makefile.am @@ -74,6 +74,7 @@ libgw_business_core_la_LDFLAGS = ${G_WRAP_LINK_ARGS} libgw_business_core_la_LIBADD = \ libgncmod-business-core.la \ ${top_builddir}/src/engine/libgw-engine.la \ + ${top_builddir}/src/engine/libgncmod-engine.la \ ${QOF_LIBS} gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash diff --git a/src/business/business-core/file/Makefile.am b/src/business/business-core/file/Makefile.am index 044a46889d..1d14653391 100644 --- a/src/business/business-core/file/Makefile.am +++ b/src/business/business-core/file/Makefile.am @@ -43,6 +43,10 @@ noinst_HEADERS = \ libgncmod_business_backend_file_la_LDFLAGS = -module libgncmod_business_backend_file_la_LIBADD = \ - ${top_builddir}/src/business/business-core/libgncmod-business-core.la \ - ${top_builddir}/src/backend/file/libgnc-backend-file.la \ - ${GLIB_LIBS} ${LIBXML2_LIBS} ${QOF_LIBS} + ${top_builddir}/src/backend/file/libgnc-backend-file.la \ + ${top_builddir}/src/business/business-core/libgncmod-business-core.la \ + ${top_builddir}/src/engine/libgncmod-engine.la \ + ${top_builddir}/src/gnc-module/libgncmodule.la \ + ${LIBXML2_LIBS} \ + ${QOF_LIBS} \ + ${GLIB_LIBS} diff --git a/src/business/dialog-tax-table/Makefile.am b/src/business/dialog-tax-table/Makefile.am index ae8a0628c7..cb39b1adab 100644 --- a/src/business/dialog-tax-table/Makefile.am +++ b/src/business/dialog-tax-table/Makefile.am @@ -29,9 +29,12 @@ noinst_HEADERS = \ gw-dialog-tax-table.h libgncmod_dialog_tax_table_la_LIBADD = \ + ${top_builddir}/src/business/business-core/libgncmod-business-core.la \ ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \ + ${top_builddir}/src/app-utils/libgncmod-app-utils.la \ + ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/gnc-module/libgncmodule.la \ - ${top_builddir}/src/core-utils/libcore-utils.la \ + ${GLADE_LIBS} \ ${GUILE_LIBS} \ ${GNOME_LIBS} \ ${G_WRAP_LINK_ARGS} \ @@ -41,7 +44,9 @@ libgncmod_dialog_tax_table_la_LIBADD = \ libgw_dialog_tax_table_la_SOURCES = gw-dialog-tax-table.c -libgw_dialog_tax_table_la_LDFLAGS = ${G_WRAP_LINK_ARGS} +libgw_dialog_tax_table_la_LIBADD = \ + libgncmod-dialog-tax-table.la \ + ${G_WRAP_LINK_ARGS} gwmoddir = ${GNC_GWRAP_LIBDIR} gwmod_DATA = \ diff --git a/src/gnome/Makefile.am b/src/gnome/Makefile.am index 0796eb892f..4776aca694 100644 --- a/src/gnome/Makefile.am +++ b/src/gnome/Makefile.am @@ -7,14 +7,21 @@ gwmod_DATA = gw-gnc-spec.scm gw-gnc.scm #nodist_gwmod_DATA = gw-gnc.scm libgncgnome_la_LIBADD = \ - ${top_builddir}/src/engine/libgncmod-engine.la \ - ${top_builddir}/src/report/report-system/libgncmod-report-system.la \ - ${top_builddir}/src/report/report-gnome/libgncmod-report-gnome.la \ ${top_builddir}/src/register/ledger-core/libgncmod-ledger-core.la \ + ${top_builddir}/src/register/register-gnome/libgncmod-register-gnome.la \ + ${top_builddir}/src/register/register-core/libgncmod-register-core.la \ + ${top_builddir}/src/report/report-gnome/libgncmod-report-gnome.la \ + ${top_builddir}/src/report/report-system/libgncmod-report-system.la \ ${top_builddir}/src/gnome-search/libgncmod-gnome-search.la \ ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/lib/glib26/libgncglib.la \ + ${top_builddir}/src/app-utils/libgncmod-app-utils.la \ + ${top_builddir}/src/engine/libgw-engine.la \ + ${top_builddir}/src/engine/libgncmod-engine.la \ + ${top_builddir}/src/calculation/libgncmod-calculation.la \ ${top_builddir}/src/core-utils/libcore-utils.la \ + ${top_builddir}/lib/glib26/libgncglib.la \ + ${GLADE_LIBS} \ + ${G_WRAP_LINK_ARGS} \ ${GUILE_LIBS} ${GNOME_LIBS} ${GLIB_LIBS} ${QOF_LIBS} libgw_gnc_la_SOURCES = gw-gnc.c @@ -62,7 +69,9 @@ libgncgnome_la_SOURCES = \ ${top_srcdir}/src/backend/file/sixtp-stack.c \ ${top_srcdir}/src/backend/file/sixtp-to-dom-parser.c \ ${top_srcdir}/src/backend/file/io-example-account.c \ + ${top_srcdir}/src/backend/file/io-gncbin-r.c \ ${top_srcdir}/src/backend/file/io-gncxml-gen.c \ + ${top_srcdir}/src/backend/file/io-gncxml-v1.c \ ${top_srcdir}/src/backend/file/io-gncxml-v2.c \ ${top_srcdir}/src/backend/file/io-utils.c \ ${top_srcdir}/src/backend/file/gnc-account-xml-v2.c \ diff --git a/src/import-export/Makefile.am b/src/import-export/Makefile.am index 9e36a7a688..05ad0ff49a 100644 --- a/src/import-export/Makefile.am +++ b/src/import-export/Makefile.am @@ -39,10 +39,11 @@ noinst_HEADERS = \ libgncmod_generic_import_la_LIBADD = \ ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/src/gnc-module/libgncmodule.la \ + ${top_builddir}/src/app-utils/libgncmod-app-utils.la \ ${top_builddir}/src/engine/libgncmod-engine.la \ - ${top_builddir}/src/register/ledger-core/libgncmod-ledger-core.la \ ${top_builddir}/src/core-utils/libcore-utils.la \ + ${top_builddir}/src/gnc-module/libgncmodule.la \ + ${GNOME_LIBS} \ ${GLADE_LIBS} \ ${QOF_LIBS} \ ${GLIB_LIBS} diff --git a/src/import-export/log-replay/Makefile.am b/src/import-export/log-replay/Makefile.am index 34cfee7ff4..4ab789db0e 100644 --- a/src/import-export/log-replay/Makefile.am +++ b/src/import-export/log-replay/Makefile.am @@ -12,10 +12,11 @@ noinst_HEADERS = \ gnc-plugin-log-replay.h libgncmod_log_replay_la_LIBADD = \ - ${top_builddir}/src/gnc-module/libgncmodule.la \ - ${top_builddir}/src/core-utils/libcore-utils.la \ + ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \ + ${top_builddir}/src/app-utils/libgncmod-app-utils.la \ ${top_builddir}/src/engine/libgncmod-engine.la \ - ${top_builddir}/src/import-export/libgncmod-generic-import.la \ + ${top_builddir}/src/core-utils/libcore-utils.la \ + ${top_builddir}/src/gnc-module/libgncmodule.la \ ${GLIB_LIBS} ${QOF_LIBS} AM_CFLAGS = \ diff --git a/src/import-export/qif-import/Makefile.am b/src/import-export/qif-import/Makefile.am index 50ab71ecd4..ed48bf4a19 100644 --- a/src/import-export/qif-import/Makefile.am +++ b/src/import-export/qif-import/Makefile.am @@ -17,10 +17,13 @@ noinst_HEADERS = \ libgncmod_qif_import_la_LIBADD = \ ${top_builddir}/src/import-export/libgncmod-generic-import.la \ - ${top_builddir}/src/core-utils/libcore-utils.la \ + ${top_builddir}/src/gnome/libgncgnome.la \ ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/src/gnc-module/libgncmodule.la \ + ${top_builddir}/src/app-utils/libgncmod-app-utils.la \ + ${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} \ diff --git a/src/import-export/qif/Makefile.am b/src/import-export/qif/Makefile.am index b779ff2a5a..8ea14538d6 100644 --- a/src/import-export/qif/Makefile.am +++ b/src/import-export/qif/Makefile.am @@ -19,7 +19,11 @@ noinst_HEADERS = \ qif-objects-p.h \ qif-parse.h -libgncmod_qif_la_LIBADD = ${QOF_LIBS} +libgncmod_qif_la_LIBADD = \ + ${top_builddir}/src/import-export/libgncmod-generic-import.la \ + ${top_builddir}/src/engine/libgncmod-engine.la \ + ${QOF_LIBS} \ + ${GLIB_LIBS} AM_CFLAGS = \ -I${top_srcdir}/src \