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 --- wombat/Makefile.am | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'wombat') 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 $@ -- cgit v1.2.3