callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use the server.mk file to get rules for building versioned .server files

Browse Source 
2003-11-17  JP Rosevear <jpr@ximian.com>

	* configure.in: use the server.mk file to get rules for building
	versioned .server files

	* */Makefile.am: use simplified rule subst

svn path=/trunk/; revision=23387
This commit is contained in:
JP Rosevear
2003-11-17 15:13:35 +00:00
committed by JP Rosevear
parent e065bb0549
commit 66d47badff
11 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2003-11-17 JP Rosevear <jpr@ximian.com>
* configure.in: use the server.mk file to get rules for building
versioned .server files
2003-11-17 JP Rosevear <jpr@ximian.com> 2003-11-17 JP Rosevear <jpr@ximian.com>
* Makefile.am: Install versioned package config files * Makefile.am: Install versioned package config files

3
addressbook/gui/component/Makefile.am
View File

@ -80,8 +80,7 @@ install-data-local:
server_in_files = GNOME_Evolution_Addressbook.server.in.in server_in_files = GNOME_Evolution_Addressbook.server.in.in
server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server) server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
@EVO_SUBST_SERVER_RULE@ @EVO_SERVER_RULE@
@EVO_NAME_SERVER_RULE@
@INTLTOOL_SERVER_RULE@ @INTLTOOL_SERVER_RULE@
glade_DATA = \ glade_DATA = \

3
addressbook/gui/component/select-names/Makefile.am
View File

@ -18,8 +18,7 @@ $(IDL_GENERATED_C): $(IDL_GENERATED_H)
server_in_files = GNOME_Evolution_Addressbook_SelectNames.server.in.in server_in_files = GNOME_Evolution_Addressbook_SelectNames.server.in.in
server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server) server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
@EVO_SUBST_SERVER_RULE@ @EVO_SERVER_RULE@
@EVO_NAME_SERVER_RULE@
@INTLTOOL_SERVER_RULE@ @INTLTOOL_SERVER_RULE@
INCLUDES = \ INCLUDES = \

3
calendar/gui/Makefile.am
View File

@ -227,8 +227,7 @@ libevolution_calendar_la_LDFLAGS = -avoid-version -module
server_in_files = GNOME_Evolution_Calendar.server.in.in server_in_files = GNOME_Evolution_Calendar.server.in.in
server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server) server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
@EVO_SUBST_SERVER_RULE@ @EVO_SERVER_RULE@
@EVO_NAME_SERVER_RULE@
@INTLTOOL_SERVER_RULE@ @INTLTOOL_SERVER_RULE@
# GConf schemas # GConf schemas

3
calendar/gui/alarm-notify/Makefile.am
View File

@ -53,8 +53,7 @@ evolution_alarm_notify_LDADD = \
server_in_files = GNOME_Evolution_Calendar_AlarmNotify.server.in.in server_in_files = GNOME_Evolution_Calendar_AlarmNotify.server.in.in
server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server) server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
@EVO_SUBST_SERVER_RULE@ @EVO_SERVER_RULE@
@EVO_NAME_SERVER_RULE@
@INTLTOOL_SERVER_RULE@ @INTLTOOL_SERVER_RULE@
EXTRA_DIST = \ EXTRA_DIST = \

3
calendar/importers/Makefile.am
View File

@ -41,8 +41,7 @@ libevolution_calendar_importers_la_LIBADD = \
server_in_files = GNOME_Evolution_Calendar_Importer.server.in.in server_in_files = GNOME_Evolution_Calendar_Importer.server.in.in
server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server) server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
@EVO_SUBST_SERVER_RULE@ @EVO_SERVER_RULE@
@EVO_NAME_SERVER_RULE@
@INTLTOOL_SERVER_RULE@ @INTLTOOL_SERVER_RULE@
BUILT_SOURCES = $(server_DATA) BUILT_SOURCES = $(server_DATA)

6
configure.in
View File

@ -1282,10 +1282,8 @@ INTERFACE_VERSION="$BASE_VERSION"
AC_SUBST(INTERFACE_VERSION) AC_SUBST(INTERFACE_VERSION)
AC_DEFINE_UNQUOTED(INTERFACE_VERSION, "INTERFACE_VERSION", [IDL interface version (Major.Minor)]) 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_SERVER_RULE=$srcdir/server.mk
EVO_NAME_SERVER_RULE='%_$(BASE_VERSION).server: %.server ; mv $< $@' AC_SUBST_FILE(EVO_SERVER_RULE)
AC_SUBST(EVO_SUBST_SERVER_RULE)
AC_SUBST(EVO_NAME_SERVER_RULE)
################################################## ##################################################
# Check for gtk-doc. # Check for gtk-doc.

3
mail/Makefile.am
View File

@ -196,8 +196,7 @@ evolution_mbox_upgrade_LDADD = \
server_in_files = GNOME_Evolution_Mail.server.in.in server_in_files = GNOME_Evolution_Mail.server.in.in
server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server) server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
@EVO_SUBST_SERVER_RULE@ @EVO_SERVER_RULE@
@EVO_NAME_SERVER_RULE@
@INTLTOOL_SERVER_RULE@ @INTLTOOL_SERVER_RULE@
# Misc data to install # Misc data to install

3
mail/importers/Makefile.am
View File

@ -90,8 +90,7 @@ server_in_files = GNOME_Evolution_Mail_Mbox_Importer.server.in.in \
GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in \ GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in \
GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in
server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server) server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
@EVO_SUBST_SERVER_RULE@ @EVO_SERVER_RULE@
@EVO_NAME_SERVER_RULE@
@INTLTOOL_SERVER_RULE@ @INTLTOOL_SERVER_RULE@
BUILT_SOURCES = $(MAIL_GENERATED) $(server_DATA) BUILT_SOURCES = $(MAIL_GENERATED) $(server_DATA)

11
server.mk Normal file
View File

@ -0,0 +1,11 @@
%.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)|' $< > $@
%_$(BASE_VERSION).server: %.server
mv $< $@

3
shell/Makefile.am
View File

@ -250,8 +250,7 @@ install-test-component: evolution-test-component
server_in_files = GNOME_Evolution_Shell.server.in.in server_in_files = GNOME_Evolution_Shell.server.in.in
server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server) server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
@EVO_SUBST_SERVER_RULE@ @EVO_SERVER_RULE@
@EVO_NAME_SERVER_RULE@
@INTLTOOL_SERVER_RULE@ @INTLTOOL_SERVER_RULE@
etspec_DATA = e-storage-set-view.etspec etspec_DATA = e-storage-set-view.etspec