From bf6e8fc947f15d5dbd256548d21c4d2e86fb816d Mon Sep 17 00:00:00 2001 From: Dave Peticolas Date: Wed, 8 Aug 2001 21:36:09 +0000 Subject: [PATCH] More libtool work. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@5090 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/Makefile.am | 1 + src/backend/file/Makefile.am | 2 +- src/backend/file/test/Makefile.am | 21 ++++++++++++--------- src/gnc-module/test/Makefile.am | 2 +- src/gnc-module/test/misc-mods/Makefile.am | 1 + src/gnc-module/test/mod-bar/Makefile.am | 2 +- src/gnc-module/test/mod-baz/Makefile.am | 2 +- src/gnc-module/test/mod-foo/Makefile.am | 2 +- 8 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 3d6cce5d76..389b86bae4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -26,6 +26,7 @@ bin_PROGRAMS = gnucash gnucash-make-guids # problem with the current version of gwrap, and will go away when # that's fixed. gnucash_LDADD = \ + -Lengine -Lengine/.libs \ gnc-module/libgncmodule.la \ engine/libgncmod-engine.la \ engine/libgw-engine.la \ diff --git a/src/backend/file/Makefile.am b/src/backend/file/Makefile.am index 6aeb65a40a..739def7cc8 100644 --- a/src/backend/file/Makefile.am +++ b/src/backend/file/Makefile.am @@ -15,4 +15,4 @@ sixtp-to-dom-parser.c sixtp-utils.c sixtp.c libgncmod_backend_file_la_LDFLAGS = -module libgncmod_backend_file_la_LIBADD = \ ${GLIB_LIBS} ${GNOME_XML_LIB} \ - -L../../engine -lgncmod-engine + -L../../engine -L../../engine/.libs -lgncmod-engine diff --git a/src/backend/file/test/Makefile.am b/src/backend/file/test/Makefile.am index daedee185a..fd7e0853b1 100644 --- a/src/backend/file/test/Makefile.am +++ b/src/backend/file/test/Makefile.am @@ -1,22 +1,25 @@ -TESTS = test-load-module -#TESTS = test-load-module test-dom-converters1 test-kvp-frames \ -# test-string-converters test-xml-account test-xml2-is-file \ -# test-load-xml2 test-load-example-account \ -# test-xml-commodity test-xml-transaction test-real-data.sh +TESTS = test-load-module test-dom-converters1 test-kvp-frames \ + test-string-converters test-xml-account test-xml2-is-file \ + test-load-xml2 test-load-example-account \ + test-xml-commodity test-xml-transaction test-real-data.sh TESTS_ENVIRONMENT = \ GNC_MODULE_PATH="${top_srcdir}/src/engine:${top_srcdir}/src/gnc-module:${top_srcdir}/src/backend/file" \ GUILE_LOAD_PATH="${G_WRAP_MODULE_DIR}:..:${top_srcdir}/src/gnc-module:${top_srcdir}/src/engine" \ - LTDL_LIBRARY_PATH=${top_srcdir}/src/gnc-module:${top_srcdir}/src/engine:${top_srcdir}/src/backend/file + LTDL_LIBRARY_PATH=${top_srcdir}/src/gnc-module:${top_srcdir}/src/engine:${top_srcdir}/src/backend/file \ + LD_LIBRARY_PATH=${top_srcdir}/src/gnc-module:${top_srcdir}/src/engine:${top_srcdir}/src/backend/file:${top_srcdir}/src/gnc-module/.libs:${top_srcdir}/src/engine/.libs:${top_srcdir}/src/backend/file/.libs noinst_PROGRAMS = test-dom-converters1 test-kvp-frames \ test-string-converters test-xml-account test-xml2-is-file \ test-load-xml2 test-load-example-account \ test-xml-commodity test-xml-transaction test-save-in-lang -LDADD = ../../../engine/libgncmod-engine.la \ - ../../../gnc-module/libgncmodule.la \ - ../libgncmod-backend-file.la +LDADD = -L../../../engine -L../../../engine/.libs \ + -L../../../gnc-module -L../../../gnc-module/.libs \ + -L.. -L../.libs \ + -lgncmod-engine \ + -lgncmodule \ + -lgncmod-backend-file CFLAGS=${GLIB_CFLAGS} INCLUDES=-I ../../../engine -I ../ diff --git a/src/gnc-module/test/Makefile.am b/src/gnc-module/test/Makefile.am index 3988351ba4..6c2f8a5708 100644 --- a/src/gnc-module/test/Makefile.am +++ b/src/gnc-module/test/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS=mod-foo mod-bar mod-baz misc-mods -LDADD=../libgncmodule.la ${GLIB_LIBS} -lltdl +LDADD= ../libgncmodule.la ${GLIB_LIBS} -lltdl CFLAGS=@CFLAGS@ ${GLIB_CFLAGS} -I../ TESTS=test-load-c test-load-scm test-gwrapped-c test-scm-module \ diff --git a/src/gnc-module/test/misc-mods/Makefile.am b/src/gnc-module/test/misc-mods/Makefile.am index 9722e97924..e00b6a72d7 100644 --- a/src/gnc-module/test/misc-mods/Makefile.am +++ b/src/gnc-module/test/misc-mods/Makefile.am @@ -1,4 +1,5 @@ CFLAGS=@CFLAGS@ ${GLIB_CFLAGS} -I../../ +LDADD=-L../.. -L../../.libs checklibdir=${PWD} checklib_LTLIBRARIES=libfuturemodsys.la libincompatdep.la libagedver.la diff --git a/src/gnc-module/test/mod-bar/Makefile.am b/src/gnc-module/test/mod-bar/Makefile.am index 29d4a2b807..ad20b2a731 100644 --- a/src/gnc-module/test/mod-bar/Makefile.am +++ b/src/gnc-module/test/mod-bar/Makefile.am @@ -10,7 +10,7 @@ libbar_la_SOURCES = bar.c libgncmodbar_la_SOURCES=bar-gwrap.c gnc-mod-bar.c libgncmodbar_la_LDFLAGS=-module -libgncmodbar_la_LIBADD=-lbar +libgncmodbar_la_LIBADD=-L. -L./.libs -lbar bar-gwrap.c bar-gwrap.h: bar-gwrap.scm FLAVOR=gnome guile -c \ diff --git a/src/gnc-module/test/mod-baz/Makefile.am b/src/gnc-module/test/mod-baz/Makefile.am index dea3931c27..60cc6da663 100644 --- a/src/gnc-module/test/mod-baz/Makefile.am +++ b/src/gnc-module/test/mod-baz/Makefile.am @@ -8,7 +8,7 @@ libbaz_la_SOURCES=baz.c libgncmodbaz_la_SOURCES=baz-gwrap.c gnc-mod-baz.c libgncmodbaz_la_LDFLAGS=-module -L../mod-foo -libgncmodbaz_la_LIBADD=-lbaz -lfoo +libgncmodbaz_la_LIBADD=-L. -L./.libs -L../mod-foo -L../mod-foo/.libs -lbaz -lfoo baz-gwrap.c baz-gwrap.h: baz-gwrap.scm FLAVOR=gnome guile -c \ diff --git a/src/gnc-module/test/mod-foo/Makefile.am b/src/gnc-module/test/mod-foo/Makefile.am index 2977c485ff..dc2f3264c5 100644 --- a/src/gnc-module/test/mod-foo/Makefile.am +++ b/src/gnc-module/test/mod-foo/Makefile.am @@ -10,7 +10,7 @@ libfoo_la_SOURCES = foo.c libgncmodfoo_la_SOURCES = foo-gwrap.c gnc-mod-foo.c libgncmodfoo_la_LDFLAGS = -module -libgncmodfoo_la_LIBADD = -lfoo +libgncmodfoo_la_LIBADD = -L. -L.libs -lfoo foo-gwrap.c foo-gwrap.h: foo-gwrap.scm FLAVOR=gnome guile -c \