aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog8
-rw-r--r--addressbook/gui/component/Makefile.am11
-rw-r--r--addressbook/gui/component/select-names/Makefile.am9
-rw-r--r--calendar/gui/Makefile.am10
-rw-r--r--calendar/gui/alarm-notify/Makefile.am14
-rw-r--r--calendar/importers/Makefile.am14
-rw-r--r--configure.in13
-rw-r--r--mail/Makefile.am9
-rw-r--r--mail/importers/Makefile.am15
-rw-r--r--shell/Makefile.am12
-rw-r--r--wombat/Makefile.am15
11 files changed, 70 insertions, 60 deletions
diff --git a/ChangeLog b/ChangeLog
index cbbfabb1a3..4e249b1959 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-10-31 JP Rosevear <jpr@ximian.com>
+
+ * configure.in: set up vars and rules for versioning the .server
+ files
+
+ * Makefile.am's: use rules for versioning .server file, ensure
+ built files are removed before disting
+
2003-10-30 Chris Toshok <toshok@ximian.com>
* configure.in: (AC_OUTPUT): remove smime/tests for now.
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 0e16c5ac92..458e8edbd7 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -78,10 +78,9 @@ install-data-local:
fi
server_in_files = GNOME_Evolution_Addressbook.server.in.in
-server_DATA = $(server_in_files:.server.in.in=.server)
-%.server.in: %.server.in.in
- sed -e "s|\@COMPONENTDIR\@|$(componentdir)|" $< > $@
-
+server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
+@EVO_SUBST_SERVER_RULE@
+@EVO_NAME_SERVER_RULE@
@INTLTOOL_SERVER_RULE@
glade_DATA = ldap-config.glade
@@ -92,9 +91,11 @@ CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = \
$(glade_DATA) \
$(schema_DATA) \
- $(server_DATA) \
$(server_in_files)
+dist-hook:
+ cd $(distdir); rm -f $(BUILT_SOURCES)
+
if ENABLE_PURIFY
PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
index b78e5b69fe..f6d1fc6e5e 100644
--- a/addressbook/gui/component/select-names/Makefile.am
+++ b/addressbook/gui/component/select-names/Makefile.am
@@ -17,11 +17,9 @@ $(IDL_GENERATED_H): $(idl_DATA)
$(IDL_GENERATED_C): $(IDL_GENERATED_H)
server_in_files = GNOME_Evolution_Addressbook_SelectNames.server.in.in
-
-server_DATA = $(server_in_files:.server.in.in=.server)
-%.server.in: %.server.in.in
- sed -e "s|\@COMPONENTDIR\@|$(componentdir)|" $< > $@
-
+server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
+@EVO_SUBST_SERVER_RULE@
+@EVO_NAME_SERVER_RULE@
@INTLTOOL_SERVER_RULE@
INCLUDES = \
@@ -90,7 +88,6 @@ etspec_DATA = e-select-names.etspec e-select-names-section.etspec
EXTRA_DIST = \
$(glade_DATA) \
$(server_in_files) \
- $(server_DATA) \
$(idl_DATA) \
$(etspec_DATA) \
e-select-names-marshal.list
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 876834bfcb..ae623b84db 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -215,18 +215,16 @@ libevolution_calendar_la_LIBADD = \
libevolution_calendar_la_LDFLAGS = -avoid-version -module
server_in_files = GNOME_Evolution_Calendar.server.in.in
-
-server_DATA = $(server_in_files:.server.in.in=.server)
-%.server.in: %.server.in.in
- sed -e "s|\@COMPONENTDIR\@|$(componentdir)|" $< > $@
+server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
+@EVO_SUBST_SERVER_RULE@
+@EVO_NAME_SERVER_RULE@
+@INTLTOOL_SERVER_RULE@
# GConf schemas
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_DATA = apps_evolution_calendar.schemas
-@INTLTOOL_SERVER_RULE@
-
EXTRA_DIST = \
$(glade_DATA) \
$(schema_DATA) \
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am
index a5340067a4..82ecd516cf 100644
--- a/calendar/gui/alarm-notify/Makefile.am
+++ b/calendar/gui/alarm-notify/Makefile.am
@@ -55,17 +55,13 @@ evolution_alarm_notify_LDADD = \
$(top_builddir)/calendar/cal-util/libcal-util.la \
$(EVOLUTION_CALENDAR_LIBS)
-server_in_files = \
- GNOME_Evolution_Calendar_AlarmNotify.server.in.in
-
-server_DATA = $(server_in_files:.server.in.in=.server)
-%.server.in: %.server.in.in
- sed -e "s|\@LIBEXECDIR\@|$(privlibexecdir)|" $< > $@
-
+server_in_files = GNOME_Evolution_Calendar_AlarmNotify.server.in.in
+server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
+@EVO_SUBST_SERVER_RULE@
+@EVO_NAME_SERVER_RULE@
@INTLTOOL_SERVER_RULE@
-EXTRA_DIST = \
- $(server_DATA) \
+EXTRA_DIST = \
$(server_in_files) \
$(glade_DATA)
diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am
index 267c4dba80..658f494cd8 100644
--- a/calendar/importers/Makefile.am
+++ b/calendar/importers/Makefile.am
@@ -47,11 +47,15 @@ libevolution_calendar_importers_la_LIBADD = \
# $(EVOLUTION_CALENDAR_LIBS)
server_in_files = GNOME_Evolution_Calendar_Importer.server.in.in
+server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
+@EVO_SUBST_SERVER_RULE@
+@EVO_NAME_SERVER_RULE@
+@INTLTOOL_SERVER_RULE@
-server_DATA = $(server_in_files:.server.in.in=.server)
-%.server.in: %.server.in.in
- sed -e "s|\@IMPORTERSDIR\@|$(importersdir)|" $< > $@
+BUILT_SOURCES = $(server_DATA)
+CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = $(server_in_files) $(server_DATA)
+EXTRA_DIST = $(server_in_files)
-@INTLTOOL_SERVER_RULE@
+dist-hook:
+ cd $(distdir); rm -f $(BUILT_SOURCES) \ No newline at end of file
diff --git a/configure.in b/configure.in
index a31f912bde..eb6f08eba6 100644
--- a/configure.in
+++ b/configure.in
@@ -1258,6 +1258,19 @@ AC_SUBST(etspecdir)
viewsdir="$privdatadir/views"
AC_SUBST(viewsdir)
+dnl ************************
+dnl IDL/Component Versioning
+dnl ************************
+
+INTERFACE_VERSION="$BASE_VERSION"
+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\@|$(privlibexecdir)|" -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 $< $@'
+AC_SUBST(EVO_SUBST_SERVER_RULE)
+AC_SUBST(EVO_NAME_SERVER_RULE)
+
##################################################
# Check for gtk-doc.
##################################################
diff --git a/mail/Makefile.am b/mail/Makefile.am
index a17c594d2a..d0bd2eb38f 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -191,13 +191,11 @@ evolution_mbox_upgrade_LDADD = \
$(EVOLUTION_MAIL_LIBS)
server_in_files = GNOME_Evolution_Mail.server.in.in
-
-server_DATA = $(server_in_files:.server.in.in=.server)
-%.server.in: %.server.in.in
- sed -e "s|\@COMPONENTDIR\@|$(componentdir)|" $< > $@
+server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
+@EVO_SUBST_SERVER_RULE@
+@EVO_NAME_SERVER_RULE@
@INTLTOOL_SERVER_RULE@
-
# Misc data to install
glade_DATA = mail-config.glade local-config.glade subscribe-dialog.glade message-tags.glade mail-search.glade
@@ -213,7 +211,6 @@ EXTRA_DIST = \
$(glade_DATA) \
$(schema_DATA) \
$(server_in_files) \
- $(server_DATA) \
$(etspec_DATA)
diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
index 0fde07d8fc..eaa6432231 100644
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -89,16 +89,15 @@ server_in_files = GNOME_Evolution_Mail_Mbox_Importer.server.in.in \
GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in \
GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in \
GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in
-server_DATA = $(server_in_files:.server.in.in=.server)
-%.server.in: %.server.in.in
- sed -e "s|\@BINDIR\@|$(bindir)|" \
- -e "s|\@VERSION\@|$(BASE_VERSION)|" \
- $< > $@
-
-EXTRA_DIST = $(server_in_files) $(server_DATA)
+server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
+@EVO_SUBST_SERVER_RULE@
+@EVO_NAME_SERVER_RULE@
+@INTLTOOL_SERVER_RULE@
BUILT_SOURCES = $(MAIL_GENERATED) $(server_DATA)
CLEANFILES = $(BUILT_SOURCES)
+EXTRA_DIST = $(server_in_files)
-@INTLTOOL_SERVER_RULE@
+dist-hook:
+ cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 57fdbfcc99..ac0e2d75d9 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -252,16 +252,13 @@ install-test-component: evolution-test-component
# Misc stuff
server_in_files = GNOME_Evolution_Shell.server.in.in
-server_DATA = $(server_in_files:.server.in.in=.server)
-%.server.in: %.server.in.in
- sed -e "s|\@BINDIR\@|$(bindir)|" \
- -e "s|\@VERSION\@|$(BASE_VERSION)|" \
- $< > $@
+server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
+@EVO_SUBST_SERVER_RULE@
+@EVO_NAME_SERVER_RULE@
+@INTLTOOL_SERVER_RULE@
etspec_DATA = e-storage-set-view.etspec
-@INTLTOOL_SERVER_RULE@
-
icons = \
check-empty.xpm \
check-filled.xpm \
@@ -308,7 +305,6 @@ MARSHAL_GENERATED = e-shell-marshal.c e-shell-marshal.h
EXTRA_DIST = \
$(IDLS) \
$(server_in_files) \
- $(server_DATA) \
$(etspec_DATA) \
$(schema_DATA) \
$(icons) \
diff --git a/wombat/Makefile.am b/wombat/Makefile.am
index 37e1248ced..0e83a42667 100644
--- a/wombat/Makefile.am
+++ b/wombat/Makefile.am
@@ -64,25 +64,26 @@ GNOME_Evolution_Wombat.server.in.in: $(SERVER_IN_FILE) Makefile
cp $< $@
server_in_files = GNOME_Evolution_Wombat.server.in.in
-
-server_DATA = $(server_in_files:.server.in.in=.server)
-$(server_in_files:.server.in.in=.server.in): $(server_in_files)
- sed -e "s|\@LIBEXECDIR\@|$(privlibexecdir)|" $< > $@
-
+server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
+@EVO_SUBST_SERVER_RULE@
+@EVO_NAME_SERVER_RULE@
@INTLTOOL_SERVER_RULE@
idl_DATA = $(IDLS)
-EXTRA_DIST = $(server_DATA) \
+EXTRA_DIST = \
$(server_in_files) \
$(idl_DATA) \
ChangeLog.pre-1-4 \
GNOME_Evolution_WombatLDAP.server.in.in \
GNOME_Evolution_WombatNOLDAP.server.in.in
-BUILT_SOURCES = $(IDL_GENERATED)
+BUILT_SOURCES = $(IDL_GENERATED) $(server_DATA)
CLEANFILES = $(BUILT_SOURCES)
+dist-hook:
+ cd $(distdir); rm -f $(BUILT_SOURCES)
+
if ENABLE_PURIFY
PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 15:19:42 +0800