aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2003-09-11 22:55:52 +0800
committerDan Winship <danw@src.gnome.org>2003-09-11 22:55:52 +0800
commitd64c2ec239f3ee3afca669d13035b55e1d6d2af9 (patch)
tree5aa42722fd0d1b30303f4824124e1f44e666dc36 /addressbook
parentd4559401f1a8cdcecb80f102d48544655df45b14 (diff)
downloadgsoc2013-evolution-d64c2ec239f3ee3afca669d13035b55e1d6d2af9.tar
gsoc2013-evolution-d64c2ec239f3ee3afca669d13035b55e1d6d2af9.tar.gz
gsoc2013-evolution-d64c2ec239f3ee3afca669d13035b55e1d6d2af9.tar.bz2
gsoc2013-evolution-d64c2ec239f3ee3afca669d13035b55e1d6d2af9.tar.lz
gsoc2013-evolution-d64c2ec239f3ee3afca669d13035b55e1d6d2af9.tar.xz
gsoc2013-evolution-d64c2ec239f3ee3afca669d13035b55e1d6d2af9.tar.zst
gsoc2013-evolution-d64c2ec239f3ee3afca669d13035b55e1d6d2af9.zip
Remove libebook-static.la
* backend/ebook/Makefile.am (privlib_LTLIBRARIES): Remove libebook-static.la * conduit/Makefile.am (libeaddress_conduit_la_LIBADD): Use non-static versions of libraries: the static ones were only needed for libtool 1.3. svn path=/trunk/; revision=22515
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog9
-rw-r--r--addressbook/backend/ebook/Makefile.am12
-rw-r--r--addressbook/conduit/Makefile.am6
3 files changed, 13 insertions, 14 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index ce08dcce5e..ba573a71eb 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,12 @@
+2003-09-11 Dan Winship <danw@ximian.com>
+
+ * backend/ebook/Makefile.am (privlib_LTLIBRARIES): Remove
+ libebook-static.la
+
+ * conduit/Makefile.am (libeaddress_conduit_la_LIBADD): Use
+ non-static versions of libraries: the static ones were only needed
+ for libtool 1.3.
+
2003-08-26 JP Rosevear <jpr@ximian.com>
* conduit/address-conduit.c (ecard_from_remote_record): duplicate
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
index 024240f95a..9d2b6d1b05 100644
--- a/addressbook/backend/ebook/Makefile.am
+++ b/addressbook/backend/ebook/Makefile.am
@@ -49,11 +49,7 @@ INCLUDES = \
-DLIBGNOME_DISABLE_DEPRECATED \
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-privlib_LTLIBRARIES = libebook.la libebook-static.la
-
-# Make sure the libraries are not built in parallel when using a parallel make;
-# libtool can't handle that.
-libebook_static_la_DEPENDENCIES = libebook.la
+privlib_LTLIBRARIES = libebook.la
libebook_la_SOURCES = \
$(CORBA_SOURCE) \
@@ -93,12 +89,6 @@ libebookinclude_HEADERS = \
addressbook.h
-#
-# make a static library for use by addressbook's conduit's shared library
-#
-libebook_static_la_SOURCES = $(libebook_la_SOURCES)
-libebook_static_la_LDFLAGS = -all-static
-
MARSHAL_GENERATED = e-book-marshal.c e-book-marshal.h
@EVO_MARSHAL_RULE@
diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
index e7767dbcae..ca6d7fab30 100644
--- a/addressbook/conduit/Makefile.am
+++ b/addressbook/conduit/Makefile.am
@@ -18,10 +18,10 @@ libeaddress_conduit_la_SOURCES = \
libeaddress_conduit_la_LDFLAGS = -module -avoid-version
libeaddress_conduit_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/addressbook/backend/ebook/libebook-static.la \
- $(top_builddir)/e-util/ename/libename-static.la \
+ $(top_builddir)/addressbook/backend/ebook/libebook.la \
+ $(top_builddir)/e-util/ename/libename.la \
$(top_builddir)/libversit/libversit.la \
- $(top_builddir)/e-util/libeconduit-static.la \
+ $(top_builddir)/e-util/libeconduit.la \
$(top_builddir)/camel/libcamel.la \
$(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)