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

set up vars and rules for versioning the .server files

Browse Source 
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

svn path=/trunk/; revision=23149
This commit is contained in:
JP Rosevear
2003-10-31 13:28:44 +00:00
committed by JP Rosevear
parent 318ff6a394
commit bdf19d3204
11 changed files with 72 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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.

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

@ -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 $@

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

@ -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

10
calendar/gui/Makefile.am
View File

@ -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) \

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

@ -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)

18
calendar/importers/Makefile.am
View File

@ -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=.server)
%.server.in: %.server.in.in
sed -e "s|\@IMPORTERSDIR\@|$(importersdir)|" $< > $@
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 = $(server_DATA)
CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = $(server_in_files)
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)

13
configure.in
View File

@ -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.
##################################################

9
mail/Makefile.am
View File

@ -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)

15
mail/importers/Makefile.am
View File

@ -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)

12
shell/Makefile.am
View File

@ -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) \

15
wombat/Makefile.am
View File

@ -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 $@