From 484029619dc7bf745e8bfe187e2eb921f366ef8a Mon Sep 17 00:00:00 2001 From: Harish Krishnaswamy Date: Mon, 11 Apr 2005 12:21:33 +0000 Subject: [PATCH] use API_VERSION instead of BASE_VERSION in pc files. bump version, leave 2005-04-11 Harish Krishnaswamy * Makefile.am files: use API_VERSION instead of BASE_VERSION in pc files. * configure.in: bump version, leave extensiondir, idldir, bonobo server and libtool numbers untouched (use API_VERSION instead). * evolution-data-server.pc.in, libedataserver/Makefile.am, servers/groupwise/Makefile.am, src/Makefile.am: use API_VERSION. --- ChangeLog | 10 ++++++++++ Makefile.am | 6 +++--- addressbook/ChangeLog | 5 +++++ addressbook/libebook/Makefile.am | 6 +++--- addressbook/libedata-book/Makefile.am | 6 +++--- calendar/libecal/Makefile.am | 6 +++--- calendar/libedata-cal/Makefile.am | 6 +++--- camel/ChangeLog | 15 +++++++++++++++ camel/Makefile.am | 20 ++++++++++---------- camel/providers/local/Makefile.am | 2 +- camel/providers/pop3/Makefile.am | 2 +- camel/providers/smtp/Makefile.am | 2 +- camel/tests/folder/Makefile.am | 6 +++--- camel/tests/lib/Makefile.am | 10 +++++----- camel/tests/message/Makefile.am | 4 ++-- camel/tests/mime-filter/Makefile.am | 4 ++-- camel/tests/misc/Makefile.am | 6 +++--- camel/tests/smime/Makefile.am | 6 +++--- camel/tests/stream/Makefile.am | 4 ++-- configure.in | 12 +++++++----- evolution-data-server.pc.in | 2 +- libedataserver/Makefile.am | 6 +++--- libedataserverui/ChangeLog | 4 ++++ libedataserverui/Makefile.am | 6 +++--- servers/groupwise/Makefile.am | 6 +++--- src/Makefile.am | 2 +- 26 files changed, 100 insertions(+), 64 deletions(-) diff --git a/ChangeLog b/ChangeLog index be8be82..0110c4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2005-04-11 Harish Krishnaswamy + + * Makefile.am: use API_VERSION instead of BASE_VERSION in + pc files. + * configure.in: bump version, leave extensiondir, idldir, + bonobo server and libtool numbers untouched (use API_VERSION + instead). + * evolution-data-server.pc.in, libedataserver/Makefile.am, + servers/groupwise/Makefile.am, src/Makefile.am: use API_VERSION. + 2005-04-07 Gareth Owen * po/en_GB.po: Updated British English translations diff --git a/Makefile.am b/Makefile.am index 65de60d..40dcd43 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,11 +7,11 @@ DIST_SUBDIRS= libedataserver servers camel addressbook calendar libedataserverui changelogs = \ ChangeLog -%-$(BASE_VERSION).pc: %.pc +%-$(API_VERSION).pc: %.pc cp $< $@ pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = evolution-data-server-$(BASE_VERSION).pc +pkgconfig_DATA = evolution-data-server-$(API_VERSION).pc EXTRA_DIST = \ AUTHORS \ @@ -26,7 +26,7 @@ EXTRA_DIST = \ intltool-merge.in \ intltool-update.in \ intltool-extract.in \ - $(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in) \ + $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) \ $(LIBDB_FILES) DISTCLEANFILES = intltool-extract intltool-merge intltool-update iconv-detect.h $(pkgconfig_DATA) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index e6dca5a..508f1d0 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,8 @@ +2005-04-11 Harish Krishnaswamy + + * libebook/Makefile.am, libedata-book/Makefile.am: + use API_VERSION + 2005-03-15 JP Rosevear Fixes #68533 (hackily) diff --git a/addressbook/libebook/Makefile.am b/addressbook/libebook/Makefile.am index c168ffb..aecb682 100644 --- a/addressbook/libebook/Makefile.am +++ b/addressbook/libebook/Makefile.am @@ -72,11 +72,11 @@ libebookinclude_HEADERS = \ e-name-western-tables.h \ e-vcard.h -%-$(BASE_VERSION).pc: %.pc +%-$(API_VERSION).pc: %.pc cp $< $@ pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libebook-$(BASE_VERSION).pc +pkgconfig_DATA = libebook-$(API_VERSION).pc BUILT_SOURCES = $(CORBA_GENERATED) $(MARSHAL_GENERATED) CLEANFILES = $(BUILT_SOURCES) @@ -84,7 +84,7 @@ DISTCLEANFILES = $(pkgconfig_DATA) EXTRA_DIST = \ e-book-marshal.list \ - $(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in) + $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) diff --git a/addressbook/libedata-book/Makefile.am b/addressbook/libedata-book/Makefile.am index 948ae94..70b065d 100644 --- a/addressbook/libedata-book/Makefile.am +++ b/addressbook/libedata-book/Makefile.am @@ -68,11 +68,11 @@ libedata_bookinclude_HEADERS = \ e-data-book.h \ e-book-backend-cache.h -%-$(BASE_VERSION).pc: %.pc +%-$(API_VERSION).pc: %.pc cp $< $@ pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libedata-book-$(BASE_VERSION).pc +pkgconfig_DATA = libedata-book-$(API_VERSION).pc BUILT_SOURCES = $(CORBA_GENERATED) $(MARSHAL_GENERATED) CLEANFILES = $(BUILT_SOURCES) @@ -80,7 +80,7 @@ DISTCLEANFILES = $(pkgconfig_DATA) EXTRA_DIST = \ e-data-book-marshal.list \ - $(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in) + $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) diff --git a/calendar/libecal/Makefile.am b/calendar/libecal/Makefile.am index 2326841..baeb63e 100644 --- a/calendar/libecal/Makefile.am +++ b/calendar/libecal/Makefile.am @@ -74,11 +74,11 @@ libecalinclude_HEADERS = \ e-cal-view.h \ e-cal-view-listener.h -%-$(BASE_VERSION).pc: %.pc +%-$(API_VERSION).pc: %.pc cp $< $@ pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libecal-$(BASE_VERSION).pc +pkgconfig_DATA = libecal-$(API_VERSION).pc BUILT_SOURCES = $(CORBA_GENERATED) $(MARSHAL_GENERATED) CLEANFILES = $(BUILT_SOURCES) @@ -86,7 +86,7 @@ DISTCLEANFILES = $(pkgconfig_DATA) EXTRA_DIST = \ e-cal-marshal.list \ - $(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in) + $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) diff --git a/calendar/libedata-cal/Makefile.am b/calendar/libedata-cal/Makefile.am index 49552f9..3542977 100644 --- a/calendar/libedata-cal/Makefile.am +++ b/calendar/libedata-cal/Makefile.am @@ -68,18 +68,18 @@ libedata_calinclude_HEADERS = \ e-data-cal-factory.h \ e-data-cal-view.h -%-$(BASE_VERSION).pc: %.pc +%-$(API_VERSION).pc: %.pc cp $< $@ pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libedata-cal-$(BASE_VERSION).pc +pkgconfig_DATA = libedata-cal-$(API_VERSION).pc BUILT_SOURCES = $(CORBA_GENERATED) CLEANFILES = $(BUILT_SOURCES) DISTCLEANFILES = $(pkgconfig_DATA) EXTRA_DIST = \ - $(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in) + $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) diff --git a/camel/ChangeLog b/camel/ChangeLog index 7f94e5e..b5f06ce 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,18 @@ +2005-04-11 Harish Krishnaswamy + + * Makefile.am: + * providers/local/Makefile.am: + * providers/pop3/Makefile.am: + * providers/smtp/Makefile.am: + * tests/folder/Makefile.am: + * tests/lib/Makefile.am: + * tests/message/Makefile.am: + * tests/mime-filter/Makefile.am: + * tests/misc/Makefile.am: + * tests/smime/Makefile.am: + * tests/stream/Makefile.am: + use API_VERSION + 2005-03-31 Jeffrey Stedfast * camel-sasl-digest-md5.c (camel_sasl_digest_md5_finalize): If the diff --git a/camel/Makefile.am b/camel/Makefile.am index 6235814..327866f 100644 --- a/camel/Makefile.am +++ b/camel/Makefile.am @@ -2,12 +2,12 @@ SUBDIRS = . providers tests -%-$(BASE_VERSION).pc: %.pc +%-$(API_VERSION).pc: %.pc cp $< $@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_in_files = camel.pc.in camel-provider.pc.in -pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=-$(BASE_VERSION).pc) +pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=-$(API_VERSION).pc) libcamelincludedir = $(privincludedir)/camel libcamel_providerincludedir = $(privincludedir)/camel @@ -121,7 +121,7 @@ libcamel_providerinclude_HEADERS = \ libcamel_provider_1_2_la_LDFLAGS = -version-info $(LIBCAMEL_CURRENT):$(LIBCAMEL_REVISION):$(LIBCAMEL_AGE) libcamel_provider_1_2_la_LIBADD = \ - $(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la \ + $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \ libcamel-1.2.la \ $(CAMEL_LIBS) @@ -262,7 +262,7 @@ libcamelinclude_HEADERS = \ libcamel_1_2_la_LDFLAGS = -version-info 0:0:0 libcamel_1_2_la_LIBADD = \ - $(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la \ + $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \ $(CAMEL_LIBS) camel_lock_helper_1_2_SOURCES = \ @@ -288,8 +288,8 @@ camel-mime-tables.c: gentables.pl install-exec-hook: @if test -n "$(CAMEL_LOCK_HELPER_USER)"; then \ if test `whoami` = root ; then \ - chown $(CAMEL_LOCK_HELPER_USER) $(DESTDIR)$(camellibexecdir)/camel-lock-helper-$(BASE_VERSION) ; \ - chmod u+s $(DESTDIR)$(camellibexecdir)/camel-lock-helper-$(BASE_VERSION) ; \ + chown $(CAMEL_LOCK_HELPER_USER) $(DESTDIR)$(camellibexecdir)/camel-lock-helper-$(API_VERSION) ; \ + chmod u+s $(DESTDIR)$(camellibexecdir)/camel-lock-helper-$(API_VERSION) ; \ else \ echo '*** WARNING ***' ; \ echo "Camel will not be able to open mbox files until you perform the following steps:" ; \ @@ -303,14 +303,14 @@ install-exec-hook: fi @if test -n "$(CAMEL_LOCK_HELPER_GROUP)"; then \ if test `whoami` = root ; then \ - chgrp $(CAMEL_LOCK_HELPER_GROUP) $(DESTDIR)$(camellibexecdir)/camel-lock-helper-$(BASE_VERSION) ; \ - chmod g+s $(DESTDIR)$(camellibexecdir)/camel-lock-helper-$(BASE_VERSION) ; \ + chgrp $(CAMEL_LOCK_HELPER_GROUP) $(DESTDIR)$(camellibexecdir)/camel-lock-helper-$(API_VERSION) ; \ + chmod g+s $(DESTDIR)$(camellibexecdir)/camel-lock-helper-$(API_VERSION) ; \ else \ echo '*** WARNING ***' ; \ echo "Camel will not be able to open mbox files until you perform the following steps:" ; \ echo " 1. Become root" ; \ - echo " 2. chgrp $(CAMEL_LOCK_HELPER_GROUP) $(DESTDIR)$(camellibexecdir)/camel-lock-helper-$(BASE_VERSION)" ; \ - echo " 3. chmod g+s $(DESTDIR)$(camellibexecdir)/camel-lock-helper-$(BASE_VERSION)" ; \ + echo " 2. chgrp $(CAMEL_LOCK_HELPER_GROUP) $(DESTDIR)$(camellibexecdir)/camel-lock-helper-$(API_VERSION)" ; \ + echo " 3. chmod g+s $(DESTDIR)$(camellibexecdir)/camel-lock-helper-$(API_VERSION)" ; \ echo '*** WARNING ***' ; \ fi \ else \ diff --git a/camel/providers/local/Makefile.am b/camel/providers/local/Makefile.am index fbf3199..a0f5792 100644 --- a/camel/providers/local/Makefile.am +++ b/camel/providers/local/Makefile.am @@ -49,6 +49,6 @@ noinst_HEADERS = \ libcamellocal_la_LDFLAGS = -avoid-version -module libcamellocal_la_LIBADD = \ - $(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la + $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la EXTRA_DIST = libcamellocal.urls diff --git a/camel/providers/pop3/Makefile.am b/camel/providers/pop3/Makefile.am index 49df41e..a2bceb4 100644 --- a/camel/providers/pop3/Makefile.am +++ b/camel/providers/pop3/Makefile.am @@ -26,6 +26,6 @@ noinst_HEADERS = \ libcamelpop3_la_LDFLAGS = -avoid-version -module libcamelpop3_la_LIBADD = \ - $(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la + $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la EXTRA_DIST = libcamelpop3.urls diff --git a/camel/providers/smtp/Makefile.am b/camel/providers/smtp/Makefile.am index 29dc3dc..2185788 100644 --- a/camel/providers/smtp/Makefile.am +++ b/camel/providers/smtp/Makefile.am @@ -20,6 +20,6 @@ noinst_HEADERS = \ libcamelsmtp_la_LDFLAGS = -avoid-version -module libcamelsmtp_la_LIBADD = \ - $(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la + $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la EXTRA_DIST = libcamelsmtp.urls diff --git a/camel/tests/folder/Makefile.am b/camel/tests/folder/Makefile.am index d599147..961a473 100644 --- a/camel/tests/folder/Makefile.am +++ b/camel/tests/folder/Makefile.am @@ -11,9 +11,9 @@ INCLUDES = \ LDADD = \ $(top_builddir)/camel/tests/lib/libcameltest.a \ $(top_builddir)/camel/tests/lib/libcameltest-provider.a \ - $(top_builddir)/camel/libcamel-${BASE_VERSION}.la \ - $(top_builddir)/camel/libcamel-provider-${BASE_VERSION}.la \ - $(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la \ + $(top_builddir)/camel/libcamel-${API_VERSION}.la \ + $(top_builddir)/camel/libcamel-provider-${API_VERSION}.la \ + $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \ $(INTLLIBS) check_PROGRAMS = \ diff --git a/camel/tests/lib/Makefile.am b/camel/tests/lib/Makefile.am index 36c9fb2..1783afe 100644 --- a/camel/tests/lib/Makefile.am +++ b/camel/tests/lib/Makefile.am @@ -23,10 +23,10 @@ libcameltest_provider_a_SOURCES = \ camel-test-provider.c camel-test-provider.h libcameltest_a_LIBADD = \ - $(top_builddir)/camel/libcamel-${BASE_VERSION}.la \ - $(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la + $(top_builddir)/camel/libcamel-${API_VERSION}.la \ + $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la libcameltest_provider_a_LIBADD = \ - $(top_builddir)/camel/libcamel-provider-${BASE_VERSION}.la \ - $(top_builddir)/camel/libcamel-${BASE_VERSION}.la \ - $(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la + $(top_builddir)/camel/libcamel-provider-${API_VERSION}.la \ + $(top_builddir)/camel/libcamel-${API_VERSION}.la \ + $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la diff --git a/camel/tests/message/Makefile.am b/camel/tests/message/Makefile.am index 8488c46..4e8d6df 100644 --- a/camel/tests/message/Makefile.am +++ b/camel/tests/message/Makefile.am @@ -9,8 +9,8 @@ INCLUDES = \ $(CAMEL_CFLAGS) LDADD = \ - $(top_builddir)/camel/libcamel-${BASE_VERSION}.la \ - $(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la \ + $(top_builddir)/camel/libcamel-${API_VERSION}.la \ + $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \ $(top_builddir)/camel/tests/lib/libcameltest.a \ $(INTLLIBS) diff --git a/camel/tests/mime-filter/Makefile.am b/camel/tests/mime-filter/Makefile.am index 4fc986f..2aeea1a 100644 --- a/camel/tests/mime-filter/Makefile.am +++ b/camel/tests/mime-filter/Makefile.am @@ -10,8 +10,8 @@ INCLUDES = \ $(CAMEL_CFLAGS) LDADD = \ - $(top_builddir)/camel/libcamel-${BASE_VERSION}.la \ - $(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la \ + $(top_builddir)/camel/libcamel-${API_VERSION}.la \ + $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \ $(top_builddir)/camel/tests/lib/libcameltest.a \ $(INTLLIBS) diff --git a/camel/tests/misc/Makefile.am b/camel/tests/misc/Makefile.am index e8102f5..2ae026d 100644 --- a/camel/tests/misc/Makefile.am +++ b/camel/tests/misc/Makefile.am @@ -9,9 +9,9 @@ INCLUDES = \ $(CAMEL_CFLAGS) LDADD = \ - $(top_builddir)/camel/libcamel-provider-${BASE_VERSION}.la \ - $(top_builddir)/camel/libcamel-${BASE_VERSION}.la \ - $(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la \ + $(top_builddir)/camel/libcamel-provider-${API_VERSION}.la \ + $(top_builddir)/camel/libcamel-${API_VERSION}.la \ + $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \ $(top_builddir)/camel/tests/lib/libcameltest.a \ $(INTLLIBS) diff --git a/camel/tests/smime/Makefile.am b/camel/tests/smime/Makefile.am index 3ed128b..0c3f76e 100644 --- a/camel/tests/smime/Makefile.am +++ b/camel/tests/smime/Makefile.am @@ -10,10 +10,10 @@ INCLUDES = \ $(CAMEL_CFLAGS) LDADD = \ - $(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la \ + $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \ $(top_builddir)/camel/tests/lib/libcameltest.a \ - $(top_builddir)/camel/libcamel-provider-${BASE_VERSION}.la \ - $(top_builddir)/camel/libcamel-${BASE_VERSION}.la \ + $(top_builddir)/camel/libcamel-provider-${API_VERSION}.la \ + $(top_builddir)/camel/libcamel-${API_VERSION}.la \ $(INTLLIBS) check_PROGRAMS = \ diff --git a/camel/tests/stream/Makefile.am b/camel/tests/stream/Makefile.am index 37439dc..cfec825 100644 --- a/camel/tests/stream/Makefile.am +++ b/camel/tests/stream/Makefile.am @@ -9,8 +9,8 @@ INCLUDES = \ $(CAMEL_CFLAGS) LDADD = \ - $(top_builddir)/camel/libcamel-${BASE_VERSION}.la \ - $(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la \ + $(top_builddir)/camel/libcamel-${API_VERSION}.la \ + $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \ $(top_builddir)/camel/tests/lib/libcameltest.a \ $(INTLLIBS) diff --git a/configure.in b/configure.in index b487adc..61698f8 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ Process this file with autoconf to produce a configure script. AC_PREREQ(2.52) -AC_INIT(evolution-data-server, 1.2.0) +AC_INIT(evolution-data-server, 1.3.0) AC_CONFIG_SRCDIR(README) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) @@ -14,8 +14,10 @@ dnl This is for api/versioning tracking for things like bonobo .server files dnl dnl This should always be the major/minor of the stable version or stable version to be dnl ************************************************************************************************* -BASE_VERSION=1.2 +BASE_VERSION=1.4 +API_VERSION=1.2 AC_SUBST(BASE_VERSION) +AC_SUBST(API_VERSION) AC_DEFINE_UNQUOTED(BASE_VERSION, "$BASE_VERSION", [Base version (Major.Minor)]) # Libtool versioning @@ -1109,7 +1111,7 @@ AC_SUBST(privincludedir) privlibdir='${libdir}'/evolution-data-server-$BASE_VERSION AC_SUBST(privlibdir) -idldir="$datadir/idl/evolution-data-server-$BASE_VERSION" +idldir="$datadir/idl/evolution-data-server-$API_VERSION" AC_SUBST(idldir) imagesdir="$datadir/pixmaps/evolution-data-server-$BASE_VERSION" @@ -1118,7 +1120,7 @@ AC_SUBST(imagesdir) serverdir="$libdir/bonobo/servers" AC_SUBST(serverdir) -extensiondir='${privlibdir}'/extensions +extensiondir='${libdir}'/evolution-data-server-$API_VERSION/extensions AC_SUBST(extensiondir) gladedir="$privdatadir/glade" @@ -1140,7 +1142,7 @@ AC_SUBST(INTERFACE_VERSION) AC_DEFINE_UNQUOTED(INTERFACE_VERSION, "$INTERFACE_VERSION", [IDL interface version (Major.Minor)]) EVO_SUBST_SERVER_RULE='%.server.in: %.server.in.in ; sed -e "s|\@BINDIR\@|$(bindir)|" -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@COMPONENTDIR\@|$(componentdir)|" -e "s|\@IMPORTERSDIR\@|$(importersdir)|" -e "s|\@VERSION\@|$(BASE_VERSION)|" -e "s|\@INTERFACE_VERSION\@|$(INTERFACE_VERSION)|" $< > $@' -EVO_NAME_SERVER_RULE='%_$(BASE_VERSION).server: %.server ; mv $< $@' +EVO_NAME_SERVER_RULE='%_$(API_VERSION).server: %.server ; mv $< $@' AC_SUBST(EVO_SUBST_SERVER_RULE) AC_SUBST(EVO_NAME_SERVER_RULE) diff --git a/evolution-data-server.pc.in b/evolution-data-server.pc.in index bbb0177..7b8b353 100644 --- a/evolution-data-server.pc.in +++ b/evolution-data-server.pc.in @@ -12,5 +12,5 @@ IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@ Name: evolution-data-server Description: The evolution data server for the calendar and addressbook -Version: @VERSION@ +Version: @API_VERSION@ Requires: libgnome-2.0 libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ diff --git a/libedataserver/Makefile.am b/libedataserver/Makefile.am index 5e0bbea..ec309ac 100644 --- a/libedataserver/Makefile.am +++ b/libedataserver/Makefile.am @@ -81,13 +81,13 @@ libedataserverinclude_HEADERS = \ test_source_list_SOURCES = test-source-list.c test_source_list_LDADD = libedataserver-1.2.la $(E_DATA_SERVER_LIBS) -%-$(BASE_VERSION).pc: %.pc +%-$(API_VERSION).pc: %.pc cp $< $@ pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libedataserver-$(BASE_VERSION).pc +pkgconfig_DATA = libedataserver-$(API_VERSION).pc EXTRA_DIST = \ - $(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in) + $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) DISTCLEANFILES = $(pkgconfig_DATA) diff --git a/libedataserverui/ChangeLog b/libedataserverui/ChangeLog index a217d49..12202ea 100644 --- a/libedataserverui/ChangeLog +++ b/libedataserverui/ChangeLog @@ -1,3 +1,7 @@ +2005-04-11 Harish Krishnaswamy + + * Makefile.am: use API_VERSION + 2005-04-04 Sivaiah Nallagatla * e-book-auth-util.c (load_source_auth_cb) diff --git a/libedataserverui/Makefile.am b/libedataserverui/Makefile.am index 5bb1bee..ce25bc7 100644 --- a/libedataserverui/Makefile.am +++ b/libedataserverui/Makefile.am @@ -82,16 +82,16 @@ test_name_selector_LDADD = \ $(top_builddir)/libedataserver/libedataserver-1.2.la \ $(E_DATA_SERVER_UI_LIBS) -%-$(BASE_VERSION).pc: %.pc +%-$(API_VERSION).pc: %.pc cp $< $@ pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libedataserverui-$(BASE_VERSION).pc +pkgconfig_DATA = libedataserverui-$(API_VERSION).pc glade_DATA = e-categories-dialog.glade e-name-selector-dialog.glade EXTRA_DIST = \ $(glade_DATA) \ - $(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in) + $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) DISTCLEANFILES = $(pkgconfig_DATA) diff --git a/servers/groupwise/Makefile.am b/servers/groupwise/Makefile.am index 1c6d168..8750d8a 100644 --- a/servers/groupwise/Makefile.am +++ b/servers/groupwise/Makefile.am @@ -53,12 +53,12 @@ libegroupwiseinclude_HEADERS = \ e-gw-sendoptions.h \ e-gw-filter.h -%-$(BASE_VERSION).pc: %.pc +%-$(API_VERSION).pc: %.pc cp $< $@ pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libegroupwise-$(BASE_VERSION).pc +pkgconfig_DATA = libegroupwise-$(API_VERSION).pc -EXTRA_DIST = $(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in) +EXTRA_DIST = $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) DISTCLEANFILES = $(pkgconfig_DATA) diff --git a/src/Makefile.am b/src/Makefile.am index 2c1028d..14db909 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -63,7 +63,7 @@ install-evolution-data-servers: SERVER_IN_FILE=GNOME_Evolution_DataServer.server.in.in server_in_files = GNOME_Evolution_DataServer.server.in.in -server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server) +server_DATA = $(server_in_files:.server.in.in=_$(API_VERSION).server) @EVO_SUBST_SERVER_RULE@ @EVO_NAME_SERVER_RULE@ @INTLTOOL_SERVER_RULE@ -- 2.7.4