aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-12-28 03:10:15 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-12-28 03:32:39 +0800
commit59bd81691def7f7f8c0ead2edaacd374b6791067 (patch)
treee09951e7f35561f573fc56a50f42c706ac25aae5 /plugins
parent6a074300e533a82fb1a09b470724e54b155f8cd5 (diff)
downloadgsoc2013-evolution-59bd81691def7f7f8c0ead2edaacd374b6791067.tar.gz
gsoc2013-evolution-59bd81691def7f7f8c0ead2edaacd374b6791067.tar.zst
gsoc2013-evolution-59bd81691def7f7f8c0ead2edaacd374b6791067.zip
Compiler and linker flag cleanups.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/addressbook-file/Makefile.am5
-rw-r--r--plugins/attachment-reminder/Makefile.am4
-rw-r--r--plugins/audio-inline/Makefile.am4
-rw-r--r--plugins/backup-restore/Makefile.am10
-rw-r--r--plugins/bbdb/Makefile.am4
-rw-r--r--plugins/bogo-junk-plugin/Makefile.am1
-rw-r--r--plugins/caldav/Makefile.am3
-rw-r--r--plugins/calendar-file/Makefile.am4
-rw-r--r--plugins/calendar-http/Makefile.am5
-rw-r--r--plugins/calendar-weather/Makefile.am4
-rw-r--r--plugins/contacts-map/Makefile.am4
-rw-r--r--plugins/default-mailer/Makefile.am4
-rw-r--r--plugins/default-source/Makefile.am4
-rw-r--r--plugins/email-custom-header/Makefile.am6
-rw-r--r--plugins/external-editor/Makefile.am1
-rw-r--r--plugins/face/Makefile.am4
-rw-r--r--plugins/google-account-setup/Makefile.am6
-rw-r--r--plugins/groupwise-features/Makefile.am5
-rw-r--r--plugins/hula-account-setup/Makefile.am4
-rw-r--r--plugins/imap-features/Makefile.am4
-rw-r--r--plugins/itip-formatter/Makefile.am6
-rw-r--r--plugins/mail-notification/Makefile.am4
-rw-r--r--plugins/mail-to-task/Makefile.am4
-rw-r--r--plugins/mailing-list-actions/Makefile.am4
-rw-r--r--plugins/mark-all-read/Makefile.am4
-rw-r--r--plugins/plugin-manager/Makefile.am4
-rw-r--r--plugins/prefer-plain/Makefile.am4
-rw-r--r--plugins/pst-import/Makefile.am3
-rw-r--r--plugins/publish-calendar/Makefile.am6
-rw-r--r--plugins/sa-junk-plugin/Makefile.am4
-rw-r--r--plugins/save-calendar/Makefile.am4
-rw-r--r--plugins/startup-wizard/Makefile.am4
-rw-r--r--plugins/subject-thread/Makefile.am5
-rw-r--r--plugins/templates/Makefile.am4
-rw-r--r--plugins/tnef-attachments/Makefile.am2
-rw-r--r--plugins/vcard-inline/Makefile.am6
-rw-r--r--plugins/webdav-account-setup/Makefile.am8
37 files changed, 107 insertions, 55 deletions
diff --git a/plugins/addressbook-file/Makefile.am b/plugins/addressbook-file/Makefile.am
index 6eb00096b6..afe3453bc6 100644
--- a/plugins/addressbook-file/Makefile.am
+++ b/plugins/addressbook-file/Makefile.am
@@ -7,13 +7,16 @@ plugin_LTLIBRARIES = liborg-gnome-addressbook-file.la
liborg_gnome_addressbook_file_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir) \
+ $(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
liborg_gnome_addressbook_file_la_SOURCES = addressbook-file.c
liborg_gnome_addressbook_file_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
-liborg_gnome_addressbook_file_la_LIBADD = $(EVOLUTION_ADDRESSBOOK_LIBS)
+liborg_gnome_addressbook_file_la_LIBADD = \
+ $(EVOLUTION_ADDRESSBOOK_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
EXTRA_DIST = org-gnome-addressbook-file.eplug.xml
diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am
index 66725b0de4..2a5564236e 100644
--- a/plugins/attachment-reminder/Makefile.am
+++ b/plugins/attachment-reminder/Makefile.am
@@ -30,8 +30,8 @@ liborg_gnome_evolution_attachment_reminder_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/mail/libevolution-mail.la \
- $(GNOME_PLATFORM_LIBS) \
- $(EVOLUTION_MAIL_LIBS)
+ $(EVOLUTION_MAIL_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_in_files = apps-evolution-attachment-reminder.schemas.in
diff --git a/plugins/audio-inline/Makefile.am b/plugins/audio-inline/Makefile.am
index c68e46d4f8..8d7501a444 100644
--- a/plugins/audio-inline/Makefile.am
+++ b/plugins/audio-inline/Makefile.am
@@ -14,6 +14,7 @@ plugin_LTLIBRARIES = liborg-gnome-audio-inline.la
liborg_gnome_audio_inline_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir) \
+ $(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_MAIL_CFLAGS) \
$(GSTREAMER_CFLAGS)
@@ -25,7 +26,8 @@ liborg_gnome_audio_inline_la_LIBADD = \
$(top_builddir)/mail/libevolution-mail.la \
$(top_builddir)/e-util/libeutil.la \
$(GSTREAMER_LIBS) \
- $(EVOLUTION_MAIL_LIBS)
+ $(EVOLUTION_MAIL_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
EXTRA_DIST = org-gnome-audio-inline.eplug.xml
diff --git a/plugins/backup-restore/Makefile.am b/plugins/backup-restore/Makefile.am
index 9ffb2e340e..c4e033f733 100644
--- a/plugins/backup-restore/Makefile.am
+++ b/plugins/backup-restore/Makefile.am
@@ -16,6 +16,7 @@ liborg_gnome_backup_restore_la_CPPFLAGS = \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(libdir)"\" \
+ $(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_CALENDAR_CFLAGS) \
$(SHELL_CFLAGS) \
$(E_UTIL_CFLAGS)
@@ -23,9 +24,10 @@ liborg_gnome_backup_restore_la_CPPFLAGS = \
liborg_gnome_backup_restore_la_SOURCES = backup-restore.c
liborg_gnome_backup_restore_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
liborg_gnome_backup_restore_la_LIBADD = \
- $(SHELL_LIBS) \
$(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/shell/libeshell.la
+ $(top_builddir)/shell/libeshell.la \
+ $(SHELL_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
privlibexec_PROGRAMS = evolution-backup
evolution_backup_SOURCES = backup.c
@@ -39,13 +41,15 @@ evolution_backup_CPPFLAGS = \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(libdir)"\" \
+ $(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_CALENDAR_CFLAGS) \
$(SHELL_CFLAGS) \
$(E_UTIL_CFLAGS)
evolution_backup_LDADD = \
+ $(top_builddir)/e-util/libeutil.la \
$(SHELL_LIBS) \
- $(top_builddir)/e-util/libeutil.la
+ $(GNOME_PLATFORM_LIBS)
if OS_WIN32
evolution_backup_LDFLAGS = -mwindows
diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am
index 4f1d9066cf..e4e9cdff03 100644
--- a/plugins/bbdb/Makefile.am
+++ b/plugins/bbdb/Makefile.am
@@ -16,6 +16,7 @@ liborg_gnome_evolution_bbdb_la_CPPFLAGS = \
-I$(top_builddir)/composer \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
+ $(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_MAIL_CFLAGS) \
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
@@ -28,7 +29,8 @@ liborg_gnome_evolution_bbdb_la_LIBADD = \
$(top_builddir)/composer/libcomposer.la \
$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
- $(EVOLUTION_ADDRESSBOOK_LIBS)
+ $(EVOLUTION_ADDRESSBOOK_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
EXTRA_DIST = org-gnome-evolution-bbdb.eplug.xml
diff --git a/plugins/bogo-junk-plugin/Makefile.am b/plugins/bogo-junk-plugin/Makefile.am
index 863fa4ad87..e4c03ae9dc 100644
--- a/plugins/bogo-junk-plugin/Makefile.am
+++ b/plugins/bogo-junk-plugin/Makefile.am
@@ -8,6 +8,7 @@ liborg_gnome_bogo_junk_plugin_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir) \
-DWELCOME_MESSAGE=\""$(privdatadir)/default/C/mail/local/Inbox"\" \
+ $(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_MAIL_CFLAGS)
liborg_gnome_bogo_junk_plugin_la_SOURCES = bf-junk-filter.c
diff --git a/plugins/caldav/Makefile.am b/plugins/caldav/Makefile.am
index 18c2a91648..f75d1c0f4c 100644
--- a/plugins/caldav/Makefile.am
+++ b/plugins/caldav/Makefile.am
@@ -21,7 +21,8 @@ liborg_gnome_evolution_caldav_la_LIBADD = \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
$(EVOLUTION_CALENDAR_LIBS) \
$(EPLUGIN_LIBS) \
- $(LIBSOUP_LIBS)
+ $(LIBSOUP_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
liborg_gnome_evolution_caldav_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
diff --git a/plugins/calendar-file/Makefile.am b/plugins/calendar-file/Makefile.am
index bbf8b7dfef..ba8af51ad4 100644
--- a/plugins/calendar-file/Makefile.am
+++ b/plugins/calendar-file/Makefile.am
@@ -7,6 +7,7 @@ plugin_LTLIBRARIES = liborg-gnome-calendar-file.la
liborg_gnome_calendar_file_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir) \
+ $(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_CALENDAR_CFLAGS) \
$(SOURCE_SEL_CFLAGS)
@@ -15,7 +16,8 @@ liborg_gnome_calendar_file_la_SOURCES = calendar-file.c
liborg_gnome_calendar_file_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
liborg_gnome_calendar_file_la_LIBADD = \
- $(EVOLUTION_CALENDAR_LIBS)
+ $(EVOLUTION_CALENDAR_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
EXTRA_DIST = org-gnome-calendar-file.eplug.xml
diff --git a/plugins/calendar-http/Makefile.am b/plugins/calendar-http/Makefile.am
index cf432dd451..2e2a49ba0c 100644
--- a/plugins/calendar-http/Makefile.am
+++ b/plugins/calendar-http/Makefile.am
@@ -7,6 +7,7 @@ plugin_LTLIBRARIES = liborg-gnome-calendar-http.la
liborg_gnome_calendar_http_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir) \
+ $(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_CALENDAR_CFLAGS) \
$(SOURCE_SEL_CFLAGS)
@@ -14,7 +15,9 @@ liborg_gnome_calendar_http_la_SOURCES = calendar-http.c
liborg_gnome_calendar_http_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
-liborg_gnome_calendar_http_la_LIBADD = $(EVOLUTION_CALENDAR_LIBS)
+liborg_gnome_calendar_http_la_LIBADD = \
+ $(EVOLUTION_CALENDAR_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
EXTRA_DIST = org-gnome-calendar-http.eplug.xml
diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am
index d2801a6395..96f1fd2da7 100644
--- a/plugins/calendar-weather/Makefile.am
+++ b/plugins/calendar-weather/Makefile.am
@@ -9,6 +9,7 @@ liborg_gnome_calendar_weather_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
+ $(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_CALENDAR_CFLAGS) \
$(SOURCE_SEL_CFLAGS) \
-DWEATHER_DATADIR=\""$(weatherdatadir)"\" \
@@ -21,7 +22,8 @@ liborg_gnome_calendar_weather_la_LIBADD = \
$(top_builddir)/calendar/gui/libevolution-calendar.la \
$(top_builddir)/e-util/libeutil.la \
$(EVOLUTION_CALENDAR_LIBS) \
- $(LIBGWEATHER_LIBS)
+ $(LIBGWEATHER_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
EXTRA_DIST = \
org-gnome-calendar-weather.eplug.xml \
diff --git a/plugins/contacts-map/Makefile.am b/plugins/contacts-map/Makefile.am
index 4c3585620c..2c8a86dd9e 100644
--- a/plugins/contacts-map/Makefile.am
+++ b/plugins/contacts-map/Makefile.am
@@ -7,6 +7,7 @@ liborg_gnome_contacts_map_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
+ $(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
$(CHAMPLAIN_CFLAGS) \
$(GEOCLUE_CFLAGS)
@@ -22,7 +23,8 @@ liborg_gnome_contacts_map_la_LIBADD = \
$(top_builddir)/shell/libeshell.la \
$(CHAMPLAIN_LIBS) \
$(GEOCLUE_LIBS) \
- $(EVOLUTION_ADDRESSBOOK_LIBS)
+ $(EVOLUTION_ADDRESSBOOK_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
EXTRA_DIST = org-gnome-contacts-map.eplug.xml
diff --git a/plugins/default-mailer/Makefile.am b/plugins/default-mailer/Makefile.am
index 50dd13ebd3..a3b85d1ab5 100644
--- a/plugins/default-mailer/Makefile.am
+++ b/plugins/default-mailer/Makefile.am
@@ -18,8 +18,8 @@ liborg_gnome_default_mailer_la_SOURCES = default-mailer.c
liborg_gnome_default_mailer_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
liborg_gnome_default_mailer_la_LIBADD = \
$(top_builddir)/mail/libevolution-mail.la \
- $(GNOME_PLATFORM_LIBS) \
- $(EVOLUTION_MAIL_LIBS)
+ $(EVOLUTION_MAIL_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_in_files = apps-evolution-mail-prompts-checkdefault.schemas.in
diff --git a/plugins/default-source/Makefile.am b/plugins/default-source/Makefile.am
index 3339f1e406..6f4a9043d1 100644
--- a/plugins/default-source/Makefile.am
+++ b/plugins/default-source/Makefile.am
@@ -7,6 +7,7 @@ plugin_LTLIBRARIES = liborg-gnome-default-source.la
liborg_gnome_default_source_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir) \
+ $(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_CALENDAR_CFLAGS) \
$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
$(SOURCE_SEL_CFLAGS)
@@ -17,7 +18,8 @@ liborg_gnome_default_source_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
liborg_gnome_default_source_la_LIBADD = \
$(EVOLUTION_CALENDAR_LIBS) \
- $(EVOLUTION_ADDRESSBOOK_LIBS)
+ $(EVOLUTION_ADDRESSBOOK_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
EXTRA_DIST = org-gnome-default-source.eplug.xml
diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am
index 3f67f845ed..def545a489 100644
--- a/plugins/email-custom-header/Makefile.am
+++ b/plugins/email-custom-header/Makefile.am
@@ -23,11 +23,11 @@ liborg_gnome_email_custom_header_la_SOURCES = \
liborg_gnome_email_custom_header_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/composer/libcomposer.la \
+ $(top_builddir)/composer/libcomposer.la \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/mail/libevolution-mail.la \
- $(GNOME_PLATFORM_LIBS) \
- $(EVOLUTION_MAIL_LIBS)
+ $(EVOLUTION_MAIL_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
liborg_gnome_email_custom_header_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am
index 4e41c01cbf..0f4cec9b95 100644
--- a/plugins/external-editor/Makefile.am
+++ b/plugins/external-editor/Makefile.am
@@ -28,6 +28,7 @@ liborg_gnome_external_editor_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/composer \
-I$(top_srcdir)/widgets \
+ $(GNOME_PLATFORM_CFLAGS) \
$(SHELL_CFLAGS) \
$(EVOLUTION_MAIL_CFLAGS) \
$(E_UTIL_CFLAGS)
diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am
index d8bd983ae3..8bac8fa7e6 100644
--- a/plugins/face/Makefile.am
+++ b/plugins/face/Makefile.am
@@ -12,6 +12,7 @@ liborg_gnome_face_la_CPPFLAGS = \
-I$(top_srcdir)/widgets/misc \
-I$(top_builddir)/mail \
-I$(top_builddir)/composer \
+ $(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_MAIL_CFLAGS) \
-DEVOLUTION_UIDIR=\""$(uidir)"\" \
-DCONNECTOR_UIDIR=\""$(uidir)"\"
@@ -22,7 +23,8 @@ liborg_gnome_face_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/mail/libevolution-mail.la \
- $(EVOLUTION_MAIL_LIBS)
+ $(EVOLUTION_MAIL_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
liborg_gnome_face_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
diff --git a/plugins/google-account-setup/Makefile.am b/plugins/google-account-setup/Makefile.am
index a6d62fa1a2..eeffd15d28 100644
--- a/plugins/google-account-setup/Makefile.am
+++ b/plugins/google-account-setup/Makefile.am
@@ -9,7 +9,8 @@ liborg_gnome_evolution_google_la_CPPFLAGS = \
-I . \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
- -DCALDAV_UIDIR=\""$(uidir)"\" \
+ -DCALDAV_UIDIR=\""$(uidir)"\" \
+ $(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_CALENDAR_CFLAGS) \
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
@@ -21,7 +22,8 @@ liborg_gnome_evolution_google_la_SOURCES = \
liborg_gnome_evolution_google_la_LIBADD = \
$(top_builddir)/calendar/gui/libevolution-calendar.la \
$(EVOLUTION_CALENDAR_LIBS) \
- $(EPLUGIN_LIBS)
+ $(EPLUGIN_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
liborg_gnome_evolution_google_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am
index 97aff65f8b..f1047fce32 100644
--- a/plugins/groupwise-features/Makefile.am
+++ b/plugins/groupwise-features/Makefile.am
@@ -58,9 +58,8 @@ liborg_gnome_groupwise_features_la_LIBADD= \
$(top_builddir)/mail/libevolution-mail.la \
$(EVOLUTION_CALENDAR_LIBS) \
$(EVOLUTION_MAIL_LIBS) \
- $(CAMEL_GROUPWISE_LIBS)
-
-
+ $(CAMEL_GROUPWISE_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
liborg_gnome_groupwise_features_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
diff --git a/plugins/hula-account-setup/Makefile.am b/plugins/hula-account-setup/Makefile.am
index ba86505d92..8997f5b48e 100644
--- a/plugins/hula-account-setup/Makefile.am
+++ b/plugins/hula-account-setup/Makefile.am
@@ -7,6 +7,7 @@ plugin_LTLIBRARIES = liborg-gnome-evolution-hula-account-setup.la
liborg_gnome_evolution_hula_account_setup_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir) \
+ $(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_MAIL_CFLAGS) \
$(EVOLUTION_CALENDAR_CFLAGS) \
-DEVOLUTION_UIDIR=\""$(uidir)"\"
@@ -23,7 +24,8 @@ liborg_gnome_evolution_hula_account_setup_la_LIBADD= \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/filter/libfilter.la \
$(EVOLUTION_CALENDAR_LIBS) \
- $(EVOLUTION_MAIL_LIBS)
+ $(EVOLUTION_MAIL_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
EXTRA_DIST = org-gnome-evolution-hula-account-setup.eplug.xml
diff --git a/plugins/imap-features/Makefile.am b/plugins/imap-features/Makefile.am
index f79fef3474..de16f4e94d 100644
--- a/plugins/imap-features/Makefile.am
+++ b/plugins/imap-features/Makefile.am
@@ -12,6 +12,7 @@ liborg_gnome_imap_features_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/mail \
+ $(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_MAIL_CFLAGS) \
$(CAMEL_IMAP_CFLAGS) \
-DEVOLUTION_UIDIR=\""$(uidir)"\" \
@@ -22,7 +23,8 @@ liborg_gnome_imap_features_la_SOURCES = imap-headers.c
liborg_gnome_imap_features_la_LIBADD= \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/mail/libevolution-mail.la \
- $(EVOLUTION_MAIL_LIBS)
+ $(EVOLUTION_MAIL_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
liborg_gnome_imap_features_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
diff --git a/plugins/itip-formatter/Makefile.am b/plugins/itip-formatter/Makefile.am
index 7f333f18f5..62346f4c17 100644
--- a/plugins/itip-formatter/Makefile.am
+++ b/plugins/itip-formatter/Makefile.am
@@ -22,9 +22,9 @@ liborg_gnome_itip_formatter_la_LIBADD = \
$(top_builddir)/shell/libeshell.la \
$(top_builddir)/em-format/libemformat.la \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
- $(GNOME_PLATFORM_LIBS) \
$(CAMEL_LIBS) \
- $(EVOLUTION_CALENDAR_LIBS)
+ $(EVOLUTION_CALENDAR_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
error_DATA = org-gnome-itip-formatter.error
errordir = $(privdatadir)/errors
@@ -37,6 +37,4 @@ EXTRA_DIST = \
org-gnome-itip-formatter.eplug.xml \
org-gnome-itip-formatter.error.xml
-
-
-include $(top_srcdir)/git.mk
diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am
index 1ff323baae..1a7e81ebac 100644
--- a/plugins/mail-notification/Makefile.am
+++ b/plugins/mail-notification/Makefile.am
@@ -31,8 +31,8 @@ liborg_gnome_mail_notification_la_LIBADD = \
$(LIBNOTIFY_LIBS) \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/mail/libevolution-mail.la \
- $(top_builddir)/shell/libeshell.la \
- $(EVOLUTION_MAIL_LIBS) \
+ $(top_builddir)/shell/libeshell.la \
+ $(EVOLUTION_MAIL_LIBS) \
$(GNOME_PLATFORM_LIBS)
schemadir = $(GCONF_SCHEMA_FILE_DIR)
diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am
index 9f2a142c15..481390ced0 100644
--- a/plugins/mail-to-task/Makefile.am
+++ b/plugins/mail-to-task/Makefile.am
@@ -24,9 +24,9 @@ liborg_gnome_mail_to_task_la_LIBADD = \
$(top_builddir)/calendar/common/libevolution-calendarprivate.la \
$(top_builddir)/mail/libevolution-mail.la \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
- $(GNOME_PLATFORM_LIBS) \
$(EVOLUTION_CALENDAR_LIBS) \
- $(EVOLUTION_MAIL_LIBS)
+ $(EVOLUTION_MAIL_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
EXTRA_DIST = org-gnome-mail-to-task.eplug.xml
diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am
index 68fcb26259..c429a5ca84 100644
--- a/plugins/mailing-list-actions/Makefile.am
+++ b/plugins/mailing-list-actions/Makefile.am
@@ -20,8 +20,8 @@ liborg_gnome_mailing_list_actions_la_LIBADD = \
$(top_builddir)/composer/libcomposer.la \
$(top_builddir)/mail/libevolution-mail.la \
$(top_builddir)/shell/libeshell.la \
- $(GNOME_PLATFORM_LIBS) \
- $(EVOLUTION_MAIL_LIBS)
+ $(EVOLUTION_MAIL_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
error_DATA = org-gnome-mailing-list-actions.error
errordir = $(privdatadir)/errors
diff --git a/plugins/mark-all-read/Makefile.am b/plugins/mark-all-read/Makefile.am
index bbbfae7d3b..f868aa0bdb 100644
--- a/plugins/mark-all-read/Makefile.am
+++ b/plugins/mark-all-read/Makefile.am
@@ -8,6 +8,7 @@ liborg_gnome_mark_all_read_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
+ $(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_MAIL_CFLAGS)
liborg_gnome_mark_all_read_la_SOURCES = mark-all-read.c
@@ -18,7 +19,8 @@ liborg_gnome_mark_all_read_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/mail/libevolution-mail.la \
$(top_builddir)/shell/libeshell.la \
- $(EVOLUTION_MAIL_LIBS)
+ $(EVOLUTION_MAIL_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
EXTRA_DIST = org-gnome-mark-all-read.eplug.xml
diff --git a/plugins/plugin-manager/Makefile.am b/plugins/plugin-manager/Makefile.am
index 2966642c77..ec28d0bcdd 100644
--- a/plugins/plugin-manager/Makefile.am
+++ b/plugins/plugin-manager/Makefile.am
@@ -8,6 +8,7 @@ liborg_gnome_plugin_manager_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
+ $(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_MAIL_CFLAGS)
liborg_gnome_plugin_manager_la_SOURCES = plugin-manager.c
@@ -17,7 +18,8 @@ liborg_gnome_plugin_manager_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
liborg_gnome_plugin_manager_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/shell/libeshell.la \
- $(EVOLUTION_MAIL_LIBS)
+ $(EVOLUTION_MAIL_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
EXTRA_DIST = \
org-gnome-plugin-manager.eplug.xml
diff --git a/plugins/prefer-plain/Makefile.am b/plugins/prefer-plain/Makefile.am
index 61222e990e..b747c55a69 100644
--- a/plugins/prefer-plain/Makefile.am
+++ b/plugins/prefer-plain/Makefile.am
@@ -7,6 +7,7 @@ plugin_LTLIBRARIES = liborg-gnome-prefer-plain.la
liborg_gnome_prefer_plain_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir) \
+ $(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_MAIL_CFLAGS)
liborg_gnome_prefer_plain_la_SOURCES = prefer-plain.c
@@ -16,7 +17,8 @@ liborg_gnome_prefer_plain_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
liborg_gnome_prefer_plain_la_LIBADD = \
$(top_builddir)/mail/libevolution-mail.la \
$(top_builddir)/em-format/libemformat.la \
- $(EVOLUTION_MAIL_LIBS)
+ $(EVOLUTION_MAIL_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
EXTRA_DIST = org-gnome-prefer-plain.eplug.xml
diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am
index 57ee130703..68c8a19264 100644
--- a/plugins/pst-import/Makefile.am
+++ b/plugins/pst-import/Makefile.am
@@ -31,9 +31,10 @@ liborg_gnome_pst_import_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
liborg_gnome_pst_import_la_LIBADD = \
$(top_builddir)/mail/libevolution-mail.la \
$(top_builddir)/e-util/libeutil.la \
- $(GNOME_PLATFORM_LIBS) \
+ $(CAMEL_LIBS) \
$(EVOLUTION_CALENDAR_LIBS) \
$(EVOLUTION_MAIL_LIBS) \
+ $(GNOME_PLATFORM_LIBS) \
$(LIBPST_LIBS)
EXTRA_DIST = org-gnome-pst-import.eplug.xml
diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am
index 60d5e125b5..94c29f11b5 100644
--- a/plugins/publish-calendar/Makefile.am
+++ b/plugins/publish-calendar/Makefile.am
@@ -13,6 +13,8 @@ liborg_gnome_publish_calendar_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
-I$(top_builddir)/shell \
+ $(GNOME_PLATFORM_CFLAGS) \
+ $(E_UTIL_CFLAGS) \
$(EVOLUTION_CALENDAR_CFLAGS) \
-DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" \
-DEVOLUTION_UIDIR=\""$(uidir)"\"
@@ -34,7 +36,9 @@ liborg_gnome_publish_calendar_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/shell/libeshell.la \
$(top_builddir)/calendar/gui/libevolution-calendar.la \
- $(EVOLUTION_CALENDAR_LIBS)
+ $(E_UTIL_LIBS) \
+ $(EVOLUTION_CALENDAR_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
EXTRA_DIST = \
org-gnome-publish-calendar.eplug.xml \
diff --git a/plugins/sa-junk-plugin/Makefile.am b/plugins/sa-junk-plugin/Makefile.am
index 42ea8a8218..34e0f82566 100644
--- a/plugins/sa-junk-plugin/Makefile.am
+++ b/plugins/sa-junk-plugin/Makefile.am
@@ -18,8 +18,8 @@ liborg_gnome_sa_junk_plugin_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
liborg_gnome_sa_junk_plugin_la_LIBADD = \
$(top_builddir)/mail/libevolution-mail.la \
$(top_builddir)/e-util/libeutil.la \
- $(GNOME_PLATFORM_LIBS) \
- $(EVOLUTION_MAIL_LIBS)
+ $(EVOLUTION_MAIL_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
BUILT_SOURCES = $(plugin_DATA) $(error_DATA)
diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am
index 0e95ec6fde..a4b7a4ef1c 100644
--- a/plugins/save-calendar/Makefile.am
+++ b/plugins/save-calendar/Makefile.am
@@ -8,6 +8,7 @@ liborg_gnome_save_calendar_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
+ $(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_CALENDAR_CFLAGS)
liborg_gnome_save_calendar_la_SOURCES = \
@@ -21,7 +22,8 @@ liborg_gnome_save_calendar_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
liborg_gnome_save_calendar_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/shell/libeshell.la \
- $(EVOLUTION_CALENDAR_LIBS)
+ $(EVOLUTION_CALENDAR_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
EXTRA_DIST = org-gnome-save-calendar.eplug.xml
diff --git a/plugins/startup-wizard/Makefile.am b/plugins/startup-wizard/Makefile.am
index 375b46de62..4c0ced17f5 100644
--- a/plugins/startup-wizard/Makefile.am
+++ b/plugins/startup-wizard/Makefile.am
@@ -10,6 +10,7 @@ liborg_gnome_evolution_startup_wizard_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
-I$(top_builddir)/shell \
+ $(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_CALENDAR_CFLAGS) \
$(EVOLUTION_MAIL_CFLAGS)
@@ -24,7 +25,8 @@ liborg_gnome_evolution_startup_wizard_la_LIBADD = \
$(top_builddir)/calendar/gui/libevolution-calendar.la \
$(top_builddir)/mail/libevolution-mail.la \
$(EVOLUTION_CALENDAR_LIBS) \
- $(EVOLUTION_MAIL_LIBS)
+ $(EVOLUTION_MAIL_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
liborg_gnome_evolution_startup_wizard_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
diff --git a/plugins/subject-thread/Makefile.am b/plugins/subject-thread/Makefile.am
index a5686b6dc8..c03d4040ed 100644
--- a/plugins/subject-thread/Makefile.am
+++ b/plugins/subject-thread/Makefile.am
@@ -7,11 +7,14 @@ plugin_DATA = org-gnome-subject-thread.eplug
liborg_gnome_subject_thread_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir) \
+ $(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_MAIL_CFLAGS)
liborg_gnome_subject_thread_la_SOURCES = subject-thread.c
liborg_gnome_subject_thread_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
-liborg_gnome_subject_thread_la_LIBADD = \
+
+liborg_gnome_subject_thread_la_LIBADD = \
+ $(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_MAIL_LIBS)
EXTRA_DIST = org-gnome-subject-thread.eplug.xml
diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am
index 9a4c8ed5c0..c694ac89ba 100644
--- a/plugins/templates/Makefile.am
+++ b/plugins/templates/Makefile.am
@@ -24,8 +24,8 @@ liborg_gnome_templates_la_LIBADD = \
$(top_builddir)/composer/libcomposer.la \
$(top_builddir)/shell/libeshell.la \
$(top_builddir)/mail/libevolution-mail.la \
- $(GNOME_PLATFORM_LIBS) \
- $(EVOLUTION_MAIL_LIBS)
+ $(EVOLUTION_MAIL_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_in_files = apps-evolution-template-placeholders.schemas.in
diff --git a/plugins/tnef-attachments/Makefile.am b/plugins/tnef-attachments/Makefile.am
index b503b9f0c0..4cc8a30573 100644
--- a/plugins/tnef-attachments/Makefile.am
+++ b/plugins/tnef-attachments/Makefile.am
@@ -29,8 +29,8 @@ liborg_gnome_tnef_attachments_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINE
liborg_gnome_tnef_attachments_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/em-format/libemformat.la \
- $(GNOME_PLATFORM_LIBS) \
$(EVOLUTION_MAIL_LIBS) \
+ $(GNOME_PLATFORM_LIBS) \
-lytnef
EXTRA_DIST = org-gnome-tnef-attachments.eplug.xml
diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am
index ead97d798c..f595145418 100644
--- a/plugins/vcard-inline/Makefile.am
+++ b/plugins/vcard-inline/Makefile.am
@@ -15,6 +15,7 @@ liborg_gnome_vcard_inline_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
+ $(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
$(EVOLUTION_MAIL_CFLAGS)
@@ -28,8 +29,9 @@ liborg_gnome_vcard_inline_la_LIBADD = \
$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \
$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \
$(top_builddir)/addressbook/printing/libecontactprint.la \
- $(EVOLUTION_ADDRESSBOOK_LIBS) \
- $(EVOLUTION_MAIL_LIBS)
+ $(EVOLUTION_ADDRESSBOOK_LIBS) \
+ $(EVOLUTION_MAIL_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
EXTRA_DIST = org-gnome-vcard-inline.eplug.xml
diff --git a/plugins/webdav-account-setup/Makefile.am b/plugins/webdav-account-setup/Makefile.am
index bc281a732d..f1096df75f 100644
--- a/plugins/webdav-account-setup/Makefile.am
+++ b/plugins/webdav-account-setup/Makefile.am
@@ -8,14 +8,16 @@ liborg_gnome_evolution_webdav_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I . \
-I$(top_srcdir) \
+ $(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
liborg_gnome_evolution_webdav_la_SOURCES = \
webdav-contacts-source.c
-liborg_gnome_evolution_webdav_la_LIBADD = \
- $(EPLUGIN_LIBS) \
- $(EVOLUTION_ADDRESSBOOK_LIBS)
+liborg_gnome_evolution_webdav_la_LIBADD = \
+ $(EPLUGIN_LIBS) \
+ $(EVOLUTION_ADDRESSBOOK_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
liborg_gnome_evolution_webdav_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)