diff options
| author | Srinivasa Ragavan <sragavan@src.gnome.org> | 2007-06-03 22:50:35 +0800 |
|---|---|---|
| committer | Srinivasa Ragavan <sragavan@src.gnome.org> | 2007-06-03 22:50:35 +0800 |
| commit | 54a9260f696f5c7462f40af8f838d723ba3abeb5 (patch) | |
| tree | ab87ece78582288b7dabf6635fe3f393fd042c4d | |
| parent | b484ae1c53ce5e8075eefe907cffbcb936106397 (diff) | |
| download | gsoc2013-evolution-54a9260f696f5c7462f40af8f838d723ba3abeb5.tar.gz gsoc2013-evolution-54a9260f696f5c7462f40af8f838d723ba3abeb5.tar.zst gsoc2013-evolution-54a9260f696f5c7462f40af8f838d723ba3abeb5.zip | |
Fix for version removal from installed files.
svn path=/trunk/; revision=33646
33 files changed, 185 insertions, 131 deletions
@@ -1,3 +1,12 @@ +2007-06-03 Srinivasa Ragavan <sragavan@novell.com> + + ** Fix for version removal from Installed files from Gilles Dartiguelongue + + * configure.in: + * Makefile.am: + * server.mk: + * data/evolution.desktop.in.in + 2007-05-25 Stéphane Raimbault <stephane.raimbault@gmail.com> * po/POTFILES.in: diff --git a/Makefile.am b/Makefile.am index f514784595..d0f71c5405 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,13 +2,10 @@ changelogs = \ ChangeLog \ ChangeLog.pre-1-4 -%-$(BASE_VERSION).pc: %.pc - cp $< $@ - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = \ - evolution-shell-$(BASE_VERSION).pc \ - evolution-plugin-$(BASE_VERSION).pc + evolution-shell.pc \ + evolution-plugin.pc EXTRA_DIST = \ AUTHORS \ @@ -28,7 +25,7 @@ EXTRA_DIST = \ intltool-extract.in \ evolution-zip.in \ gnome-doc-utils.make \ - $(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in) + $(pkgconfig_DATA:.pc=.pc.in) if ENABLE_SMIME SMIME_DIR=smime diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 095571766e..ff685225ac 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,11 @@ +2007-06-03 Srinivasa Ragavan <sragavan@novell.com> + + ** Fix for version removal from Installed files from Gilles Dartiguelongue + + * Makefile.am: + * conduit/Makefile.am: + * gui/component/Makefile.am: + 2007-06-02 Gilles Dartiguelongue <dartigug@esiee.fr> reviewed by: <delete if not using a buddy> diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am index 8d70a4f13f..2ad82313ae 100644 --- a/addressbook/Makefile.am +++ b/addressbook/Makefile.am @@ -1,12 +1,13 @@ + +SUBDIRS = util printing importers gui tools + if ENABLE_PILOT_CONDUITS -CONDUIT_SUBDIR=conduit +SUBDIRS += conduit endif -SUBDIRS = \ - util printing importers gui tools $(CONDUIT_SUBDIR) - error_DATA = addressbook.error errordir = $(privdatadir)/errors + @EVO_PLUGIN_RULE@ EXTRA_DIST = \ diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am index f93b9bce1b..69cbeaf14d 100644 --- a/addressbook/conduit/Makefile.am +++ b/addressbook/conduit/Makefile.am @@ -12,24 +12,24 @@ INCLUDES = \ # Address Conduit privconduit_LTLIBRARIES = libeaddress_conduit.la -libeaddress_conduit_la_SOURCES = \ +libeaddress_conduit_la_SOURCES = \ address-conduit.c libeaddress_conduit_la_LDFLAGS = -module -avoid-version + libeaddress_conduit_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/e-util/libeconduit.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS) -e-address-$(BASE_VERSION).conduit: e-address.conduit.in +e-address.conduit: e-address.conduit.in sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' \ -e 's^\@datadir\@^$(datadir)^g' \ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ $< > $@ conduitdir = $(datadir)/gnome-pilot/conduits/ -conduit_DATA = e-address-$(BASE_VERSION).conduit +conduit_DATA = e-address.conduit BUILT_SOURCES = $(conduit_DATA) CLEANFILES = $(BUILT_SOURCES) diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index b34d51863b..c55b971687 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +INCLUDES = \ -DG_LOG_DOMAIN=\"evolution-addressbook\" \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ @@ -60,16 +60,13 @@ libevolution_addressbook_la_LIBADD = \ $(EVOLUTION_ADDRESSBOOK_LIBS) $(LDAP_LIBS) - libevolution_addressbook_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) # GConf schemas schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_in_files = apps_evolution_addressbook.schemas.in.in -schema_DATA = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas) -%-$(BASE_VERSION).schemas.in: %.schemas.in.in - cp $< $@ +schema_in_files = apps_evolution_addressbook.schemas.in +schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ @@ -92,7 +89,7 @@ install-data-local: endif 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=.server) @EVO_SERVER_RULE@ @INTLTOOL_SERVER_RULE@ diff --git a/art/ChangeLog b/art/ChangeLog index b23b8ece56..dde3f888c0 100644 --- a/art/ChangeLog +++ b/art/ChangeLog @@ -1,3 +1,9 @@ +2007-06-03 Srinivasa Ragavan <sragavan@novell.com> + + ** Fix for version removal from Installed files from Gilles Dartiguelongue + + * art/Makefile.am: + 2007-05-03 David Farning <dfarning@gmail.com> ** Fix for bug #435610 diff --git a/art/Makefile.am b/art/Makefile.am index 88202718ca..9f6a989f55 100644 --- a/art/Makefile.am +++ b/art/Makefile.am @@ -12,7 +12,7 @@ icon32_DATA = 32x32/evolution.png icon48dir = $(datadir)/icons/hicolor/48x48/apps icon48_DATA = \ - 48x48/preferences-autocompletion.png \ + 48x48/preferences-autocompletion.png \ 48x48/preferences-calendar-and-tasks.png \ 48x48/preferences-certificates.png \ 48x48/preferences-composer.png \ diff --git a/calendar/ChangeLog b/calendar/ChangeLog index f78de9d249..333c5b6ab3 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,14 @@ +2007-06-03 Srinivasa Ragavan <sragavan@novell.com> + + ** Fix for version removal from Installed files from Gilles Dartiguelongue + + * Makefile.am: + * conduits/calendar/Makefile.am: + * conduits/memo/Makefile.am: + * conduits/todo/Makefile.am: + * gui/Makefile.am: + * gui/alarm-notify/Makefile.am: + 2006-09-08 Ushveen Kaur <kushveen@novell.com> ** Fixes bug #347767 diff --git a/calendar/Makefile.am b/calendar/Makefile.am index f9a54aff06..f08e48d566 100644 --- a/calendar/Makefile.am +++ b/calendar/Makefile.am @@ -1,13 +1,13 @@ + +SUBDIRS = idl common importers gui + if ENABLE_PILOT_CONDUITS -CONDUIT_DIR = conduits -else -CONDUIT_DIR = +SUBDIRS += conduits endif -SUBDIRS = idl common importers gui $(CONDUIT_DIR) - error_DATA = calendar.error errordir = $(privdatadir)/errors + @EVO_PLUGIN_RULE@ EXTRA_DIST = \ diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am index 8abfc96bb1..36ec220208 100644 --- a/calendar/conduits/calendar/Makefile.am +++ b/calendar/conduits/calendar/Makefile.am @@ -8,24 +8,25 @@ INCLUDES = \ # Calendar Conduit privconduit_LTLIBRARIES = libecalendar_conduit.la -libecalendar_conduit_la_SOURCES = \ +libecalendar_conduit_la_SOURCES = \ calendar-conduit.c libecalendar_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) + libecalendar_conduit_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/e-util/libeconduit.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(top_builddir)/e-util/libeconduit.la \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_CALENDAR_CONDUIT_LIBS) -e-calendar-$(BASE_VERSION).conduit: e-calendar.conduit.in - sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' \ +e-calendar.conduit: e-calendar.conduit.in + sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' \ -e 's^\@datadir\@^$(datadir)^g' \ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ $< > $@ conduitdir = $(datadir)/gnome-pilot/conduits/ -conduit_DATA = e-calendar-$(BASE_VERSION).conduit +conduit_DATA = e-calendar.conduit BUILT_SOURCES = $(conduit_DATA) CLEANFILES = $(BUILT_SOURCES) @@ -34,4 +35,4 @@ EXTRA_DIST = \ e-calendar.conduit.in dist-hook: - cd $(distdir); rm -f $(BUILT_SOURCES)
\ No newline at end of file + cd $(distdir); rm -f $(BUILT_SOURCES) diff --git a/calendar/conduits/memo/Makefile.am b/calendar/conduits/memo/Makefile.am index 70494168ca..afbee4e56c 100644 --- a/calendar/conduits/memo/Makefile.am +++ b/calendar/conduits/memo/Makefile.am @@ -8,24 +8,25 @@ INCLUDES = \ # Memo Conduit privconduit_LTLIBRARIES = libememo_conduit.la -libememo_conduit_la_SOURCES = \ +libememo_conduit_la_SOURCES = \ memo-conduit.c -libememo_conduit_la_LDFLAGS = -module -avoid-version +libememo_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) + libememo_conduit_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/e-util/libeconduit.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(top_builddir)/e-util/libeconduit.la \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_CALENDAR_CONDUIT_LIBS) -e-memo-$(BASE_VERSION).conduit: e-memo.conduit.in - sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' \ +e-memo.conduit: e-memo.conduit.in + sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' \ -e 's^\@datadir\@^$(datadir)^g' \ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ $< > $@ conduitdir = $(datadir)/gnome-pilot/conduits/ -conduit_DATA = e-memo-$(BASE_VERSION).conduit +conduit_DATA = e-memo.conduit BUILT_SOURCES = $(conduit_DATA) CLEANFILES = $(BUILT_SOURCES) diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am index 9c3ae10874..2978fcef61 100644 --- a/calendar/conduits/todo/Makefile.am +++ b/calendar/conduits/todo/Makefile.am @@ -8,24 +8,25 @@ INCLUDES = \ # ToDo Conduit privconduit_LTLIBRARIES = libetodo_conduit.la -libetodo_conduit_la_SOURCES = \ +libetodo_conduit_la_SOURCES = \ todo-conduit.c libetodo_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) + libetodo_conduit_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/e-util/libeconduit.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(top_builddir)/e-util/libeconduit.la \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_CALENDAR_CONDUIT_LIBS) -e-todo-$(BASE_VERSION).conduit: e-todo.conduit.in - sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' \ +e-todo.conduit: e-todo.conduit.in + sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' \ -e 's^\@datadir\@^$(datadir)^g' \ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ $< > $@ conduitdir = $(datadir)/gnome-pilot/conduits/ -conduit_DATA = e-todo-$(BASE_VERSION).conduit +conduit_DATA = e-todo.conduit BUILT_SOURCES = $(conduit_DATA) CLEANFILES = $(BUILT_SOURCES) @@ -34,4 +35,4 @@ EXTRA_DIST = \ e-todo.conduit.in dist-hook: - cd $(distdir); rm -f $(BUILT_SOURCES)
\ No newline at end of file + cd $(distdir); rm -f $(BUILT_SOURCES) diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index bd0601b264..efb573ebce 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -244,17 +244,15 @@ libevolution_calendar_la_LIBADD = \ libevolution_calendar_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED) 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=.server) @EVO_SERVER_RULE@ @INTLTOOL_SERVER_RULE@ # GConf schemas schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_in_files = apps_evolution_calendar.schemas.in.in -schema_DATA = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas) -%-$(BASE_VERSION).schemas.in: %.schemas.in.in - cp $< $@ +schema_in_files = apps_evolution_calendar.schemas.in +schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am index 8b9be3d141..cd1b638fb6 100644 --- a/calendar/gui/alarm-notify/Makefile.am +++ b/calendar/gui/alarm-notify/Makefile.am @@ -54,7 +54,7 @@ evolution_alarm_notify_LDADD = \ $(EVOLUTION_CALENDAR_LIBS) 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=.server) @EVO_SERVER_RULE@ @INTLTOOL_SERVER_RULE@ diff --git a/data/evolution.desktop.in.in b/data/evolution.desktop.in.in index 7b635f86ce..8bce74017e 100644 --- a/data/evolution.desktop.in.in +++ b/data/evolution.desktop.in.in @@ -3,7 +3,7 @@ Encoding=UTF-8 _Name=Evolution _GenericName=Groupware Suite _Comment=The Evolution PIM and Email Client -Exec=evolution-@BASE_VERSION@ +Exec=evolution Icon=evolution Terminal=false Type=Application diff --git a/mail/ChangeLog b/mail/ChangeLog index 81c3a0e1f0..391b2ec77e 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,11 @@ 2007-06-03 Srinivasa Ragavan <sragavan@novell.com> + ** Fix for version removal from Installed files from Gilles Dartiguelongue + + * Makefile.am: + +2007-06-03 Srinivasa Ragavan <sragavan@novell.com> + ** Fix for bug #438461 from Gilles Dartiguelongue * mail-config.glade: diff --git a/mail/Makefile.am b/mail/Makefile.am index 5345bb3c37..48950a6570 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -37,9 +37,9 @@ component_LTLIBRARIES = libevolution-mail.la SPELL_IDL = Spell.idl -SPELL_IDL_GENERATED_H = \ +SPELL_IDL_GENERATED_H = \ Spell.h -SPELL_IDL_GENERATED_C = \ +SPELL_IDL_GENERATED_C = \ Spell-common.c \ Spell-skels.c \ Spell-stubs.c @@ -53,9 +53,9 @@ Spell-impl.o: Spell.h # Mail.idl MAIL_IDL = Evolution-Mail.idl -MAIL_IDL_GENERATED_H = \ +MAIL_IDL_GENERATED_H = \ Evolution-Mail.h -MAIL_IDL_GENERATED_C = \ +MAIL_IDL_GENERATED_C = \ Evolution-Mail-common.c \ Evolution-Mail-skels.c \ Evolution-Mail-stubs.c @@ -206,13 +206,12 @@ libevolution_mail_la_SOURCES = \ message-tag-followup.h if ENABLE_SMIME -SMIME_LIBS = \ +SMIME_LIBS = \ $(top_builddir)/smime/lib/libessmime.la \ $(top_builddir)/smime/gui/libevolution-smime.la endif libevolution_mail_la_LIBADD = \ - $(top_builddir)/mail/importers/libevolution-mail-importers.la\ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/composer/libcomposer.la \ @@ -225,14 +224,14 @@ libevolution_mail_la_LIBADD = \ $(top_builddir)/addressbook/util/libeabutil.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ - $(top_builddir)/mail/importers/libevolution-mail-importers.la\ - $(SMIME_LIBS) \ + $(top_builddir)/mail/importers/libevolution-mail-importers.la \ + $(SMIME_LIBS) $(EVOLUTION_MAIL_LIBS) \ $(GTKHTML_LIBS) \ $(REGEX_LIBS) \ $(THREADS_LIBS) -libevolution_mail_la_LDFLAGS = \ +libevolution_mail_la_LDFLAGS = \ -avoid-version -module $(NO_UNDEFINED) libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h @@ -240,7 +239,8 @@ libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h # .server files 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=.server) + @EVO_SERVER_RULE@ @INTLTOOL_SERVER_RULE@ @@ -297,11 +297,8 @@ endif # GConf schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_in_files = evolution-mail.schemas.in.in -schema_DATA = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas) -%-$(BASE_VERSION).schemas.in: %.schemas.in.in - cp $< $@ - +schema_in_files = evolution-mail.schemas.in +schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ if OS_WIN32 diff --git a/plugins/bogo-junk-plugin/ChangeLog b/plugins/bogo-junk-plugin/ChangeLog index 654c8c1978..939f397395 100644 --- a/plugins/bogo-junk-plugin/ChangeLog +++ b/plugins/bogo-junk-plugin/ChangeLog @@ -1,3 +1,9 @@ +2007-06-03 Srinivasa Ragavan <sragavan@novell.com> + + ** Fix for version removal from Installed files from Gilles Dartiguelongue + + * Makefile.am: + 2007-05-12 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #337616 diff --git a/plugins/bogo-junk-plugin/Makefile.am b/plugins/bogo-junk-plugin/Makefile.am index 604dc452a3..cc89c0072e 100644 --- a/plugins/bogo-junk-plugin/Makefile.am +++ b/plugins/bogo-junk-plugin/Makefile.am @@ -11,11 +11,8 @@ liborg_gnome_bogo_junk_plugin_la_SOURCES = bf-junk-filter.c liborg_gnome_bogo_junk_plugin_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_in_files = bogo-junk-plugin.schemas.in.in -schema_DATA = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas) - -%-$(BASE_VERSION).schemas.in: %.schemas.in.in - cp $< $@ +schema_in_files = bogo-junk-plugin.schemas.in +schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ diff --git a/plugins/default-mailer/ChangeLog b/plugins/default-mailer/ChangeLog index 98a314f1e6..4c98aba9d0 100644 --- a/plugins/default-mailer/ChangeLog +++ b/plugins/default-mailer/ChangeLog @@ -1,3 +1,9 @@ +2007-06-03 Srinivasa Ragavan <sragavan@novell.com> + + ** Fix for version removal from Installed files from Gilles Dartiguelongue + + * Makefile.am: + 2007-05-12 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #337616 diff --git a/plugins/default-mailer/Makefile.am b/plugins/default-mailer/Makefile.am index 8f4876e45e..7ba5d4d591 100644 --- a/plugins/default-mailer/Makefile.am +++ b/plugins/default-mailer/Makefile.am @@ -14,22 +14,19 @@ liborg_gnome_default_mailer_la_SOURCES = default-mailer.c liborg_gnome_default_mailer_la_LDFLAGS = -module -avoid-version schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_in_files = apps-evolution-mail-prompts-checkdefault.schemas.in.in -schema_DATA = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas) - -%-$(BASE_VERSION).schemas.in: %.schemas.in.in - cp $< $@ +schema_in_files = apps-evolution-mail-prompts-checkdefault.schemas.in +schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ install-data-local: - if test -z "$(DESTDIR)" ; then \ - for p in $(schema_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \ - done \ + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \ + done \ fi -EXTRA_DIST = \ +EXTRA_DIST = \ org-gnome-default-mailer.eplug.xml \ org-gnome-default-mailer.error.xml \ $(schema_in_files) diff --git a/plugins/import-ics-attachments/ChangeLog b/plugins/import-ics-attachments/ChangeLog index b20af87b27..1fbdcec73a 100644 --- a/plugins/import-ics-attachments/ChangeLog +++ b/plugins/import-ics-attachments/ChangeLog @@ -1,3 +1,9 @@ +2007-06-03 Srinivasa Ragavan <sragavan@novell.com> + + ** Fix for version removal from Installed files from Gilles Dartiguelongue + + * Makefile.am: + 2007-05-12 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #337616 diff --git a/plugins/import-ics-attachments/Makefile.am b/plugins/import-ics-attachments/Makefile.am index cae0cec7ab..30331d0c01 100644 --- a/plugins/import-ics-attachments/Makefile.am +++ b/plugins/import-ics-attachments/Makefile.am @@ -28,4 +28,5 @@ liborg_gnome_evolution_mail_attachments_import_ics_la_LIBADD = \ EXTRA_DIST = org-gnome-evolution-mail-attachments-import-ics.eplug.xml -CLEANFILES = org-gnome-evolution-mail-attachments-import-ics.eplug +BUILT_SOURCES = $(plugin_DATA) +CLEANFILES = $(BUILT_SOURCES) diff --git a/plugins/mail-notification/ChangeLog b/plugins/mail-notification/ChangeLog index 30cdf8abe8..9f856d8979 100644 --- a/plugins/mail-notification/ChangeLog +++ b/plugins/mail-notification/ChangeLog @@ -1,3 +1,9 @@ +2007-06-03 Srinivasa Ragavan <sragavan@novell.com> + + ** Fix for version removal from Installed files from Gilles Dartiguelongue + + * Makefile.am: + 2007-05-19 Matthew Barnes <mbarnes@redhat.com> * Makefile.am: Fix a couple distcheck errors. diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am index 92cb2d5349..8b93fe3e3c 100644 --- a/plugins/mail-notification/Makefile.am +++ b/plugins/mail-notification/Makefile.am @@ -1,14 +1,10 @@ -INCLUDES = \ - -I$(top_srcdir) \ +INCLUDES = \ + -I$(top_srcdir) \ -DDBUS_API_SUBJECT_TO_CHANGE=1 \ -DDBUS_VERSION=$(DBUS_VERSION) \ - $(EVOLUTION_MAIL_CFLAGS) \ - $(LIBNOTIFY_CFLAGS) - $(NMN_CFLAGS) - -LIBS = \ - $(LIBNOTIFY_LIBS) \ - $(NMN_LIBS) + $(EVOLUTION_MAIL_CFLAGS) \ + $(LIBNOTIFY_CFLAGS) \ + $(NMN_CFLAGS) @EVO_PLUGIN_RULE@ @@ -16,14 +12,14 @@ plugin_DATA = org-gnome-mail-notification.eplug plugin_LTLIBRARIES = liborg-gnome-mail-notification.la liborg_gnome_mail_notification_la_SOURCES = mail-notification.c -liborg_gnome_mail_notification_la_LDFLAGS = -module -avoid-version +liborg_gnome_mail_notification_la_LDFLAGS = \ + -module -avoid-version \ + $(LIBNOTIFY_LIBS) \ + $(NMN_LIBS) schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_in_files = apps-evolution-mail-notification.schemas.in.in -schema_DATA = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas) - -%-$(BASE_VERSION).schemas.in: %.schemas.in.in - cp $< $@ +schema_in_files = apps-evolution-mail-notification.schemas.in +schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ @@ -40,6 +36,6 @@ CLEANFILES = $(BUILT_SOURCES) DISTCLEANFILES = $(schema_DATA) -EXTRA_DIST = \ +EXTRA_DIST = \ org-gnome-mail-notification.eplug.xml \ $(schema_in_files) diff --git a/po/ChangeLog b/po/ChangeLog index 49a6c77a7b..f700a333c1 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,9 @@ +2007-06-03 Srinivasa Ragavan <sragavan@novell.com> + + ** Fix for version removal from Installed files from Gilles Dartiguelongue + + * POTFILES.in: + 2007-06-02 Jorge Gonzalez <jorgegonz@svn.gnome.org> * es.po: Updated Spanish translation diff --git a/po/POTFILES.in b/po/POTFILES.in index 0e5ad9823b..6c78fe26cf 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -29,7 +29,7 @@ addressbook/gui/component/addressbook-config.c addressbook/gui/component/addressbook-migrate.c addressbook/gui/component/addressbook-view.c addressbook/gui/component/addressbook.c -addressbook/gui/component/apps_evolution_addressbook.schemas.in.in +addressbook/gui/component/apps_evolution_addressbook.schemas.in addressbook/gui/component/ldap-config.glade addressbook/gui/contact-editor/contact-editor.glade addressbook/gui/contact-editor/e-contact-editor-address.c @@ -84,7 +84,7 @@ calendar/gui/alarm-notify/alarm-notify.glade calendar/gui/alarm-notify/alarm-queue.c calendar/gui/alarm-notify/notify-main.c calendar/gui/alarm-notify/util.c -calendar/gui/apps_evolution_calendar.schemas.in.in +calendar/gui/apps_evolution_calendar.schemas.in calendar/gui/cal-search-bar.c calendar/gui/calendar-commands.c calendar/gui/calendar-component.c @@ -225,7 +225,7 @@ mail/em-subscribe-editor.c mail/em-utils.c mail/em-vfolder-editor.c mail/em-vfolder-rule.c -mail/evolution-mail.schemas.in.in +mail/evolution-mail.schemas.in mail/importers/elm-importer.c mail/importers/evolution-mbox-importer.c mail/importers/mail-importer.c @@ -260,7 +260,7 @@ plugins/backup-restore/org-gnome-backup-restore.xml plugins/bbdb/bbdb.c plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml plugins/bogo-junk-plugin/bf-junk-filter.c -plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.in +plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml plugins/caldav/caldav-source.c plugins/caldav/org-gnome-evolution-caldav.eplug.xml @@ -270,7 +270,7 @@ plugins/calendar-http/org-gnome-calendar-http.eplug.xml plugins/calendar-weather/calendar-weather.c plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml plugins/copy-tool/org-gnome-copy-tool.eplug.xml -plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in +plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in plugins/default-mailer/org-gnome-default-mailer.eplug.xml plugins/default-mailer/org-gnome-default-mailer.error.xml plugins/default-source/default-source.c @@ -344,10 +344,9 @@ plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml plugins/itip-formatter/org-gnome-itip-formatter.error.xml plugins/mail-account-disable/mail-account-disable.c plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml -plugins/mail-notification/apps-evolution-mail-notification.schemas.in.in +plugins/mail-notification/apps-evolution-mail-notification.schemas.in plugins/mail-notification/mail-notification.c plugins/mail-notification/org-gnome-mail-notification.eplug.xml -plugins/mail-notification/apps-evolution-mail-notification.schemas.in.in plugins/mail-remote/client.c plugins/mail-remote/e-corba-utils.c plugins/mail-remote/evolution-mail-store.c @@ -393,7 +392,7 @@ plugins/subject-thread/org-gnome-subject-thread.eplug.xml plugins/subject-thread/subject-thread.c shell/GNOME_Evolution_Shell.server.in.in shell/GNOME_Evolution_Test.server.in.in -shell/apps_evolution_shell.schemas.in.in +shell/apps_evolution_shell.schemas.in shell/e-active-connection-dialog.glade shell/e-component-registry.c shell/e-config-upgrade.c @@ -7,6 +7,3 @@ -e 's|\@SOEXT\@|$(SOEXT)|' \ -e 's|\@INTERFACE_VERSION\@|$(INTERFACE_VERSION)|' $< > $@ -%_$(BASE_VERSION).server: %.server - mv $< $@ - diff --git a/shell/ChangeLog b/shell/ChangeLog index 4222dcf296..ecf87434e7 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2007-06-03 Srinivasa Ragavan <sragavan@novell.com> + + ** Fix for version removal from Installed files from Gilles Dartiguelongue + + * Makefile.am: + 2007-06-02 Gilles Dartiguelongue <dartigug@esiee.fr> * Fix bug #441055 diff --git a/shell/Makefile.am b/shell/Makefile.am index 4b671f52aa..8eef0ef0df 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -96,10 +96,10 @@ eshellinclude_HEADERS = \ es-event.h \ es-menu.h -libeshell_la_SOURCES = \ +libeshell_la_SOURCES = \ $(IDL_GENERATED) \ $(MARSHAL_GENERATED) \ - e-component-view.c \ + e-component-view.c \ evolution-component.c \ evolution-listener.c \ e-shell-utils.c \ @@ -176,14 +176,14 @@ libevolution_test_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED) if ENABLE_TEST_COMPONENT testserver_in_files = GNOME_Evolution_Test.server.in.in -testserver_DATA = $(testserver_in_files:.server.in.in=_$(BASE_VERSION).server) +testserver_DATA = $(testserver_in_files:.server.in.in=.server) testserverdir = $(serverdir) endif # Misc stuff 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=.server) @EVO_SERVER_RULE@ @INTLTOOL_SERVER_RULE@ @@ -198,10 +198,8 @@ glade_DATA = \ # GConf schemas schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_in_files = apps_evolution_shell.schemas.in.in -schema_DATA = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas) -%-$(BASE_VERSION).schemas.in: %.schemas.in.in - cp $< $@ +schema_in_files = apps_evolution_shell.schemas.in +schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ @@ -227,16 +225,10 @@ endif install-evolution: $(mkinstalldirs) $(DESTDIR)$(bindir) - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution$(EXEEXT) $(DESTDIR)$(bindir)/evolution-$(BASE_VERSION)$(EXEEXT) -if DEFAULT_BINARY - cd $(DESTDIR)$(bindir) && rm -f evolution$(EXEEXT) && $(LN_S) evolution-$(BASE_VERSION)$(EXEEXT) evolution$(EXEEXT) -endif + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution$(EXEEXT) $(DESTDIR)$(bindir)/evolution$(EXEEXT) uninstall-evolution: - $(LIBTOOL) --mode=uninstall rm -rf $(DESTDIR)$(bindir)/evolution-$(BASE_VERSION)$(EXEEXT) -if DEFAULT_BINARY - rm -f $(DESTDIR)$(bindir)/evolution$(EXEEXT) -endif + $(LIBTOOL) --mode=uninstall rm -rf $(DESTDIR)$(bindir)/evolution$(EXEEXT) if HAVE_DTAPPINTEGRATE diff --git a/smime/ChangeLog b/smime/ChangeLog index 5ee474f397..8ed52058f4 100644 --- a/smime/ChangeLog +++ b/smime/ChangeLog @@ -1,3 +1,9 @@ +2007-06-03 Srinivasa Ragavan <sragavan@novell.com> + + ** Fix for version removal from Installed files from Gilles Dartiguelongue + + * Makefile.am: + 2007-04-20 Srinivasa Ragavan <sragavan@novell.com> ** Fix for bug #396645 from Gilles Dartiguelongue diff --git a/smime/Makefile.am b/smime/Makefile.am index 1d3390b381..bc03fcd4a3 100644 --- a/smime/Makefile.am +++ b/smime/Makefile.am @@ -1 +1 @@ -SUBDIRS= lib gui
\ No newline at end of file +SUBDIRS = lib gui |