From bdf19d320404cc3c0aa6900ea711279f80ceab6a Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Fri, 31 Oct 2003 13:28:44 +0000 Subject: set up vars and rules for versioning the .server files 2003-10-31 JP Rosevear * 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 svn path=/trunk/; revision=23149 --- calendar/gui/Makefile.am | 10 ++++------ calendar/gui/alarm-notify/Makefile.am | 14 +++++--------- calendar/importers/Makefile.am | 14 +++++++++----- 3 files changed, 18 insertions(+), 20 deletions(-) (limited to 'calendar') 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 -- cgit