Hi,
Attached is a patch which removes most of the hard-coded version numbers
in Makefile.am. Sadly not all of them can go as Automake (as I
understand it) cannot use $() symbols in target names.
Ross
--
Ross Burton mail: ross burtonini com
jabber: ross burtonini com
www: http://www.burtonini.com./
PGP Fingerprint: 1A21 F5B0 D8D0 CFE3 81D4 E25A 2D09 E447 D0B4 33DF
Index: addressbook/backends/file/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/backends/file/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- addressbook/backends/file/Makefile.am 31 Jan 2005 22:42:33 -0000 1.8
+++ addressbook/backends/file/Makefile.am 22 Apr 2005 14:18:19 -0000
@@ -15,8 +15,8 @@
e-book-backend-file-factory.c
libebookbackendfile_la_LIBADD = \
- $(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la \
- $(top_builddir)/libedataserver/libedataserver-1.2.la
+ $(top_builddir)/addressbook/libedata-book/libedata-book-$(API_VERSION).la \
+ $(top_builddir)/libedataserver/libedataserver-$(API_VERSION).la
libebookbackendfile_la_LDFLAGS = \
-module -avoid-version
Index: addressbook/backends/groupwise/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/backends/groupwise/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- addressbook/backends/groupwise/Makefile.am 31 Jan 2005 22:42:33 -0000 1.8
+++ addressbook/backends/groupwise/Makefile.am 22 Apr 2005 14:18:19 -0000
@@ -15,7 +15,7 @@
e-book-backend-groupwise-factory.c
libebookbackendgroupwise_la_LIBADD = \
- $(top_builddir)/servers/groupwise/libegroupwise-1.2.la
+ $(top_builddir)/servers/groupwise/libegroupwise-$(API_VERSION).la
$(SOUP_LIBS)
libebookbackendgroupwise_la_LDFLAGS = \
@@ -24,8 +24,8 @@
noinst_PROGRAMS = create-account
create_account_SOURCES = create-account.c
-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 \
+create_account_LDADD = $(top_builddir)/addressbook/libedata-book/libedata-book-$(API_VERSION).la \
+ $(top_builddir)/libedataserver/libedataserver-$(API_VERSION).la \
+ $(top_builddir)/servers/groupwise/libegroupwise-$(API_VERSION).la \
$(E_DATA_SERVER_LIBS)
Index: addressbook/backends/vcf/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/backends/vcf/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- addressbook/backends/vcf/Makefile.am 31 Jan 2005 22:42:34 -0000 1.7
+++ addressbook/backends/vcf/Makefile.am 22 Apr 2005 14:18:19 -0000
@@ -14,8 +14,8 @@
e-book-backend-vcf-factory.c
libebookbackendvcf_la_LIBADD = \
- $(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la \
- $(top_builddir)/libedataserver/libedataserver-1.2.la
+ $(top_builddir)/addressbook/libedata-book/libedata-book-$(API_VERSION).la \
+ $(top_builddir)/libedataserver/libedataserver-$(API_VERSION).la
libebookbackendvcf_la_LDFLAGS = \
-module -avoid-version
Index: addressbook/libebook/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libebook/Makefile.am,v
retrieving revision 1.12
diff -u -r1.12 Makefile.am
--- addressbook/libebook/Makefile.am 11 Apr 2005 12:21:27 -0000 1.12
+++ addressbook/libebook/Makefile.am 22 Apr 2005 14:18:19 -0000
@@ -49,8 +49,8 @@
libebook_1_2_la_LIBADD = \
$(EVOLUTION_ADDRESSBOOK_LIBS) \
- $(top_builddir)/camel/libcamel-1.2.la \
- $(top_builddir)/libedataserver/libedataserver-1.2.la
+ $(top_builddir)/camel/libcamel-$(API_VERSION).la \
+ $(top_builddir)/libedataserver/libedataserver-$(API_VERSION).la
libebook_1_2_la_LDFLAGS = \
-version-info $(LIBEBOOK_CURRENT):$(LIBEBOOK_REVISION):$(LIBEBOOK_AGE)
Index: addressbook/libedata-book/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libedata-book/Makefile.am,v
retrieving revision 1.13
diff -u -r1.13 Makefile.am
--- addressbook/libedata-book/Makefile.am 11 Apr 2005 12:21:27 -0000 1.13
+++ addressbook/libedata-book/Makefile.am 22 Apr 2005 14:18:19 -0000
@@ -47,8 +47,8 @@
libedata_book_1_2_la_LIBADD = \
$(EVOLUTION_ADDRESSBOOK_LIBS) \
- $(top_builddir)/addressbook/libebook/libebook-1.2.la \
- $(top_builddir)/libedataserver/libedataserver-1.2.la
+ $(top_builddir)/addressbook/libebook/libebook-$(API_VERSION).la \
+ $(top_builddir)/libedataserver/libedataserver-$(API_VERSION).la
libedata_book_1_2_la_LDFLAGS = \
-version-info $(LIBEDATABOOK_CURRENT):$(LIBEDATABOOK_REVISION):$(LIBEDATABOOK_AGE)
Index: addressbook/tests/ebook/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/tests/ebook/Makefile.am,v
retrieving revision 1.13
diff -u -r1.13 Makefile.am
--- addressbook/tests/ebook/Makefile.am 23 Sep 2004 16:45:28 -0000 1.13
+++ addressbook/tests/ebook/Makefile.am 22 Apr 2005 14:18:19 -0000
@@ -6,7 +6,7 @@
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
TEST_LIBS= \
- $(top_builddir)/addressbook/libebook/libebook-1.2.la \
+ $(top_builddir)/addressbook/libebook/libebook-$(API_VERSION).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
Index: addressbook/tests/vcard/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/tests/vcard/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- addressbook/tests/vcard/Makefile.am 23 Sep 2004 16:45:28 -0000 1.5
+++ addressbook/tests/vcard/Makefile.am 22 Apr 2005 14:18:19 -0000
@@ -8,7 +8,7 @@
noinst_PROGRAMS = dump-vcard
dump_vcard_LDADD = \
- $(top_builddir)/addressbook/libebook/libebook-1.2.la \
+ $(top_builddir)/addressbook/libebook/libebook-$(API_VERSION).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
Index: calendar/backends/contacts/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/contacts/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- calendar/backends/contacts/Makefile.am 31 Jan 2005 22:48:53 -0000 1.6
+++ calendar/backends/contacts/Makefile.am 22 Apr 2005 14:18:19 -0000
@@ -21,7 +21,7 @@
e-cal-backend-contacts.h
libecalbackendcontacts_la_LIBADD = \
- $(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la
+ $(top_builddir)/calendar/libedata-cal/libedata-cal-$(API_VERSION).la
libecalbackendcontacts_la_LDFLAGS = \
Index: calendar/backends/file/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/file/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- calendar/backends/file/Makefile.am 31 Jan 2005 22:48:53 -0000 1.6
+++ calendar/backends/file/Makefile.am 22 Apr 2005 14:18:19 -0000
@@ -23,7 +23,7 @@
e-cal-backend-file.h
libecalbackendfile_la_LIBADD = \
- $(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la
+ $(top_builddir)/calendar/libedata-cal/libedata-cal-$(API_VERSION).la
libecalbackendfile_la_LDFLAGS = \
Index: calendar/backends/groupwise/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/groupwise/Makefile.am,v
retrieving revision 1.21
diff -u -r1.21 Makefile.am
--- calendar/backends/groupwise/Makefile.am 31 Jan 2005 22:48:53 -0000 1.21
+++ calendar/backends/groupwise/Makefile.am 22 Apr 2005 14:18:19 -0000
@@ -27,9 +27,9 @@
e-cal-backend-groupwise-utils.h
libecalbackendgroupwise_la_LIBADD = \
- $(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la \
+ $(top_builddir)/calendar/libedata-cal/libedata-cal-$(API_VERSION).la \
$(top_builddir)/calendar/backends/file/libecalbackendfile.la\
- $(top_builddir)/servers/groupwise/libegroupwise-1.2.la \
+ $(top_builddir)/servers/groupwise/libegroupwise-$(API_VERSION).la \
$(SOUP_LIBS)
libecalbackendgroupwise_la_LDFLAGS = \
Index: calendar/backends/http/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/http/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- calendar/backends/http/Makefile.am 31 Jan 2005 22:48:54 -0000 1.8
+++ calendar/backends/http/Makefile.am 22 Apr 2005 14:18:19 -0000
@@ -22,7 +22,7 @@
e-cal-backend-http.h
libecalbackendhttp_la_LIBADD = \
- $(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la \
+ $(top_builddir)/calendar/libedata-cal/libedata-cal-$(API_VERSION).la \
$(top_builddir)/calendar/backends/file/libecalbackendfile.la \
$(SOUP_LIBS)
Index: calendar/backends/weather/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/weather/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- calendar/backends/weather/Makefile.am 31 Jan 2005 22:48:54 -0000 1.3
+++ calendar/backends/weather/Makefile.am 22 Apr 2005 14:18:19 -0000
@@ -27,7 +27,7 @@
e-weather-source-ccf.h
libecalbackendweather_la_LIBADD = \
- $(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la \
+ $(top_builddir)/calendar/libedata-cal/libedata-cal-$(API_VERSION).la \
$(SOUP_LIBS)
libecalbackendweather_la_LDFLAGS = \
Index: calendar/libecal/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libecal/Makefile.am,v
retrieving revision 1.12
diff -u -r1.12 Makefile.am
--- calendar/libecal/Makefile.am 11 Apr 2005 12:21:27 -0000 1.12
+++ calendar/libecal/Makefile.am 22 Apr 2005 14:18:19 -0000
@@ -55,7 +55,7 @@
$(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-1.2.la
+ $(top_builddir)/libedataserver/libedataserver-$(API_VERSION).la
libecal_1_2_la_LDFLAGS = \
-version-info $(LIBECAL_CURRENT):$(LIBECAL_REVISION):$(LIBECAL_AGE)
Index: calendar/libedata-cal/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libedata-cal/Makefile.am,v
retrieving revision 1.13
diff -u -r1.13 Makefile.am
--- calendar/libedata-cal/Makefile.am 11 Apr 2005 12:21:28 -0000 1.13
+++ calendar/libedata-cal/Makefile.am 22 Apr 2005 14:18:19 -0000
@@ -47,8 +47,8 @@
libedata_cal_1_2_la_LIBADD = \
$(EVOLUTION_CALENDAR_LIBS) \
- $(top_builddir)/calendar/libecal/libecal-1.2.la \
- $(top_builddir)/libedataserver/libedataserver-1.2.la
+ $(top_builddir)/calendar/libecal/libecal-$(API_VERSION).la \
+ $(top_builddir)/libedataserver/libedataserver-$(API_VERSION).la
libedata_cal_1_2_la_LDFLAGS = \
-version-info $(LIBEDATACAL_CURRENT):$(LIBEDATACAL_REVISION):$(LIBEDATACAL_AGE)
Index: calendar/tests/ecal/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/tests/ecal/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- calendar/tests/ecal/Makefile.am 4 Feb 2005 11:26:25 -0000 1.6
+++ calendar/tests/ecal/Makefile.am 22 Apr 2005 14:18:19 -0000
@@ -26,7 +26,7 @@
$(INCLUDES) \
-DG_LOG_DOMAIN=\"test-ecal\"
test_ecal_LDADD = \
- $(top_builddir)/calendar/libecal/libecal-1.2.la \
+ $(top_builddir)/calendar/libecal/libecal-$(API_VERSION).la \
$(top_builddir)/calendar/libical/src/libical/libical-evolution.la \
$(EVOLUTION_CALENDAR_LIBS)
@@ -35,7 +35,7 @@
$(INCLUDES) \
-DG_LOG_DOMAIN=\"test-ecal\"
test_recur_LDADD = \
- $(top_builddir)/calendar/libecal/libecal-1.2.la \
+ $(top_builddir)/calendar/libecal/libecal-$(API_VERSION).la \
$(top_builddir)/calendar/libical/src/libical/libical-evolution.la \
$(EVOLUTION_CALENDAR_LIBS)
@@ -44,6 +44,6 @@
$(INCLUDES) \
-DG_LOG_DOMAIN=\"test-ecal\"
test_search_LDADD = \
- $(top_builddir)/calendar/libecal/libecal-1.2.la \
+ $(top_builddir)/calendar/libecal/libecal-$(API_VERSION).la \
$(top_builddir)/calendar/libical/src/libical/libical-evolution.la \
$(EVOLUTION_CALENDAR_LIBS)
Index: camel/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/Makefile.am,v
retrieving revision 1.209
diff -u -r1.209 Makefile.am
--- camel/Makefile.am 11 Apr 2005 12:21:29 -0000 1.209
+++ camel/Makefile.am 22 Apr 2005 14:18:19 -0000
@@ -122,7 +122,7 @@
libcamel_provider_1_2_la_LIBADD = \
$(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \
- libcamel-1.2.la \
+ libcamel-$(API_VERSION).la \
$(CAMEL_LIBS)
libcamel_1_2_la_SOURCES = \
@@ -279,7 +279,7 @@
camel-index-control.c
camel_index_control_1_2_LDADD = \
- libcamel-1.2.la \
+ libcamel-$(API_VERSION).la \
$(libcamel_1_2_la_LIBADD)
camel-mime-tables.c: gentables.pl
Index: camel/providers/groupwise/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/Makefile.am,v
retrieving revision 1.13
diff -u -r1.13 Makefile.am
--- camel/providers/groupwise/Makefile.am 11 Jan 2005 07:49:58 -0000 1.13
+++ camel/providers/groupwise/Makefile.am 22 Apr 2005 14:18:19 -0000
@@ -37,8 +37,8 @@
libcamelgroupwise_la_LDFLAGS = -avoid-version -module
libcamelgroupwise_la_LIBADD = \
- $(top_builddir)/servers/groupwise/libegroupwise-1.2.la \
- $(top_builddir)/libedataserver/libedataserver-1.2.la \
+ $(top_builddir)/servers/groupwise/libegroupwise-$(API_VERSION).la \
+ $(top_builddir)/libedataserver/libedataserver-$(API_VERSION).la \
$(SOUP_LIBS)
EXTRA_DIST = libcamelgroupwise.urls
Index: libedataserver/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/Makefile.am,v
retrieving revision 1.24
diff -u -r1.24 Makefile.am
--- libedataserver/Makefile.am 11 Apr 2005 12:21:32 -0000 1.24
+++ libedataserver/Makefile.am 22 Apr 2005 14:18:19 -0000
@@ -79,7 +79,7 @@
md5-utils.h
test_source_list_SOURCES = test-source-list.c
-test_source_list_LDADD = libedataserver-1.2.la $(E_DATA_SERVER_LIBS)
+test_source_list_LDADD = libedataserver-$(API_VERSION).la $(E_DATA_SERVER_LIBS)
%-$(API_VERSION).pc: %.pc
cp $< $@
Index: libedataserverui/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/Makefile.am,v
retrieving revision 1.12
diff -u -r1.12 Makefile.am
--- libedataserverui/Makefile.am 11 Apr 2005 12:21:32 -0000 1.12
+++ libedataserverui/Makefile.am 22 Apr 2005 14:18:19 -0000
@@ -34,7 +34,7 @@
e-tree-model-generator.c
libedataserverui_1_2_la_LIBADD = \
- $(top_builddir)/addressbook/libebook/libebook-1.2.la \
+ $(top_builddir)/addressbook/libebook/libebook-$(API_VERSION).la \
$(E_DATA_SERVER_LIBS)
libedataserverui_1_2_la_LDFLAGS = \
@@ -60,26 +60,26 @@
# Test programs
test_source_selector_SOURCES = test-source-selector.c
test_source_selector_LDADD = \
- libedataserverui-1.2.la \
- $(top_builddir)/libedataserver/libedataserver-1.2.la \
+ libedataserverui-$(API_VERSION).la \
+ $(top_builddir)/libedataserver/libedataserver-$(API_VERSION).la \
$(E_DATA_SERVER_UI_LIBS)
test_source_option_menu_SOURCES = test-source-option-menu.c
test_source_option_menu_LDADD = \
- libedataserverui-1.2.la \
- $(top_builddir)/libedataserver/libedataserver-1.2.la \
+ libedataserverui-$(API_VERSION).la \
+ $(top_builddir)/libedataserver/libedataserver-$(API_VERSION).la \
$(E_DATA_SERVER_UI_LIBS)
test_contact_store_SOURCES = test-contact-store.c
test_contact_store_LDADD = \
- libedataserverui-1.2.la \
- $(top_builddir)/libedataserver/libedataserver-1.2.la \
+ libedataserverui-$(API_VERSION).la \
+ $(top_builddir)/libedataserver/libedataserver-$(API_VERSION).la \
$(E_DATA_SERVER_UI_LIBS)
test_name_selector_SOURCES = test-name-selector.c
test_name_selector_LDADD = \
- libedataserverui-1.2.la \
- $(top_builddir)/libedataserver/libedataserver-1.2.la \
+ libedataserverui-$(API_VERSION).la \
+ $(top_builddir)/libedataserver/libedataserver-$(API_VERSION).la \
$(E_DATA_SERVER_UI_LIBS)
%-$(API_VERSION).pc: %.pc
Index: servers/groupwise/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/groupwise/Makefile.am,v
retrieving revision 1.12
diff -u -r1.12 Makefile.am
--- servers/groupwise/Makefile.am 11 Apr 2005 12:21:32 -0000 1.12
+++ servers/groupwise/Makefile.am 22 Apr 2005 14:18:19 -0000
@@ -10,14 +10,14 @@
create_account_SOURCES = create-account.c
create_account_LDADD = \
- $(top_builddir)/libedataserver/libedataserver-1.2.la \
+ $(top_builddir)/libedataserver/libedataserver-$(API_VERSION).la \
$(SOUP_LIBS) \
$(E_DATA_SERVER_LIBS)
soap_test_SOURCES = soap-test.c
soap_test_LDADD = \
$(SOUP_LIBS) \
- libegroupwise-1.2.la \
+ libegroupwise-$(API_VERSION).la \
$(E_DATA_SERVER_LIBS)
lib_LTLIBRARIES = libegroupwise-1.2.la
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/src/Makefile.am,v
retrieving revision 1.19
diff -u -r1.19 Makefile.am
--- src/Makefile.am 11 Apr 2005 12:21:33 -0000 1.19
+++ src/Makefile.am 22 Apr 2005 14:18:19 -0000
@@ -52,8 +52,8 @@
offline-listener.h
evolution_data_server_LDADD = \
- $(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la \
- $(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la \
+ $(top_builddir)/addressbook/libedata-book/libedata-book-$(API_VERSION).la \
+ $(top_builddir)/calendar/libedata-cal/libedata-cal-$(API_VERSION).la \
$(E_DATA_SERVER_LIBS)
install-evolution-data-servers:
Attachment:
signature.asc
Description: This is a digitally signed message part