diff options
| author | JP Rosevear <jpr@novell.com> | 2004-09-23 16:45:29 +0000 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2004-09-23 16:45:29 +0000 |
| commit | ba397da53ecfa5bf3d812ec948b0efd4afda54f7 (patch) | |
| tree | c77258baa97124b4bca814f2d1e102d7fdadb51c | |
| parent | 609b304ab55d0464adf5a9c95787f2f9a85daa1b (diff) | |
| download | evolution-data-server-ba397da53ecfa5bf3d812ec948b0efd4afda54f7.tar.gz | |
don't hard code pkg config version
2004-09-23 JP Rosevear <jpr@novell.com>
* Makefile.am: don't hard code pkg config version
* configure.in: bump version, reset libtool versions because the
library is now versioned
* libedataserver/Makefile.am: build versioned lib and version
pkgconfig stuff
* src/Makefile.am: link against versioned libs
2004-09-23 JP Rosevear <jpr@novell.com>
* Makefile.am: build versioned library and don't hard code pkg
config name
2004-09-23 JP Rosevear <jpr@novell.com>
* libebook/Makefile.am: build a versioned lib, don't hard
code the pkgconfig version
* libedata-book/Makefile.am: ditto
* backends/file/Makefile.am: link against the correct library
version
* backends/groupwise/Makefile.am: ditto
* backends/vcf/Makefile.am: ditto
* backends/ldap/Makefile.am: ditto
* tests/vcard/Makefile.am: ditto
* tests/ebook/Makefile.am: ditto
2004-09-23 JP Rosevear <jpr@novell.com>
* libecal/Makefile.am: build a versioned lib, don't hard
code the pkgconfig version
* libedata-cal/Makefile.am: ditto
* backends/file/Makefile.am: link against the correct library version
* backends/http/Makefile.am: ditto
* backends/groupwise/Makefile.am: ditto
* backends/contacts/Makefile.am: ditto
* tests/ecal/Makefile.am: ditto
33 files changed, 212 insertions, 128 deletions
@@ -1,3 +1,15 @@ +2004-09-23 JP Rosevear <jpr@novell.com> + + * Makefile.am: don't hard code pkg config version + + * configure.in: bump version, reset libtool versions because the + library is now versioned + + * libedataserver/Makefile.am: build versioned lib and version + pkgconfig stuff + + * src/Makefile.am: link against versioned libs + 2004-09-22 Harish Krishnaswamy <kharish@novell.com> * libedataserver/e-file-cache.[ch]: diff --git a/Makefile.am b/Makefile.am index 95c181501..f726f1b6a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,25 +7,28 @@ DIST_SUBDIRS= libedataserver servers addressbook calendar src docs po changelogs = \ ChangeLog +%-$(BASE_VERSION).pc: %.pc + cp $< $@ + pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = evolution-data-server-1.0.pc +pkgconfig_DATA = evolution-data-server-$(BASE_VERSION).pc -EXTRA_DIST = \ - AUTHORS \ - $(changelogs) \ - README \ - HACKING \ - MAINTAINERS \ - TODO \ - NEWS \ - marshal.mk \ - intltool-merge.in \ - intltool-update.in \ - intltool-extract.in \ - $(pkgconfig_DATA:.pc=.pc.in) \ +EXTRA_DIST = \ + AUTHORS \ + $(changelogs) \ + README \ + HACKING \ + MAINTAINERS \ + TODO \ + NEWS \ + marshal.mk \ + intltool-merge.in \ + intltool-update.in \ + intltool-extract.in \ + $(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in) \ $(LIBDB_FILES) -DISTCLEANFILES = intltool-extract intltool-merge intltool-update +DISTCLEANFILES = intltool-extract intltool-merge intltool-update $(pkgconfig_DATA) distclean-local: (cd libdb && $(MAKE) $(AM_MAKEFLAGS) distclean) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 8bb398f50..2a045249f 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,23 @@ +2004-09-23 JP Rosevear <jpr@novell.com> + + * libebook/Makefile.am: build a versioned lib, don't hard + code the pkgconfig version + + * libedata-book/Makefile.am: ditto + + * backends/file/Makefile.am: link against the correct library + version + + * backends/groupwise/Makefile.am: ditto + + * backends/vcf/Makefile.am: ditto + + * backends/ldap/Makefile.am: ditto + + * tests/vcard/Makefile.am: ditto + + * tests/ebook/Makefile.am: ditto + 2004-09-22 William Jon McCann <mccann@jhu.edu> * libebook/e-book.c (emit_async_open_response) diff --git a/addressbook/backends/file/Makefile.am b/addressbook/backends/file/Makefile.am index 80f194e1f..87f006aee 100644 --- a/addressbook/backends/file/Makefile.am +++ b/addressbook/backends/file/Makefile.am @@ -14,5 +14,5 @@ libebookbackendfile_la_SOURCES = \ e-book-backend-file.h libebookbackendfile_la_LIBADD = \ - $(top_builddir)/addressbook/libedata-book/libedata-book.la \ - $(top_builddir)/libedataserver/libedataserver.la + $(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la \ + $(top_builddir)/libedataserver/libedataserver-1.2.la diff --git a/addressbook/backends/groupwise/Makefile.am b/addressbook/backends/groupwise/Makefile.am index 78db548c5..6500cb594 100644 --- a/addressbook/backends/groupwise/Makefile.am +++ b/addressbook/backends/groupwise/Makefile.am @@ -14,14 +14,14 @@ libebookbackendgroupwise_la_SOURCES = \ e-book-backend-groupwise.h libebookbackendgroupwise_la_LIBADD = \ - $(top_builddir)/servers/groupwise/libegroupwise.la + $(top_builddir)/servers/groupwise/libegroupwise-1.2.la $(SOUP_LIBS) noinst_PROGRAMS = create-account create_account_SOURCES = create-account.c -create_account_LDADD = $(top_builddir)/addressbook/libedata-book/libedata-book.la \ - $(top_builddir)/libedataserver/libedataserver.la \ - $(top_builddir)/servers/groupwise/libegroupwise.la \ +create_account_LDADD = $(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la \ + $(top_builddir)/libedataserver/libedataserver-1.2.la \ + $(top_builddir)/servers/groupwise/libegroupwise-1.2.la \ $(E_DATA_SERVER_LIBS) diff --git a/addressbook/backends/ldap/Makefile.am b/addressbook/backends/ldap/Makefile.am index 8add0d6cd..eb23b9a2a 100644 --- a/addressbook/backends/ldap/Makefile.am +++ b/addressbook/backends/ldap/Makefile.am @@ -15,8 +15,8 @@ libebookbackendldap_la_SOURCES = \ libebookbackendldap_la_LIBADD = \ $(LDAP_LIBS) \ - $(top_builddir)/addressbook/libedata-book/libedata-book.la \ - $(top_builddir)/libedataserver/libedataserver.la + $(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la \ + $(top_builddir)/libedataserver/libedataserver-1.2.la LDAP_SCHEMA = \ evolutionperson.schema diff --git a/addressbook/backends/vcf/Makefile.am b/addressbook/backends/vcf/Makefile.am index f60a9e7aa..b8a614f41 100644 --- a/addressbook/backends/vcf/Makefile.am +++ b/addressbook/backends/vcf/Makefile.am @@ -13,5 +13,5 @@ libebookbackendvcf_la_SOURCES = \ e-book-backend-vcf.h libebookbackendvcf_la_LIBADD = \ - $(top_builddir)/addressbook/libedata-book/libedata-book.la \ - $(top_builddir)/libedataserver/libedataserver.la
\ No newline at end of file + $(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la \ + $(top_builddir)/libedataserver/libedataserver-1.2.la
\ No newline at end of file diff --git a/addressbook/libebook/Makefile.am b/addressbook/libebook/Makefile.am index 40af08ca1..8647112a7 100644 --- a/addressbook/libebook/Makefile.am +++ b/addressbook/libebook/Makefile.am @@ -31,9 +31,9 @@ MARSHAL_GENERATED = e-book-marshal.c e-book-marshal.h @EVO_MARSHAL_RULE@ # The library -lib_LTLIBRARIES = libebook.la +lib_LTLIBRARIES = libebook-1.2.la -libebook_la_SOURCES = \ +libebook_1_2_la_SOURCES = \ $(CORBA_GENERATED_C) \ $(MARSHAL_GENERATED) \ e-address-western.c \ @@ -46,11 +46,11 @@ libebook_la_SOURCES = \ e-name-western.c \ e-vcard.c -libebook_la_LIBADD = \ +libebook_1_2_la_LIBADD = \ $(EVOLUTION_ADDRESSBOOK_LIBS) \ - $(top_builddir)/libedataserver/libedataserver.la + $(top_builddir)/libedataserver/libedataserver-1.2.la -libebook_la_LDFLAGS = \ +libebook_1_2_la_LDFLAGS = \ -version-info $(LIBEBOOK_CURRENT):$(LIBEBOOK_REVISION):$(LIBEBOOK_AGE) libebookincludedir = $(privincludedir)/libebook @@ -69,15 +69,19 @@ libebookinclude_HEADERS = \ e-name-western-tables.h \ e-vcard.h +%-$(BASE_VERSION).pc: %.pc + cp $< $@ + pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libebook-1.0.pc +pkgconfig_DATA = libebook-$(BASE_VERSION).pc BUILT_SOURCES = $(CORBA_GENERATED) $(MARSHAL_GENERATED) CLEANFILES = $(BUILT_SOURCES) +DISTCLEANFILES = $(pkgconfig_DATA) -EXTRA_DIST = \ - e-book-marshal.list \ - $(pkgconfig_DATA:.pc=.pc.in) +EXTRA_DIST = \ + e-book-marshal.list \ + $(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in) dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) diff --git a/addressbook/libebook/libebook-1.0.pc.in b/addressbook/libebook/libebook.pc.in index a23003e77..c65cdca90 100644 --- a/addressbook/libebook/libebook-1.0.pc.in +++ b/addressbook/libebook/libebook.pc.in @@ -11,6 +11,6 @@ privincludedir=@privincludedir@ Name: libebook Description: Client library for evolution address books Version: @VERSION@ -Requires: libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libgnome-2.0 libedataserver-1.0 -Libs: -L${libdir} -lebook +Requires: libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libgnome-2.0 libedataserver-1.2 +Libs: -L${libdir} -lebook-1.2 Cflags: -I${privincludedir} diff --git a/addressbook/libedata-book/Makefile.am b/addressbook/libedata-book/Makefile.am index 42161800e..81943088d 100644 --- a/addressbook/libedata-book/Makefile.am +++ b/addressbook/libedata-book/Makefile.am @@ -29,9 +29,9 @@ MARSHAL_GENERATED = e-data-book-marshal.c e-data-book-marshal.h @EVO_MARSHAL_RULE@ # The library -lib_LTLIBRARIES = libedata-book.la +lib_LTLIBRARIES = libedata-book-1.2.la -libedata_book_la_SOURCES = \ +libedata_book_1_2_la_SOURCES = \ $(MARSHAL_GENERATED) \ $(CORBA_GENERATED_C) \ e-book-backend-sexp.c \ @@ -43,12 +43,12 @@ libedata_book_la_SOURCES = \ e-data-book.c \ ximian-vcard.h -libedata_book_la_LIBADD = \ +libedata_book_1_2_la_LIBADD = \ $(EVOLUTION_ADDRESSBOOK_LIBS) \ - $(top_builddir)/addressbook/libebook/libebook.la \ - $(top_builddir)/libedataserver/libedataserver.la + $(top_builddir)/addressbook/libebook/libebook-1.2.la \ + $(top_builddir)/libedataserver/libedataserver-1.2.la -libedata_book_la_LDFLAGS = \ +libedata_book_1_2_la_LDFLAGS = \ -version-info $(LIBEDATABOOK_CURRENT):$(LIBEDATABOOK_REVISION):$(LIBEDATABOOK_AGE) libedata_bookincludedir = $(privincludedir)/libedata-book @@ -64,15 +64,19 @@ libedata_bookinclude_HEADERS = \ e-data-book-view.h \ e-data-book.h +%-$(BASE_VERSION).pc: %.pc + cp $< $@ + pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libedata-book-1.0.pc +pkgconfig_DATA = libedata-book-$(BASE_VERSION).pc BUILT_SOURCES = $(CORBA_GENERATED) $(MARSHAL_GENERATED) CLEANFILES = $(BUILT_SOURCES) +DISTCLEANFILES = $(pkgconfig_DATA) -EXTRA_DIST = \ - e-data-book-marshal.list \ - $(pkgconfig_DATA:.pc=.pc.in) +EXTRA_DIST = \ + e-data-book-marshal.list \ + $(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in) dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) diff --git a/addressbook/libedata-book/libedata-book-1.0.pc.in b/addressbook/libedata-book/libedata-book.pc.in index 4a8e13385..9cb8fcb71 100644 --- a/addressbook/libedata-book/libedata-book-1.0.pc.in +++ b/addressbook/libedata-book/libedata-book.pc.in @@ -11,6 +11,6 @@ privincludedir=@privincludedir@ Name: libedatabook Description: Backend library for evolution address books Version: @VERSION@ -Requires: libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libgnome-2.0 libedataserver-1.0 libebook-1.0 -Libs: -L${libdir} -ledata-book +Requires: libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libgnome-2.0 libedataserver-1.2 libebook-1.2 +Libs: -L${libdir} -ledata-book-1.2 Cflags: -I${privincludedir} diff --git a/addressbook/tests/ebook/Makefile.am b/addressbook/tests/ebook/Makefile.am index ede97ea49..0fe6bf61e 100644 --- a/addressbook/tests/ebook/Makefile.am +++ b/addressbook/tests/ebook/Makefile.am @@ -5,8 +5,8 @@ INCLUDES = \ -I$(top_builddir)/addressbook \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) -TEST_LIBS= \ - $(top_builddir)/addressbook/libebook/libebook.la\ +TEST_LIBS= \ + $(top_builddir)/addressbook/libebook/libebook-1.2.la \ $(EVOLUTION_ADDRESSBOOK_LIBS) noinst_PROGRAMS= test-changes test-categories test-date test-ebook test-ebook-async test-ebook-view test-nonexistent-id test-photo test-query test-self test-string test-undefinedfield test-untyped-phones test-search test-stress-bookviews diff --git a/addressbook/tests/vcard/Makefile.am b/addressbook/tests/vcard/Makefile.am index 969b3aeda..d48d35642 100644 --- a/addressbook/tests/vcard/Makefile.am +++ b/addressbook/tests/vcard/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = \ noinst_PROGRAMS = dump-vcard dump_vcard_LDADD = \ - $(top_builddir)/addressbook/libebook/libebook.la \ + $(top_builddir)/addressbook/libebook/libebook-1.2.la \ $(EVOLUTION_ADDRESSBOOK_LIBS) EXTRA_DIST=1.vcf 2.vcf 3.vcf 4.vcf 5.vcf 6.vcf 7.vcf 8.vcf 9.vcf 10.vcf 11.vcf diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 55c562e48..8ebdd912b 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,20 @@ +2004-09-23 JP Rosevear <jpr@novell.com> + + * libecal/Makefile.am: build a versioned lib, don't hard + code the pkgconfig version + + * libedata-cal/Makefile.am: ditto + + * backends/file/Makefile.am: link against the correct library version + + * backends/http/Makefile.am: ditto + + * backends/groupwise/Makefile.am: ditto + + * backends/contacts/Makefile.am: ditto + + * tests/ecal/Makefile.am: ditto + 2004-09-22 Harish Krishnaswamy <kharish@novell.com> * backends/groupwise/e-cal-backend-groupwise-utils.[ch]: diff --git a/calendar/backends/contacts/Makefile.am b/calendar/backends/contacts/Makefile.am index cb3506cb6..be8cb917d 100644 --- a/calendar/backends/contacts/Makefile.am +++ b/calendar/backends/contacts/Makefile.am @@ -19,5 +19,5 @@ libecalbackendcontacts_la_SOURCES = \ e-cal-backend-contacts.h libecalbackendcontacts_la_LIBADD = \ - $(top_builddir)/calendar/libedata-cal/libedata-cal.la + $(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la diff --git a/calendar/backends/file/Makefile.am b/calendar/backends/file/Makefile.am index c5a767940..7c316c60c 100644 --- a/calendar/backends/file/Makefile.am +++ b/calendar/backends/file/Makefile.am @@ -21,5 +21,5 @@ libecalbackendfile_la_SOURCES = \ e-cal-backend-file.h libecalbackendfile_la_LIBADD = \ - $(top_builddir)/calendar/libedata-cal/libedata-cal.la + $(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la diff --git a/calendar/backends/groupwise/Makefile.am b/calendar/backends/groupwise/Makefile.am index 4cfd28966..4cf5ed97b 100644 --- a/calendar/backends/groupwise/Makefile.am +++ b/calendar/backends/groupwise/Makefile.am @@ -25,7 +25,7 @@ libecalbackendgroupwise_la_SOURCES = \ e-cal-backend-groupwise-utils.h libecalbackendgroupwise_la_LIBADD = \ - $(top_builddir)/calendar/libedata-cal/libedata-cal.la \ - $(top_builddir)/calendar/backends/file/libecalbackendfile.la \ - $(top_builddir)/servers/groupwise/libegroupwise.la \ + $(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la \ + $(top_builddir)/calendar/backends/file/libecalbackendfile.la\ + $(top_builddir)/servers/groupwise/libegroupwise-1.2.la \ $(SOUP_LIBS) diff --git a/calendar/backends/http/Makefile.am b/calendar/backends/http/Makefile.am index aa31ad783..f0528f752 100644 --- a/calendar/backends/http/Makefile.am +++ b/calendar/backends/http/Makefile.am @@ -19,7 +19,7 @@ libecalbackendhttp_la_SOURCES = \ e-cal-backend-http.c \ e-cal-backend-http.h -libecalbackendhttp_la_LIBADD = \ - $(top_builddir)/calendar/libedata-cal/libedata-cal.la \ - $(top_builddir)/calendar/backends/file/libecalbackendfile.la \ +libecalbackendhttp_la_LIBADD = \ + $(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la \ + $(top_builddir)/calendar/backends/file/libecalbackendfile.la \ $(SOUP_LIBS) diff --git a/calendar/libecal/Makefile.am b/calendar/libecal/Makefile.am index ffbce1d13..232684100 100644 --- a/calendar/libecal/Makefile.am +++ b/calendar/libecal/Makefile.am @@ -36,9 +36,9 @@ MARSHAL_GENERATED = e-cal-marshal.c e-cal-marshal.h @EVO_MARSHAL_RULE@ # The library -lib_LTLIBRARIES = libecal.la +lib_LTLIBRARIES = libecal-1.2.la -libecal_la_SOURCES = \ +libecal_1_2_la_SOURCES = \ $(CORBA_GENERATED_C) \ $(MARSHAL_GENERATED) \ e-cal.c \ @@ -50,14 +50,14 @@ libecal_la_SOURCES = \ e-cal-view.c \ e-cal-view-listener.c -libecal_la_LIBADD = \ +libecal_1_2_la_LIBADD = \ $(EVOLUTION_CALENDAR_LIBS) \ $(top_builddir)/calendar/libical/src/libical/libical-evolution.la \ $(top_builddir)/calendar/libical/src/libicalvcal/libicalvcal-evolution.la \ - $(top_builddir)/calendar/libical/src/libicalss/libicalss-evolution.la \ - $(top_builddir)/libedataserver/libedataserver.la + $(top_builddir)/calendar/libical/src/libicalss/libicalss-evolution.la \ + $(top_builddir)/libedataserver/libedataserver-1.2.la -libecal_la_LDFLAGS = \ +libecal_1_2_la_LDFLAGS = \ -version-info $(LIBECAL_CURRENT):$(LIBECAL_REVISION):$(LIBECAL_AGE) libecalincludedir = $(privincludedir)/libecal @@ -74,15 +74,20 @@ libecalinclude_HEADERS = \ e-cal-view.h \ e-cal-view-listener.h +%-$(BASE_VERSION).pc: %.pc + cp $< $@ + pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libecal-1.0.pc +pkgconfig_DATA = libecal-$(BASE_VERSION).pc BUILT_SOURCES = $(CORBA_GENERATED) $(MARSHAL_GENERATED) CLEANFILES = $(BUILT_SOURCES) +DISTCLEANFILES = $(pkgconfig_DATA) -EXTRA_DIST = \ - e-cal-marshal.list \ - $(pkgconfig_DATA:.pc=.pc.in) +EXTRA_DIST = \ + e-cal-marshal.list \ + $(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in) dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) + diff --git a/calendar/libecal/libecal-1.0.pc.in b/calendar/libecal/libecal.pc.in index 8f57f6ced..2cbf7b7b9 100644 --- a/calendar/libecal/libecal-1.0.pc.in +++ b/calendar/libecal/libecal.pc.in @@ -11,6 +11,6 @@ privincludedir=@privincludedir@ Name: libedatacal Description: Backend library for evolution calendars Version: @VERSION@ -Requires: libgnome-2.0 libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libedataserver-1.0 -Libs: -L${libdir} -lecal +Requires: libgnome-2.0 libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libedataserver-1.2 +Libs: -L${libdir} -lecal-1.2 Cflags: -I${privincludedir} diff --git a/calendar/libedata-cal/Makefile.am b/calendar/libedata-cal/Makefile.am index dd87cb6a3..de654f852 100644 --- a/calendar/libedata-cal/Makefile.am +++ b/calendar/libedata-cal/Makefile.am @@ -31,9 +31,9 @@ $(CORBA_GENERATED_H): $(idls) $(CORBA_GENERATED_C): $(CORBA_GENERATED_H) # The libraray -lib_LTLIBRARIES = libedata-cal.la +lib_LTLIBRARIES = libedata-cal-1.2.la -libedata_cal_la_SOURCES = \ +libedata_cal_1_2_la_SOURCES = \ $(CORBA_GENERATED_C) \ e-cal-backend.c \ e-cal-backend-cache.c \ @@ -44,12 +44,12 @@ libedata_cal_la_SOURCES = \ e-data-cal-factory.c \ e-data-cal-view.c -libedata_cal_la_LIBADD = \ +libedata_cal_1_2_la_LIBADD = \ $(EVOLUTION_CALENDAR_LIBS) \ - $(top_builddir)/calendar/libecal/libecal.la \ - $(top_builddir)/libedataserver/libedataserver.la + $(top_builddir)/calendar/libecal/libecal-1.2.la \ + $(top_builddir)/libedataserver/libedataserver-1.2.la -libedata_cal_la_LDFLAGS = \ +libedata_cal_1_2_la_LDFLAGS = \ -version-info $(LIBEDATACAL_CURRENT):$(LIBEDATACAL_REVISION):$(LIBEDATACAL_AGE) libedata_calincludedir = $(privincludedir)/libedata-cal @@ -66,14 +66,18 @@ libedata_calinclude_HEADERS = \ e-data-cal-factory.h \ e-data-cal-view.h +%-$(BASE_VERSION).pc: %.pc + cp $< $@ + pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libedata-cal-1.0.pc +pkgconfig_DATA = libedata-cal-$(BASE_VERSION).pc BUILT_SOURCES = $(CORBA_GENERATED) CLEANFILES = $(BUILT_SOURCES) +DISTCLEANFILES = $(pkgconfig_DATA) -EXTRA_DIST = \ - $(pkgconfig_DATA:.pc=.pc.in) +EXTRA_DIST = \ + $(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in) dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) diff --git a/calendar/libedata-cal/libedata-cal-1.0.pc.in b/calendar/libedata-cal/libedata-cal.pc.in index 722b2da8e..6b30fb15c 100644 --- a/calendar/libedata-cal/libedata-cal-1.0.pc.in +++ b/calendar/libedata-cal/libedata-cal.pc.in @@ -11,6 +11,6 @@ privincludedir=@privincludedir@ Name: libecal Description: Client library for evolution calendars Version: @VERSION@ -Requires: libgnome-2.0 libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ gnome-vfs-2.0 libedataserver-1.0 libecal-1.0 -Libs: -L${libdir} -ledata-cal -lecal +Requires: libgnome-2.0 libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ gnome-vfs-2.0 libedataserver-1.2 libecal-1.2 +Libs: -L${libdir} -ledata-cal-1.2 -lecal-1.2 Cflags: -I${privincludedir} diff --git a/calendar/tests/ecal/Makefile.am b/calendar/tests/ecal/Makefile.am index 463a0af27..fe6914ba5 100644 --- a/calendar/tests/ecal/Makefile.am +++ b/calendar/tests/ecal/Makefile.am @@ -29,7 +29,7 @@ test_ecal_INCLUDES = \ -DG_LOG_DOMAIN=\"test-ecal\" test_ecal_LDADD = \ - $(top_builddir)/calendar/libecal/libecal.la \ + $(top_builddir)/calendar/libecal/libecal-1.2.la \ $(top_builddir)/calendar/libical/src/libical/libical-evolution.la \ $(EVOLUTION_CALENDAR_LIBS) @@ -42,6 +42,6 @@ test_search_INCLUDES = \ -DG_LOG_DOMAIN=\"test-ecal\" test_search_LDADD = \ - $(top_builddir)/calendar/libecal/libecal.la \ + $(top_builddir)/calendar/libecal/libecal-1.2.la \ $(top_builddir)/calendar/libical/src/libical/libical-evolution.la \ $(EVOLUTION_CALENDAR_LIBS) diff --git a/configure.in b/configure.in index 36e0574da..2d9fc9728 100644 --- a/configure.in +++ b/configure.in @@ -19,27 +19,27 @@ AC_SUBST(BASE_VERSION) AC_DEFINE_UNQUOTED(BASE_VERSION, "$BASE_VERSION", [Base version (Major.Minor)]) # Libtool versioning -LIBEDATASERVER_CURRENT=5 -LIBEDATASERVER_REVISION=1 -LIBEDATASERVER_AGE=2 +LIBEDATASERVER_CURRENT=0 +LIBEDATASERVER_REVISION=0 +LIBEDATASERVER_AGE=0 -LIBECAL_CURRENT=7 -LIBECAL_REVISION=4 -LIBECAL_AGE=1 +LIBECAL_CURRENT=0 +LIBECAL_REVISION=0 +LIBECAL_AGE=0 -LIBEDATACAL_CURRENT=6 -LIBEDATACAL_REVISION=4 -LIBEDATACAL_AGE=1 +LIBEDATACAL_CURRENT=0 +LIBEDATACAL_REVISION=0 +LIBEDATACAL_AGE=0 -LIBEDATABOOK_CURRENT=1 -LIBEDATABOOK_REVISION=1 +LIBEDATABOOK_CURRENT=0 +LIBEDATABOOK_REVISION=0 LIBEDATABOOK_AGE=0 -LIBEBOOK_CURRENT=8 -LIBEBOOK_REVISION=2 +LIBEBOOK_CURRENT=0 +LIBEBOOK_REVISION=0 LIBEBOOK_AGE=0 -LIBEGROUPWISE_CURRENT=4 +LIBEGROUPWISE_CURRENT=0 LIBEGROUPWISE_REVISION=0 LIBEGROUPWISE_AGE=0 @@ -286,13 +286,13 @@ AC_CONFIG_SUBDIRS(libdb/dist) AC_OUTPUT([ Makefile -evolution-data-server-1.0.pc +evolution-data-server.pc addressbook/Makefile addressbook/idl/Makefile addressbook/libebook/Makefile -addressbook/libebook/libebook-1.0.pc +addressbook/libebook/libebook.pc addressbook/libedata-book/Makefile -addressbook/libedata-book/libedata-book-1.0.pc +addressbook/libedata-book/libedata-book.pc addressbook/backends/Makefile addressbook/backends/file/Makefile addressbook/backends/vcf/Makefile @@ -304,9 +304,9 @@ addressbook/tests/vcard/Makefile calendar/Makefile calendar/idl/Makefile calendar/libecal/Makefile -calendar/libecal/libecal-1.0.pc +calendar/libecal/libecal.pc calendar/libedata-cal/Makefile -calendar/libedata-cal/libedata-cal-1.0.pc +calendar/libedata-cal/libedata-cal.pc calendar/backends/Makefile calendar/backends/file/Makefile calendar/backends/groupwise/Makefile @@ -316,10 +316,10 @@ calendar/tests/Makefile calendar/tests/ecal/Makefile libdb/Makefile libedataserver/Makefile -libedataserver/libedataserver-1.0.pc +libedataserver/libedataserver.pc servers/Makefile servers/groupwise/Makefile -servers/groupwise/libegroupwise-1.0.pc +servers/groupwise/libegroupwise.pc src/Makefile docs/Makefile docs/reference/Makefile diff --git a/docs/reference/addressbook/libebook/Makefile.am b/docs/reference/addressbook/libebook/Makefile.am index 9daf37d50..dee41cb0b 100644 --- a/docs/reference/addressbook/libebook/Makefile.am +++ b/docs/reference/addressbook/libebook/Makefile.am @@ -24,7 +24,7 @@ GTKDOC_CFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir)/addressbook/libical/src \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) -GTKDOC_LIBS = $(top_builddir)/addressbook/libebook/libebook.la $(EVOLUTION_ADDRESSBOOK_LIBS) +GTKDOC_LIBS = $(top_builddir)/addressbook/libebook/libebook-1.2.la $(EVOLUTION_ADDRESSBOOK_LIBS) #################################### # Everything below here is generic # diff --git a/docs/reference/calendar/libecal/Makefile.am b/docs/reference/calendar/libecal/Makefile.am index 55879aa2c..f20b7ba99 100644 --- a/docs/reference/calendar/libecal/Makefile.am +++ b/docs/reference/calendar/libecal/Makefile.am @@ -24,7 +24,7 @@ GTKDOC_CFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir)/calendar/libical/src \ $(EVOLUTION_CALENDAR_CFLAGS) -GTKDOC_LIBS = $(top_builddir)/calendar/libecal/libecal.la $(EVOLUTION_CALENDAR_LIBS) +GTKDOC_LIBS = $(top_builddir)/calendar/libecal/libecal-1.2.la $(EVOLUTION_CALENDAR_LIBS) #################################### # Everything below here is generic # diff --git a/evolution-data-server-1.0.pc.in b/evolution-data-server.pc.in index ca6ac0238..ca6ac0238 100644 --- a/evolution-data-server-1.0.pc.in +++ b/evolution-data-server.pc.in diff --git a/libedataserver/Makefile.am b/libedataserver/Makefile.am index 0c3dee5c4..4e759d823 100644 --- a/libedataserver/Makefile.am +++ b/libedataserver/Makefile.am @@ -8,10 +8,10 @@ INCLUDES = \ MARSHAL_GENERATED = e-data-server-marshal.c e-data-server-marshal.h @EVO_MARSHAL_RULE@ -lib_LTLIBRARIES = libedataserver.la +lib_LTLIBRARIES = libedataserver-1.2.la noinst_PROGRAMS = test-source-list -libedataserver_la_SOURCES = \ +libedataserver_1_2_la_SOURCES = \ $(MARSHAL_GENERATED) \ e-account-list.c \ e-account.c \ @@ -33,11 +33,11 @@ libedataserver_la_SOURCES = \ e-xml-hash-utils.c \ md5-utils.c -libedataserver_la_LIBADD = \ +libedataserver_1_2_la_LIBADD = \ $(E_DATA_SERVER_LIBS) \ $(top_builddir)/libdb/dist/libdb-4.1.la -libedataserver_la_LDFLAGS = \ +libedataserver_1_2_la_LDFLAGS = \ -version-info $(LIBEDATASERVER_CURRENT):$(LIBEDATASERVER_REVISION):$(LIBEDATASERVER_AGE) libedataserverincludedir = $(privincludedir)/libedataserver @@ -64,10 +64,15 @@ libedataserverinclude_HEADERS = \ md5-utils.h test_source_list_SOURCES = test-source-list.c -test_source_list_LDADD = libedataserver.la $(E_DATA_SERVER_LIBS) +test_source_list_LDADD = libedataserver-1.2.la $(E_DATA_SERVER_LIBS) + +%-$(BASE_VERSION).pc: %.pc + cp $< $@ pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libedataserver-1.0.pc +pkgconfig_DATA = libedataserver-$(BASE_VERSION).pc + +EXTRA_DIST = \ + $(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in) -EXTRA_DIST = \ - $(pkgconfig_DATA:.pc=.pc.in) +DISTCLEANFILES = $(pkgconfig_DATA)
\ No newline at end of file diff --git a/libedataserver/libedataserver-1.0.pc.in b/libedataserver/libedataserver.pc.in index c045b9530..6c31965ec 100644 --- a/libedataserver/libedataserver-1.0.pc.in +++ b/libedataserver/libedataserver.pc.in @@ -12,5 +12,5 @@ Name: libedataserver Description: Utily library for evolution data servers Version: @VERSION@ Requires: libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libgnome-2.0 libxml-2.0 ORBit-2.0 >= @ORBIT_REQUIRED@ -Libs: -L${libdir} -ledataserver +Libs: -L${libdir} -ledataserver-1.2 Cflags: -I${privincludedir} diff --git a/servers/groupwise/ChangeLog b/servers/groupwise/ChangeLog index 5d0e01e3f..56a0a59f1 100644 --- a/servers/groupwise/ChangeLog +++ b/servers/groupwise/ChangeLog @@ -1,3 +1,8 @@ +2004-09-23 JP Rosevear <jpr@novell.com> + + * Makefile.am: build versioned library and don't hard code pkg + config name + 2004-09-22 Harish Krishnaswamy <kharish@novell.com> Fixes #61865 diff --git a/servers/groupwise/Makefile.am b/servers/groupwise/Makefile.am index 73f8ad8e5..d48ac429b 100644 --- a/servers/groupwise/Makefile.am +++ b/servers/groupwise/Makefile.am @@ -10,19 +10,19 @@ noinst_PROGRAMS = create-account soap-test create_account_SOURCES = create-account.c create_account_LDADD = \ - $(top_builddir)/libedataserver/libedataserver.la \ + $(top_builddir)/libedataserver/libedataserver-1.2.la \ $(SOUP_LIBS) \ $(E_DATA_SERVER_LIBS) soap_test_SOURCES = soap-test.c soap_test_LDADD = \ $(SOUP_LIBS) \ - libegroupwise.la \ + libegroupwise-1.2.la \ $(E_DATA_SERVER_LIBS) -lib_LTLIBRARIES = libegroupwise.la +lib_LTLIBRARIES = libegroupwise-1.2.la -libegroupwise_la_SOURCES = \ +libegroupwise_1_2_la_SOURCES = \ e-gw-connection.c \ e-gw-connection.h \ e-gw-container.c \ @@ -34,11 +34,11 @@ libegroupwise_la_SOURCES = \ e-gw-filter.c \ e-gw-filter.h -libegroupwise_la_LIBADD = \ +libegroupwise_1_2_la_LIBADD = \ $(E_DATA_SERVER_LIBS) \ $(SOUP_LIBS) -libegroupwise_la_LDFLAGS = \ +libegroupwise_1_2_la_LDFLAGS = \ -version-info $(LIBEGROUPWISE_CURRENT):$(LIBEGROUPWISE_REVISION):$(LIBEGROUPWISE_AGE) libegroupwiseincludedir = $(privincludedir)/groupwise @@ -50,7 +50,12 @@ libegroupwiseinclude_HEADERS = \ e-gw-item.h \ e-gw-filter.h +%-$(BASE_VERSION).pc: %.pc + cp $< $@ + pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libegroupwise-1.0.pc +pkgconfig_DATA = libegroupwise-$(BASE_VERSION).pc + +EXTRA_DIST = $(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in) -EXTRA_DIST = $(pkgconfig_DATA:.pc=.pc.in) +DISTCLEANFILES = $(pkgconfig_DATA)
\ No newline at end of file diff --git a/servers/groupwise/libegroupwise-1.0.pc.in b/servers/groupwise/libegroupwise.pc.in index 88c319cfa..47e2826ff 100644 --- a/servers/groupwise/libegroupwise-1.0.pc.in +++ b/servers/groupwise/libegroupwise.pc.in @@ -12,5 +12,5 @@ Name: libegroupwise Description: Client library for accessing groupwise POA through SOAP interface Version: @VERSION@ Requires: libsoup-2.2 >= @LIBSOUP_REQUIRED@ -Libs: -L${libdir} -legroupwise +Libs: -L${libdir} -legroupwise-1.2 Cflags: -I${privincludedir}/groupwise diff --git a/src/Makefile.am b/src/Makefile.am index 5ff299f6d..b07c5af4d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -56,16 +56,16 @@ LDAP_BACKEND_LIB= endif evolution_data_server_LDADD = \ - $(top_builddir)/addressbook/libedata-book/libedata-book.la \ + $(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la \ $(top_builddir)/addressbook/backends/file/libebookbackendfile.la \ $(top_builddir)/addressbook/backends/vcf/libebookbackendvcf.la \ $(top_builddir)/addressbook/backends/groupwise/libebookbackendgroupwise.la \ $(LDAP_BACKEND_LIB) \ - $(top_builddir)/calendar/libedata-cal/libedata-cal.la \ + $(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la \ $(top_builddir)/calendar/backends/file/libecalbackendfile.la \ $(top_builddir)/calendar/backends/groupwise/libecalbackendgroupwise.la \ $(top_builddir)/calendar/backends/http/libecalbackendhttp.la \ - $(top_builddir)/addressbook/libebook/libebook.la \ + $(top_builddir)/addressbook/libebook/libebook-1.2.la \ $(top_builddir)/calendar/backends/contacts/libecalbackendcontacts.la \ $(LDAP_LIBS) \ $(E_DATA_SERVER_LIBS) |