callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove libebook-static.la

Browse Source 
* 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
This commit is contained in:
Dan Winship
2003-09-11 14:55:52 +00:00
parent d4559401f1
commit d64c2ec239
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
addressbook/ChangeLog
View File

@ -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

12
addressbook/backend/ebook/Makefile.am
View File

@ -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@

6
addressbook/conduit/Makefile.am
View File

@ -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)