More libtool work.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@5090 57a11ea4-9604-0410-9ed3-97b8803252fd

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 \

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

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 ../

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 \

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

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 \

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 \

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 \