aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBertrand Guiheneuf <bertrand@src.gnome.org>2000-02-18 07:31:16 +0800
committerBertrand Guiheneuf <bertrand@src.gnome.org>2000-02-18 07:31:16 +0800
commit3e317e1b1776d0cd505aaba4a446899af8798eaa (patch)
treecc5a190f3c87f26c5673f3c3ca13b53ac6f3f697
parent037af79b9e9467cac89d22859263f8c492126c3e (diff)
downloadgsoc2013-evolution-3e317e1b1776d0cd505aaba4a446899af8798eaa.tar.gz
gsoc2013-evolution-3e317e1b1776d0cd505aaba4a446899af8798eaa.tar.zst
gsoc2013-evolution-3e317e1b1776d0cd505aaba4a446899af8798eaa.zip
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
-rw-r--r--Makefile.am2
-rw-r--r--camel/providers/mbox/Makefile.am2
-rw-r--r--tests/Makefile.am2
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)