diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/bogo-junk-plugin/ChangeLog | 6 | ||||
| -rw-r--r-- | plugins/bogo-junk-plugin/Makefile.am | 7 | ||||
| -rw-r--r-- | plugins/default-mailer/ChangeLog | 6 | ||||
| -rw-r--r-- | plugins/default-mailer/Makefile.am | 17 | ||||
| -rw-r--r-- | plugins/import-ics-attachments/ChangeLog | 6 | ||||
| -rw-r--r-- | plugins/import-ics-attachments/Makefile.am | 3 | ||||
| -rw-r--r-- | plugins/mail-notification/ChangeLog | 6 | ||||
| -rw-r--r-- | plugins/mail-notification/Makefile.am | 28 |
8 files changed, 47 insertions, 32 deletions
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) |