+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]:
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)
+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)
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
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)
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
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
@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 \
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
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)
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}
@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 \
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
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)
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}
-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
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
+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]:
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
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
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)
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)
@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 \
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
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)
+
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}
$(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 \
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
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)
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}
-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)
-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)
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
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
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
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
-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 #
-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 #
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 \
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
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
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}
+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
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 \
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
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
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
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)
projects / platform / upstream / evolution-data-server.git / commitdiff