From 3e317e1b1776d0cd505aaba4a446899af8798eaa Mon Sep 17 00:00:00 2001
From: Bertrand Guiheneuf <bertrand@src.gnome.org>
Date: Thu, 17 Feb 2000 23:31:16 +0000
Subject: Modification in the automake/libtool building process so that camel
 and tests at least compile. Current libtool doen't seem to support lib
 dependancy unless the lib is installed. Removed the dependancy on libex in
 mbox and added it to the other Makefile.am that link with libcamel.

svn path=/trunk/; revision=1838
---
 Makefile.am                      | 2 +-
 camel/providers/mbox/Makefile.am | 2 +-
 tests/Makefile.am                | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 59c761edc0..eefa42361d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,10 +19,10 @@ SUBDIRS =			\
 	e-util			\
 	widgets			\
 	composer		\
+	mail			\
 	tests			\
 	addressbook		\
 	shell			\
-	mail			\
 	libical			\
 	libversit		\
 	calendar
diff --git a/camel/providers/mbox/Makefile.am b/camel/providers/mbox/Makefile.am
index f626b5c730..2b09ea3f3d 100644
--- a/camel/providers/mbox/Makefile.am
+++ b/camel/providers/mbox/Makefile.am
@@ -36,6 +36,6 @@ libcamelmbox_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
 
 #libcamelmbox_la_LIBADD = -L$(top_builddir)/libibex -libex
 #libcamelmbox_la_LIBADD = $(top_builddir)/libibex/libibex.la $(UNICODE_LIBS)
-libcamelmbox_la_LIBADD =  -L$(top_builddir)/libibex -libex $(UNICODE_LIBS)
+libcamelmbox_la_LIBADD =   $(UNICODE_LIBS)
 
 EXTRA_DIST = 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e437f42fa7..74b784babd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,6 +5,7 @@ INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir) -I$(top_srcdir)/camel \
 	-I$(top_srcdir)/camel/providers/mbox
 LDADD = \
 	$(top_builddir)/camel/libcamel.la 	\
+	$(top_builddir)/libibex/libibex.la 	\
 	$(GNOME_LIBDIR) 			\
 	$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)
 #	$(BONOBO_LIBS)				
@@ -20,6 +21,7 @@ LDADD = \
 
 test9_LDADD = \
 	$(top_builddir)/camel/libcamel.la 	\
+	$(top_builddir)/libibex/libibex.la 	\
 	$(top_builddir)/camel/providers/mbox/libcamelmbox.la 	\
 	$(GNOME_LIBDIR) 			\
 	$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)
-- 
cgit v1.2.3