From da85db03c0434280b3ce1004fbb77f6abcd85290 Mon Sep 17 00:00:00 2001
From: Bill Gribble <grib@billgribble.com>
Date: Wed, 8 Aug 2001 15:11:35 +0000
Subject: [PATCH] Makefile.am updates for libtool version 1.4/1.3.5
 compatibility

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@5089 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 ChangeLog                               | 6 ++++++
 src/backend/file/Makefile.am            | 4 +++-
 src/backend/postgres/Makefile.am        | 2 +-
 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 +-
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b05fa35eca..625982682a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-08  Bill Gribble  <grib@billgribble.com>
+
+	* fix Makefile.am in various places to clean up libtool 
+	problems.  These changes may still need fine tuning to make 
+	everything work with both libtool 1.4 and 1.3.5
+
 2001-08-08  Dave Peticolas  <dave@krondo.com>
 
 	* src/engine/engine-helpers.[ch]: remove cruft
diff --git a/src/backend/file/Makefile.am b/src/backend/file/Makefile.am
index c973c75665..6aeb65a40a 100644
--- a/src/backend/file/Makefile.am
+++ b/src/backend/file/Makefile.am
@@ -13,4 +13,6 @@ sixtp-dom-generators.c sixtp-dom-parsers.c sixtp-stack.c		\
 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} 
+libgncmod_backend_file_la_LIBADD = \
+   ${GLIB_LIBS} ${GNOME_XML_LIB}  \
+   -L../../engine -lgncmod-engine
diff --git a/src/backend/postgres/Makefile.am b/src/backend/postgres/Makefile.am
index 43883ee55d..1742c665a9 100644
--- a/src/backend/postgres/Makefile.am
+++ b/src/backend/postgres/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS=test
 
 lib_LTLIBRARIES = libgncmod-backend-postgres.la 
-libgncmod_backend_postgres_la_LDFLAGS =-module -lpq -L../../engine -lgncengine ${GLIB_LIBS}
+libgncmod_backend_postgres_la_LDFLAGS =-module -lpq -L../../engine -lgncmod-engine ${GLIB_LIBS}
 
 libgncmod_backend_postgres_la_SOURCES = \
   PostgresBackend.c \
diff --git a/src/gnc-module/test/mod-bar/Makefile.am b/src/gnc-module/test/mod-bar/Makefile.am
index a100fd3154..29d4a2b807 100644
--- a/src/gnc-module/test/mod-bar/Makefile.am
+++ b/src/gnc-module/test/mod-bar/Makefile.am
@@ -9,7 +9,7 @@ libbar_la_LDFLAGS = -module
 libbar_la_SOURCES = bar.c
 
 libgncmodbar_la_SOURCES=bar-gwrap.c gnc-mod-bar.c
-libgncmodbar_la_LDFLAGS=-module -L.libs
+libgncmodbar_la_LDFLAGS=-module
 libgncmodbar_la_LIBADD=-lbar
 
 bar-gwrap.c bar-gwrap.h: bar-gwrap.scm
diff --git a/src/gnc-module/test/mod-baz/Makefile.am b/src/gnc-module/test/mod-baz/Makefile.am
index 7e8b643186..dea3931c27 100644
--- a/src/gnc-module/test/mod-baz/Makefile.am
+++ b/src/gnc-module/test/mod-baz/Makefile.am
@@ -7,7 +7,7 @@ libbaz_la_LDFLAGS=-module
 libbaz_la_SOURCES=baz.c
 
 libgncmodbaz_la_SOURCES=baz-gwrap.c gnc-mod-baz.c
-libgncmodbaz_la_LDFLAGS=-module -L.libs -L../mod-foo/.libs
+libgncmodbaz_la_LDFLAGS=-module -L../mod-foo
 libgncmodbaz_la_LIBADD=-lbaz -lfoo
 
 baz-gwrap.c baz-gwrap.h: baz-gwrap.scm
diff --git a/src/gnc-module/test/mod-foo/Makefile.am b/src/gnc-module/test/mod-foo/Makefile.am
index cd0db278bd..2977c485ff 100644
--- a/src/gnc-module/test/mod-foo/Makefile.am
+++ b/src/gnc-module/test/mod-foo/Makefile.am
@@ -9,7 +9,7 @@ libfoo_la_LDFLAGS = -module
 libfoo_la_SOURCES = foo.c
 
 libgncmodfoo_la_SOURCES = foo-gwrap.c gnc-mod-foo.c
-libgncmodfoo_la_LDFLAGS = -module -L.libs
+libgncmodfoo_la_LDFLAGS = -module 
 libgncmodfoo_la_LIBADD = -lfoo
 
 foo-gwrap.c foo-gwrap.h: foo-gwrap.scm