Bug 596848 - Use per-target CPPFLAGS in automake files

38 files changed, 371 insertions, 271 deletions

diff --git a/plugins/addressbook-file/Makefile.am b/plugins/addressbook-file/Makefile.am
index 013e453635..6eb00096b6 100644
--- a/plugins/addressbook-file/Makefile.am
+++ b/plugins/addressbook-file/Makefile.am
@@ -1,18 +1,19 @@
-AM_CPPFLAGS =					\
-	-I$(top_srcdir)				\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)		
-
-
 @EVO_PLUGIN_RULE@
 
 plugin_DATA = org-gnome-addressbook-file.eplug
+
 plugin_LTLIBRARIES = liborg-gnome-addressbook-file.la
 
+liborg_gnome_addressbook_file_la_CPPFLAGS =	\
+	$(AM_CPPFLAGS)				\
+	-I$(top_srcdir)				\
+	$(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)
 
 EXTRA_DIST = org-gnome-addressbook-file.eplug.xml
 
diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am
index 94e433795f..1db3b79dad 100644
--- a/plugins/attachment-reminder/Makefile.am
+++ b/plugins/attachment-reminder/Makefile.am
@@ -1,16 +1,6 @@
-AM_CPPFLAGS =						\
-	-I$(top_builddir)/composer			\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/widgets				\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
-	-DEVOLUTION_PLUGINDIR="\"$(plugindir)\""
-
 @EVO_PLUGIN_RULE@
 
-error_DATA = 					\
-	org-gnome-attachment-reminder.error	
-
+error_DATA = org-gnome-attachment-reminder.error
 
 errordir = $(privdatadir)/errors
 
@@ -20,8 +10,19 @@ plugin_DATA = 						\
 
 plugin_LTLIBRARIES = liborg-gnome-evolution-attachment-reminder.la
 
+liborg_gnome_evolution_attachment_reminder_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)					\
+	-I$(top_builddir)/composer			\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/widgets				\
+	$(GNOME_PLATFORM_CFLAGS)			\
+	$(EVOLUTION_MAIL_CFLAGS)			\
+	-DEVOLUTION_PLUGINDIR="\"$(plugindir)\""
+
 liborg_gnome_evolution_attachment_reminder_la_SOURCES = attachment-reminder.c 
+
 liborg_gnome_evolution_attachment_reminder_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
 liborg_gnome_evolution_attachment_reminder_la_LIBADD =	\
 	$(top_builddir)/composer/libcomposer.la		\
 	$(top_builddir)/shell/libeshell.la		\
diff --git a/plugins/audio-inline/Makefile.am b/plugins/audio-inline/Makefile.am
index 67cb05558a..c68e46d4f8 100644
--- a/plugins/audio-inline/Makefile.am
+++ b/plugins/audio-inline/Makefile.am
@@ -5,18 +5,22 @@ NO_UNDEFINED_REQUIRED_LIBS =				\
 	$(GNOME_PLATFORM_LIBS)
 endif
 
-AM_CPPFLAGS =						\
-	-I$(top_srcdir)					\
-	$(EVOLUTION_MAIL_CFLAGS)			\
-	$(GSTREAMER_CFLAGS)
-
 @EVO_PLUGIN_RULE@
 
 plugin_DATA = org-gnome-audio-inline.eplug
+
 plugin_LTLIBRARIES = liborg-gnome-audio-inline.la
 
+liborg_gnome_audio_inline_la_CPPFLAGS =			\
+	$(AM_CPPFLAGS)					\
+	-I$(top_srcdir)					\
+	$(EVOLUTION_MAIL_CFLAGS)			\
+	$(GSTREAMER_CFLAGS)
+
 liborg_gnome_audio_inline_la_SOURCES = audio-inline.c
+
 liborg_gnome_audio_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
 liborg_gnome_audio_inline_la_LIBADD =			\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/e-util/libeutil.la		\
diff --git a/plugins/backup-restore/Makefile.am b/plugins/backup-restore/Makefile.am
index b848d3c51b..9ffb2e340e 100644
--- a/plugins/backup-restore/Makefile.am
+++ b/plugins/backup-restore/Makefile.am
@@ -1,4 +1,13 @@
-AM_CPPFLAGS =						\
+@EVO_PLUGIN_RULE@
+
+error_DATA = org-gnome-backup-restore.error
+errordir = $(privdatadir)/errors
+
+plugin_DATA = org-gnome-backup-restore.eplug
+plugin_LTLIBRARIES = liborg-gnome-backup-restore.la
+
+liborg_gnome_backup_restore_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
@@ -9,15 +18,7 @@ AM_CPPFLAGS =						\
 	-DLIBDIR=\""$(libdir)"\"			\
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
 	$(SHELL_CFLAGS)					\
-	$(E_UTIL_CFLAGS)				
-
-@EVO_PLUGIN_RULE@
-
-error_DATA = org-gnome-backup-restore.error
-errordir = $(privdatadir)/errors
-
-plugin_DATA = org-gnome-backup-restore.eplug
-plugin_LTLIBRARIES = liborg-gnome-backup-restore.la
+	$(E_UTIL_CFLAGS)
 
 liborg_gnome_backup_restore_la_SOURCES = backup-restore.c
 liborg_gnome_backup_restore_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
@@ -28,6 +29,20 @@ liborg_gnome_backup_restore_la_LIBADD =		\
 
 privlibexec_PROGRAMS = evolution-backup
 evolution_backup_SOURCES = backup.c
+evolution_backup_CPPFLAGS =				\
+	$(AM_CPPFLAGS)					\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/widgets				\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
+	-DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\"	\
+	-DPREFIX=\""$(prefix)"\"			\
+	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
+	-DDATADIR=\""$(datadir)"\"			\
+	-DLIBDIR=\""$(libdir)"\"			\
+	$(EVOLUTION_CALENDAR_CFLAGS)			\
+	$(SHELL_CFLAGS)					\
+	$(E_UTIL_CFLAGS)
+
 evolution_backup_LDADD =			\
 	$(SHELL_LIBS)				\
 	$(top_builddir)/e-util/libeutil.la
@@ -36,13 +51,13 @@ if OS_WIN32
 evolution_backup_LDFLAGS = -mwindows
 endif
 
-
 EXTRA_DIST = 					\
 	org-gnome-backup-restore.eplug.xml	\
 	org-gnome-backup-restore.error.xml
 
 BUILT_SOURCES = org-gnome-backup-restore.eplug \
 		org-gnome-backup-restore.error
+
 CLEANFILES = $(BUILT_SOURCES)
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am
index 0a44dc0c26..4f1d9066cf 100644
--- a/plugins/bbdb/Makefile.am
+++ b/plugins/bbdb/Makefile.am
@@ -5,20 +5,24 @@ NO_UNDEFINED_REQUIRED_LIBS =				\
 	$(GNOME_PLATFORM_LIBS)
 endif
 
-AM_CPPFLAGS =						\
+@EVO_PLUGIN_RULE@
+
+plugin_DATA = org-gnome-evolution-bbdb.eplug
+
+plugin_LTLIBRARIES = liborg-gnome-evolution-bbdb.la
+
+liborg_gnome_evolution_bbdb_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)					\
 	-I$(top_builddir)/composer			\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
-@EVO_PLUGIN_RULE@
-
-plugin_DATA = org-gnome-evolution-bbdb.eplug
-plugin_LTLIBRARIES = liborg-gnome-evolution-bbdb.la
-
 liborg_gnome_evolution_bbdb_la_SOURCES = bbdb.c bbdb.h gaimbuddies.c
+
 liborg_gnome_evolution_bbdb_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
 liborg_gnome_evolution_bbdb_la_LIBADD =		\
 	$(top_builddir)/e-util/libeutil.la	\
 	$(top_builddir)/composer/libcomposer.la	\
diff --git a/plugins/bogo-junk-plugin/Makefile.am b/plugins/bogo-junk-plugin/Makefile.am
index 00453ef090..863fa4ad87 100644
--- a/plugins/bogo-junk-plugin/Makefile.am
+++ b/plugins/bogo-junk-plugin/Makefile.am
@@ -1,15 +1,19 @@
-AM_CPPFLAGS =						\
-	-I$(top_srcdir)					\
-	-DWELCOME_MESSAGE=\""$(privdatadir)/default/C/mail/local/Inbox"\" 	\
-	$(EVOLUTION_MAIL_CFLAGS)
-
 @EVO_PLUGIN_RULE@
 
 plugin_DATA = org-gnome-bogo-junk-plugin.eplug
+
 plugin_LTLIBRARIES = liborg-gnome-bogo-junk-plugin.la
 
+liborg_gnome_bogo_junk_plugin_la_CPPFLAGS =					\
+	$(AM_CPPFLAGS)								\
+	-I$(top_srcdir)								\
+	-DWELCOME_MESSAGE=\""$(privdatadir)/default/C/mail/local/Inbox"\" 	\
+	$(EVOLUTION_MAIL_CFLAGS)
+
 liborg_gnome_bogo_junk_plugin_la_SOURCES = bf-junk-filter.c
+
 liborg_gnome_bogo_junk_plugin_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
 liborg_gnome_bogo_junk_plugin_la_LIBADD =	\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/e-util/libeutil.la		\
diff --git a/plugins/caldav/Makefile.am b/plugins/caldav/Makefile.am
index 243338e243..7ab5a141b4 100644
--- a/plugins/caldav/Makefile.am
+++ b/plugins/caldav/Makefile.am
@@ -1,16 +1,16 @@
-AM_CPPFLAGS = 						\
-	-I .						\
-	-I$(top_srcdir)	                                \
-	-DCALDAV_GLADEDIR=\""$(gladedir)"\"		\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
 @EVO_PLUGIN_RULE@
 
 plugin_DATA = org-gnome-evolution-caldav.eplug
 plugin_LTLIBRARIES = liborg-gnome-evolution-caldav.la
 
-liborg_gnome_evolution_caldav_la_SOURCES =        \
-	caldav-source.c
+liborg_gnome_evolution_caldav_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)					\
+	-I .						\
+	-I$(top_srcdir)	                                \
+	-DCALDAV_GLADEDIR=\""$(gladedir)"\"		\
+	$(EVOLUTION_CALENDAR_CFLAGS)
+
+liborg_gnome_evolution_caldav_la_SOURCES = caldav-source.c
 
 liborg_gnome_evolution_caldav_la_LIBADD = 	\
 	$(EVOLUTION_CALENDAR_LIBS)		\
diff --git a/plugins/calendar-file/Makefile.am b/plugins/calendar-file/Makefile.am
index aadb4b5927..bbf8b7dfef 100644
--- a/plugins/calendar-file/Makefile.am
+++ b/plugins/calendar-file/Makefile.am
@@ -1,16 +1,19 @@
-AM_CPPFLAGS =					\
-	-I$(top_srcdir)				\
-	$(EVOLUTION_CALENDAR_CFLAGS)		\
-	$(SOURCE_SEL_CFLAGS)
-
 @EVO_PLUGIN_RULE@
 
 plugin_DATA = org-gnome-calendar-file.eplug
+
 plugin_LTLIBRARIES = liborg-gnome-calendar-file.la
 
+liborg_gnome_calendar_file_la_CPPFLAGS =	\
+	$(AM_CPPFLAGS)				\
+	-I$(top_srcdir)				\
+	$(EVOLUTION_CALENDAR_CFLAGS)		\
+	$(SOURCE_SEL_CFLAGS)
 
 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)
 
diff --git a/plugins/calendar-http/Makefile.am b/plugins/calendar-http/Makefile.am
index 89c17be4af..cf432dd451 100644
--- a/plugins/calendar-http/Makefile.am
+++ b/plugins/calendar-http/Makefile.am
@@ -1,18 +1,20 @@
-AM_CPPFLAGS =					\
-	-I$(top_srcdir)				\
-	$(EVOLUTION_CALENDAR_CFLAGS)		\
-	$(SOURCE_SEL_CFLAGS)
-
 @EVO_PLUGIN_RULE@
 
 plugin_DATA = org-gnome-calendar-http.eplug
+
 plugin_LTLIBRARIES = liborg-gnome-calendar-http.la
 
+liborg_gnome_calendar_http_la_CPPFLAGS =	\
+	$(AM_CPPFLAGS)				\
+	-I$(top_srcdir)				\
+	$(EVOLUTION_CALENDAR_CFLAGS)		\
+	$(SOURCE_SEL_CFLAGS)
 
 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)
 
 EXTRA_DIST = org-gnome-calendar-http.eplug.xml
 
diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am
index 3da4088692..d2801a6395 100644
--- a/plugins/calendar-weather/Makefile.am
+++ b/plugins/calendar-weather/Makefile.am
@@ -1,6 +1,12 @@
 eds_datadir = `pkg-config --variable=privdatadir evolution-data-server-1.2`
 
-AM_CPPFLAGS =							\
+@EVO_PLUGIN_RULE@
+
+plugin_DATA = org-gnome-calendar-weather.eplug
+plugin_LTLIBRARIES = liborg-gnome-calendar-weather.la
+
+liborg_gnome_calendar_weather_la_CPPFLAGS =			\
+	$(AM_CPPFLAGS)						\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/widgets					\
 	$(EVOLUTION_CALENDAR_CFLAGS)				\
@@ -9,11 +15,6 @@ AM_CPPFLAGS =							\
 	-DWEATHER_EDS_DATADIR=\""$(eds_datadir)/weather"\"	\
 	$(LIBGWEATHER_CFLAGS)
 
-@EVO_PLUGIN_RULE@
-
-plugin_DATA = org-gnome-calendar-weather.eplug
-plugin_LTLIBRARIES = liborg-gnome-calendar-weather.la
-
 liborg_gnome_calendar_weather_la_SOURCES = calendar-weather.c
 liborg_gnome_calendar_weather_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_calendar_weather_la_LIBADD =			\
diff --git a/plugins/default-mailer/Makefile.am b/plugins/default-mailer/Makefile.am
index db71407dac..50dd13ebd3 100644
--- a/plugins/default-mailer/Makefile.am
+++ b/plugins/default-mailer/Makefile.am
@@ -1,17 +1,19 @@
-AM_CPPFLAGS =						\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/widgets				\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)
-
 @EVO_PLUGIN_RULE@
 
 error_DATA = org-gnome-default-mailer.error
 errordir = $(privdatadir)/errors
 
 plugin_DATA        = org-gnome-default-mailer.eplug 
+
 plugin_LTLIBRARIES = liborg-gnome-default-mailer.la
 
+liborg_gnome_default_mailer_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)					\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/widgets				\
+	$(GNOME_PLATFORM_CFLAGS)			\
+	$(EVOLUTION_MAIL_CFLAGS)
+
 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 =	\
diff --git a/plugins/default-source/Makefile.am b/plugins/default-source/Makefile.am
index dda1edfa9a..3339f1e406 100644
--- a/plugins/default-source/Makefile.am
+++ b/plugins/default-source/Makefile.am
@@ -1,22 +1,24 @@
-AM_CPPFLAGS =					\
-	-I$(top_srcdir)				\
-	$(EVOLUTION_CALENDAR_CFLAGS)		\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)          \
-	$(SOURCE_SEL_CFLAGS)
-
 @EVO_PLUGIN_RULE@
 
 plugin_DATA = org-gnome-default-source.eplug
+
 plugin_LTLIBRARIES = liborg-gnome-default-source.la
 
+liborg_gnome_default_source_la_CPPFLAGS =	\
+	$(AM_CPPFLAGS)				\
+	-I$(top_srcdir)				\
+	$(EVOLUTION_CALENDAR_CFLAGS)		\
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)         \
+	$(SOURCE_SEL_CFLAGS)
 
 liborg_gnome_default_source_la_SOURCES = default-source.c
+
 liborg_gnome_default_source_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
 liborg_gnome_default_source_la_LIBADD =		\
 	$(EVOLUTION_CALENDAR_LIBS)		\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
-
 EXTRA_DIST = org-gnome-default-source.eplug.xml
 
 BUILT_SOURCES = $(plugin_DATA)
diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am
index 95d1a974b8..9e827eba8a 100644
--- a/plugins/email-custom-header/Makefile.am
+++ b/plugins/email-custom-header/Makefile.am
@@ -1,4 +1,12 @@
-AM_CPPFLAGS = -I. 						\
+@EVO_PLUGIN_RULE@
+
+plugin_DATA = org-gnome-email-custom-header.eplug
+
+plugin_LTLIBRARIES = liborg-gnome-email-custom-header.la
+
+liborg_gnome_email_custom_header_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)					\
+	-I.	 					\
 	-I$(top_srcdir)	                                \
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/widgets/misc			\
@@ -9,17 +17,10 @@ AM_CPPFLAGS = -I. 						\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"          \
 	-DCONNECTOR_GLADEDIR=\""$(gladedir)"\"
 
-
-@EVO_PLUGIN_RULE@
-
-plugin_DATA =	\
-	org-gnome-email-custom-header.eplug
-
-plugin_LTLIBRARIES = liborg-gnome-email-custom-header.la
-
 liborg_gnome_email_custom_header_la_SOURCES = 		\
-	email-custom-header.c					\
+	email-custom-header.c				\
 	email-custom-header.h										
+
 liborg_gnome_email_custom_header_la_LIBADD = 			\
 	$(top_builddir)/e-util/libeutil.la 			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
diff --git a/plugins/exchange-operations/Makefile.am b/plugins/exchange-operations/Makefile.am
index 1e7cdd1deb..29149610f4 100644
--- a/plugins/exchange-operations/Makefile.am
+++ b/plugins/exchange-operations/Makefile.am
@@ -1,19 +1,20 @@
-AM_CPPFLAGS = -I .						\
-	-I$(top_srcdir)	                                \
-	-I$(top_srcdir)/widgets				\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_builddir)/composer			\
-	-I$(top_builddir)/mail				\
-	$(CAMEL_EXCHANGE_CFLAGS)                        \
-	$(EVOLUTION_MAIL_CFLAGS)
-
-
 @EVO_PLUGIN_RULE@
 
 plugin_DATA = org-gnome-exchange-operations.eplug
 
 plugin_LTLIBRARIES = liborg-gnome-exchange-operations.la
 
+liborg_gnome_exchange_operations_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)					\
+	-I .						\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/widgets				\
+	-I$(top_srcdir)/calendar			\
+	-I$(top_builddir)/composer			\
+	-I$(top_builddir)/mail				\
+	$(CAMEL_EXCHANGE_CFLAGS)			\
+	$(EVOLUTION_MAIL_CFLAGS)
+
 liborg_gnome_exchange_operations_la_SOURCES = 		\
 	exchange-operations.c				\
 	exchange-operations.h				\
diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am
index 8c47bca60c..4e41c01cbf 100644
--- a/plugins/external-editor/Makefile.am
+++ b/plugins/external-editor/Makefile.am
@@ -6,7 +6,19 @@ NO_UNDEFINED_REQUIRED_LIBS = \
 	$(top_builddir)/mail/libevolution-mail.la
 endif
 
-AM_CPPFLAGS =						\
+@EVO_PLUGIN_RULE@
+
+error_DATA = org-gnome-external-editor.error
+
+errordir = $(privdatadir)/errors
+
+plugin_DATA = 						\
+	org-gnome-external-editor.eplug
+
+plugin_LTLIBRARIES = liborg-gnome-external-editor.la
+
+liborg_gnome_external_editor_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)					\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\"	\
 	-DPREFIX=\""$(prefix)"\"			\
@@ -20,16 +32,6 @@ AM_CPPFLAGS =						\
 	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(E_UTIL_CFLAGS)				
 
-@EVO_PLUGIN_RULE@
-
-error_DATA = org-gnome-external-editor.error
-errordir = $(privdatadir)/errors
-
-plugin_DATA = 						\
-	org-gnome-external-editor.eplug
-
-plugin_LTLIBRARIES = liborg-gnome-external-editor.la
-
 liborg_gnome_external_editor_la_SOURCES = 		\
 	external-editor.c
 
diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am
index 07cbb8199d..2d307f85c7 100644
--- a/plugins/face/Makefile.am
+++ b/plugins/face/Makefile.am
@@ -1,23 +1,23 @@
-AM_CPPFLAGS = -I. 						\
-	-I$(top_srcdir)	                                \
+@EVO_PLUGIN_RULE@
+
+plugin_DATA = org-gnome-face.eplug
+
+plugin_LTLIBRARIES = liborg-gnome-face.la
+
+liborg_gnome_face_la_CPPFLAGS =				\
+	$(AM_CPPFLAGS)					\
+	-I. 						\
+	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/widgets/misc			\
-	-I$(top_builddir)/mail                          \
+	-I$(top_builddir)/mail				\
 	-I$(top_builddir)/composer			\
 	$(EVOLUTION_MAIL_CFLAGS)			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"          \
+	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	-DCONNECTOR_GLADEDIR=\""$(gladedir)"\"
 
+liborg_gnome_face_la_SOURCES = face.c
 
-@EVO_PLUGIN_RULE@
-
-plugin_DATA =	\
-	org-gnome-face.eplug
-
-plugin_LTLIBRARIES = liborg-gnome-face.la
-
-liborg_gnome_face_la_SOURCES = 		\
-	face.c
 liborg_gnome_face_la_LIBADD = 			\
 	$(top_builddir)/e-util/libeutil.la 			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
@@ -26,8 +26,7 @@ liborg_gnome_face_la_LIBADD = 			\
 
 liborg_gnome_face_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
-error_DATA = 					\
-	org-gnome-face.error
+error_DATA = org-gnome-face.error
 
 errordir = $(privdatadir)/errors
 
diff --git a/plugins/google-account-setup/Makefile.am b/plugins/google-account-setup/Makefile.am
index 3434dbb331..731072443f 100644
--- a/plugins/google-account-setup/Makefile.am
+++ b/plugins/google-account-setup/Makefile.am
@@ -1,4 +1,11 @@
-AM_CPPFLAGS = 						\
+@EVO_PLUGIN_RULE@
+
+plugin_DATA = org-gnome-evolution-google.eplug
+
+plugin_LTLIBRARIES = liborg-gnome-evolution-google.la
+
+liborg_gnome_evolution_google_la_CPPFLAGS = 		\
+	$(AM_CPPFLAGS)					\
 	-I .						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
@@ -6,11 +13,6 @@ AM_CPPFLAGS = 						\
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
-@EVO_PLUGIN_RULE@
-
-plugin_DATA = org-gnome-evolution-google.eplug
-plugin_LTLIBRARIES = liborg-gnome-evolution-google.la
-
 liborg_gnome_evolution_google_la_SOURCES =        \
 	google-source.c \
 	google-contacts-source.h \
diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am
index 1b3a5eb73a..52e33fe5ef 100644
--- a/plugins/groupwise-features/Makefile.am
+++ b/plugins/groupwise-features/Makefile.am
@@ -2,7 +2,14 @@ if OS_WIN32
 NO_UNDEFINED_REQUIRED_LIBS = $(top_builddir)/mail/libevolution-mail.la
 endif
 
-AM_CPPFLAGS =						\
+@EVO_PLUGIN_RULE@
+
+plugin_DATA = org-gnome-groupwise-features.eplug org-gnome-compose-send-options.xml
+
+plugin_LTLIBRARIES = liborg-gnome-groupwise-features.la
+
+liborg_gnome_groupwise_features_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/widgets/misc			\
@@ -16,11 +23,6 @@ AM_CPPFLAGS =						\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	
 
-@EVO_PLUGIN_RULE@
-
-plugin_DATA = org-gnome-groupwise-features.eplug org-gnome-compose-send-options.xml
-plugin_LTLIBRARIES = liborg-gnome-groupwise-features.la
-
 liborg_gnome_groupwise_features_la_SOURCES = 	\
 		gw-ui.h	     			\
 		gw-ui.c	     			\
diff --git a/plugins/hula-account-setup/Makefile.am b/plugins/hula-account-setup/Makefile.am
index e0d89ce407..551b92cb42 100644
--- a/plugins/hula-account-setup/Makefile.am
+++ b/plugins/hula-account-setup/Makefile.am
@@ -1,14 +1,16 @@
-AM_CPPFLAGS =						\
-	-I$(top_srcdir)					\
-	$(EVOLUTION_MAIL_CFLAGS)			\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
-
 @EVO_PLUGIN_RULE@
 
 plugin_DATA =  org-gnome-evolution-hula-account-setup.eplug
+
 plugin_LTLIBRARIES = liborg-gnome-evolution-hula-account-setup.la 
 
+liborg_gnome_evolution_hula_account_setup_la_CPPFLAGS =	\
+	$(AM_CPPFLAGS)					\
+	-I$(top_srcdir)					\
+	$(EVOLUTION_MAIL_CFLAGS)			\
+	$(EVOLUTION_CALENDAR_CFLAGS)			\
+	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
+
 liborg_gnome_evolution_hula_account_setup_la_SOURCES = \
 			camel-hula-listener.c	\
 			camel-hula-listener.h	\
diff --git a/plugins/imap-features/Makefile.am b/plugins/imap-features/Makefile.am
index d21841f7c7..09edf33303 100644
--- a/plugins/imap-features/Makefile.am
+++ b/plugins/imap-features/Makefile.am
@@ -2,32 +2,31 @@ if OS_WIN32
 NO_UNDEFINED_REQUIRED_LIBS = $(top_builddir)/mail/libevolution-mail.la
 endif
 
-AM_CPPFLAGS =						\
+@EVO_PLUGIN_RULE@
+
+plugin_DATA = org-gnome-imap-features.eplug
+
+plugin_LTLIBRARIES = liborg-gnome-imap-features.la
+
+liborg_gnome_imap_features_la_CPPFLAGS = 		\
+	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/mail				\
 	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(CAMEL_IMAP_CFLAGS)				\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	
+	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"
 
-@EVO_PLUGIN_RULE@
-
-plugin_DATA = org-gnome-imap-features.eplug 
-plugin_LTLIBRARIES = liborg-gnome-imap-features.la
-
-liborg_gnome_imap_features_la_SOURCES = 	\
-	imap-headers.c	
+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)
 
-
 liborg_gnome_imap_features_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
-glade_DATA =			\
-	imap-headers.glade 
+glade_DATA = imap-headers.glade
 
 errordir = $(privdatadir)/errors
 
@@ -35,7 +34,7 @@ BUILT_SOURCES = org-gnome-imap-features.eplug $(error_i18n)
 
 EXTRA_DIST =						\
 	$(glade_DATA) 					\
-	org-gnome-imap-features.eplug.xml		
+	org-gnome-imap-features.eplug.xml
 
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/plugins/itip-formatter/Makefile.am b/plugins/itip-formatter/Makefile.am
index c5d7fd63b6..9cab29a4a0 100644
--- a/plugins/itip-formatter/Makefile.am
+++ b/plugins/itip-formatter/Makefile.am
@@ -1,17 +1,20 @@
-AM_CPPFLAGS =						\
+@EVO_PLUGIN_RULE@
+
+plugin_DATA = org-gnome-itip-formatter.eplug
+plugin_LTLIBRARIES = liborg-gnome-itip-formatter.la
+
+liborg_gnome_itip_formatter_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	$(GNOME_PLATFORM_CFLAGS)			\
 	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
-@EVO_PLUGIN_RULE@
-
-plugin_DATA = org-gnome-itip-formatter.eplug
-plugin_LTLIBRARIES = liborg-gnome-itip-formatter.la
-
 liborg_gnome_itip_formatter_la_SOURCES = itip-formatter.c itip-view.c itip-view.h
+
 liborg_gnome_itip_formatter_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
 liborg_gnome_itip_formatter_la_LIBADD =				\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am
index 9ee65c25e0..ddd1b5176d 100644
--- a/plugins/mail-notification/Makefile.am
+++ b/plugins/mail-notification/Makefile.am
@@ -5,7 +5,14 @@ NO_UNDEFINED_REQUIRED_LIBS =				\
 	$(GNOME_PLATFORM_LIBS)
 endif
 
-AM_CPPFLAGS =					\
+@EVO_PLUGIN_RULE@
+
+plugin_DATA = org-gnome-mail-notification.eplug
+
+plugin_LTLIBRARIES = liborg-gnome-mail-notification.la
+
+liborg_gnome_mail_notification_la_CPPFLAGS =	\
+	$(AM_CPPFLAGS)				\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/widgets			\
 	$(GNOME_PLATFORM_CFLAGS)		\
@@ -14,14 +21,10 @@ AM_CPPFLAGS =					\
 	$(LIBNOTIFY_CFLAGS)			\
 	$(CANBERRA_CFLAGS)
 
-@EVO_PLUGIN_RULE@
+liborg_gnome_mail_notification_la_SOURCES = mail-notification.c
 
-plugin_DATA = org-gnome-mail-notification.eplug
-plugin_LTLIBRARIES = liborg-gnome-mail-notification.la
+liborg_gnome_mail_notification_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
-liborg_gnome_mail_notification_la_SOURCES = mail-notification.c
-liborg_gnome_mail_notification_la_LDFLAGS = 	\
-	-module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_mail_notification_la_LIBADD = 		\
 	$(DBUS_GLIB_LIBS)				\
 	$(CANBERRA_LIBS)				\
diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am
index 97c6f95406..c7501fce04 100644
--- a/plugins/mail-to-task/Makefile.am
+++ b/plugins/mail-to-task/Makefile.am
@@ -1,17 +1,21 @@
-AM_CPPFLAGS =						\
+@EVO_PLUGIN_RULE@
+
+plugin_DATA = org-gnome-mail-to-task.eplug
+
+plugin_LTLIBRARIES = liborg-gnome-mail-to-task.la
+
+liborg_gnome_mail_to_task_la_CPPFLAGS =			\
+	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	$(GNOME_PLATFORM_CFLAGS)			\
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
 	$(EVOLUTION_MAIL_CFLAGS)
 
-@EVO_PLUGIN_RULE@
-
-plugin_DATA = org-gnome-mail-to-task.eplug
-plugin_LTLIBRARIES = liborg-gnome-mail-to-task.la
-
 liborg_gnome_mail_to_task_la_SOURCES = mail-to-task.c
+
 liborg_gnome_mail_to_task_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
 liborg_gnome_mail_to_task_la_LIBADD =	\
 	$(top_builddir)/e-util/libeutil.la				\
 	$(top_builddir)/shell/libeshell.la				\
@@ -26,6 +30,7 @@ liborg_gnome_mail_to_task_la_LIBADD =	\
 EXTRA_DIST = org-gnome-mail-to-task.eplug.xml
 
 BUILT_SOURCES = org-gnome-mail-to-task.eplug
+
 CLEANFILES = $(BUILT_SOURCES)
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am
index 9926ab266e..87556845fe 100644
--- a/plugins/mailing-list-actions/Makefile.am
+++ b/plugins/mailing-list-actions/Makefile.am
@@ -1,17 +1,20 @@
-AM_CPPFLAGS =						\
+@EVO_PLUGIN_RULE@
+
+plugin_DATA = org-gnome-mailing-list-actions.eplug
+plugin_LTLIBRARIES = liborg-gnome-mailing-list-actions.la
+
+liborg_gnome_mailing_list_actions_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_builddir)/composer 			\
 	$(GNOME_PLATFORM_CFLAGS)			\
 	$(EVOLUTION_MAIL_CFLAGS)
 
-@EVO_PLUGIN_RULE@
-
-plugin_DATA = org-gnome-mailing-list-actions.eplug
-plugin_LTLIBRARIES = liborg-gnome-mailing-list-actions.la
-
 liborg_gnome_mailing_list_actions_la_SOURCES = mailing-list-actions.c
+
 liborg_gnome_mailing_list_actions_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
 liborg_gnome_mailing_list_actions_la_LIBADD =		\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/mail/libevolution-mail.la	\
diff --git a/plugins/mark-all-read/Makefile.am b/plugins/mark-all-read/Makefile.am
index aac01d2b37..bbbfae7d3b 100644
--- a/plugins/mark-all-read/Makefile.am
+++ b/plugins/mark-all-read/Makefile.am
@@ -1,15 +1,19 @@
-AM_CPPFLAGS =						\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/widgets				\
-	$(EVOLUTION_MAIL_CFLAGS)
-
 @EVO_PLUGIN_RULE@
 
 plugin_DATA = org-gnome-mark-all-read.eplug
+
 plugin_LTLIBRARIES = liborg-gnome-mark-all-read.la
 
+liborg_gnome_mark_all_read_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)					\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/widgets				\
+	$(EVOLUTION_MAIL_CFLAGS)
+
 liborg_gnome_mark_all_read_la_SOURCES = mark-all-read.c  
+
 liborg_gnome_mark_all_read_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
 liborg_gnome_mark_all_read_la_LIBADD = 			\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/mail/libevolution-mail.la	\
diff --git a/plugins/plugin-manager/Makefile.am b/plugins/plugin-manager/Makefile.am
index 5f1228f439..2966642c77 100644
--- a/plugins/plugin-manager/Makefile.am
+++ b/plugins/plugin-manager/Makefile.am
@@ -1,15 +1,19 @@
-AM_CPPFLAGS =						\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/widgets				\
-	$(EVOLUTION_MAIL_CFLAGS)
-
 @EVO_PLUGIN_RULE@
 
 plugin_DATA = org-gnome-plugin-manager.eplug
+
 plugin_LTLIBRARIES = liborg-gnome-plugin-manager.la
 
+liborg_gnome_plugin_manager_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)					\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/widgets				\
+	$(EVOLUTION_MAIL_CFLAGS)
+
 liborg_gnome_plugin_manager_la_SOURCES = plugin-manager.c
+
 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		\
diff --git a/plugins/prefer-plain/Makefile.am b/plugins/prefer-plain/Makefile.am
index c8abf81ab8..61222e990e 100644
--- a/plugins/prefer-plain/Makefile.am
+++ b/plugins/prefer-plain/Makefile.am
@@ -1,14 +1,18 @@
-AM_CPPFLAGS =						\
-	-I$(top_srcdir)					\
-	$(EVOLUTION_MAIL_CFLAGS)
-
 @EVO_PLUGIN_RULE@
 
 plugin_DATA = org-gnome-prefer-plain.eplug
+
 plugin_LTLIBRARIES = liborg-gnome-prefer-plain.la
 
+liborg_gnome_prefer_plain_la_CPPFLAGS =			\
+	$(AM_CPPFLAGS)					\
+	-I$(top_srcdir)					\
+	$(EVOLUTION_MAIL_CFLAGS)
+
 liborg_gnome_prefer_plain_la_SOURCES = prefer-plain.c
+
 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	\
diff --git a/plugins/profiler/Makefile.am b/plugins/profiler/Makefile.am
index 21f63af33f..2a61fbafbe 100644
--- a/plugins/profiler/Makefile.am
+++ b/plugins/profiler/Makefile.am
@@ -1,15 +1,18 @@
-AM_CPPFLAGS =						\
-	-I$(top_srcdir)					\
-	$(SHELL_CFLAGS)
-
 LIBS = $(SHELL_LIBS)
 
 @EVO_PLUGIN_RULE@
 
 plugin_DATA = org-gnome-evolution-profiler.eplug
+
 plugin_LTLIBRARIES = liborg-gnome-evolution-profiler.la
 
+liborg_gnome_evolution_profiler_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)					\
+	-I$(top_srcdir)					\
+	$(SHELL_CFLAGS)
+
 liborg_gnome_evolution_profiler_la_SOURCES = profiler.c
+
 liborg_gnome_evolution_profiler_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 EXTRA_DIST = org-gnome-evolution-profiler.eplug.xml
diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am
index 7c4ace9a21..f120065f9a 100644
--- a/plugins/pst-import/Makefile.am
+++ b/plugins/pst-import/Makefile.am
@@ -6,7 +6,14 @@ NO_UNDEFINED_REQUIRED_LIBS =				\
 	$(EVOLUTION_MAIL_LIBS)
 endif
 
-AM_CPPFLAGS =						\
+@EVO_PLUGIN_RULE@
+
+plugin_DATA = org-gnome-pst-import.eplug
+
+plugin_LTLIBRARIES = liborg-gnome-pst-import.la
+
+liborg_gnome_pst_import_la_CPPFLAGS =			\
+	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_builddir)				\
@@ -17,14 +24,10 @@ AM_CPPFLAGS =						\
 	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(LIBPST_CFLAGS)
 
-@EVO_PLUGIN_RULE@
+liborg_gnome_pst_import_la_SOURCES = pst-importer.c
 
-plugin_DATA = org-gnome-pst-import.eplug
-plugin_LTLIBRARIES = liborg-gnome-pst-import.la
+liborg_gnome_pst_import_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
-liborg_gnome_pst_import_la_SOURCES = pst-importer.c
-liborg_gnome_pst_import_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_pst_import_la_LIBADD =			\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(GNOME_PLATFORM_LIBS)				\
diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am
index 7e7af763c5..a8117539e8 100644
--- a/plugins/publish-calendar/Makefile.am
+++ b/plugins/publish-calendar/Makefile.am
@@ -1,21 +1,22 @@
-AM_CPPFLAGS =					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/widgets			\
-	-I$(top_builddir)/shell			\
-	$(EVOLUTION_CALENDAR_CFLAGS)		\
-	-DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" \
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"          
-
 @EVO_PLUGIN_RULE@
 
 plugin_DATA = 					\
 	org-gnome-publish-calendar.eplug
 
 glade_DATA =							\
-	publish-calendar.glade				
+	publish-calendar.glade
 
 plugin_LTLIBRARIES = liborg-gnome-publish-calendar.la
 
+liborg_gnome_publish_calendar_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)					\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/widgets				\
+	-I$(top_builddir)/shell				\
+	$(EVOLUTION_CALENDAR_CFLAGS)			\
+	-DEVOLUTION_PLUGINDIR="\"$(plugindir)\""	\
+	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
+
 liborg_gnome_publish_calendar_la_SOURCES =	\
 	publish-calendar.c			\
 	publish-format-fb.c			\
diff --git a/plugins/sa-junk-plugin/Makefile.am b/plugins/sa-junk-plugin/Makefile.am
index 39bd74e266..42ea8a8218 100644
--- a/plugins/sa-junk-plugin/Makefile.am
+++ b/plugins/sa-junk-plugin/Makefile.am
@@ -1,15 +1,18 @@
-AM_CPPFLAGS =						\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/widgets				\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)
-
 @EVO_PLUGIN_RULE@
 
 plugin_DATA = org-gnome-sa-junk-plugin.eplug
+
 plugin_LTLIBRARIES = liborg-gnome-sa-junk-plugin.la
 
+liborg_gnome_sa_junk_plugin_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)					\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/widgets				\
+	$(GNOME_PLATFORM_CFLAGS)			\
+	$(EVOLUTION_MAIL_CFLAGS)
+
 liborg_gnome_sa_junk_plugin_la_SOURCES = em-junk-filter.c
+
 liborg_gnome_sa_junk_plugin_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 liborg_gnome_sa_junk_plugin_la_LIBADD =	\
@@ -22,9 +25,6 @@ BUILT_SOURCES = $(plugin_DATA) $(error_DATA)
 
 CLEANFILES = $(BUILT_SOURCES)
 
-EXTRA_DIST = \
-	org-gnome-sa-junk-plugin.eplug.xml
-
-
+EXTRA_DIST = org-gnome-sa-junk-plugin.eplug.xml
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am
index 7149e789bc..0e95ec6fde 100644
--- a/plugins/save-calendar/Makefile.am
+++ b/plugins/save-calendar/Makefile.am
@@ -1,13 +1,15 @@
-AM_CPPFLAGS =						\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/widgets				\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
 @EVO_PLUGIN_RULE@
 
 plugin_DATA = org-gnome-save-calendar.eplug
+
 plugin_LTLIBRARIES = liborg-gnome-save-calendar.la
 
+liborg_gnome_save_calendar_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)					\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/widgets				\
+	$(EVOLUTION_CALENDAR_CFLAGS)
+
 liborg_gnome_save_calendar_la_SOURCES = \
 	save-calendar.c			\
 	ical-format.c			\
diff --git a/plugins/startup-wizard/Makefile.am b/plugins/startup-wizard/Makefile.am
index 613acbc1eb..375b46de62 100644
--- a/plugins/startup-wizard/Makefile.am
+++ b/plugins/startup-wizard/Makefile.am
@@ -1,15 +1,18 @@
-AM_CPPFLAGS = -I .					\
+plugin_LTLIBRARIES = liborg-gnome-evolution-startup-wizard.la
+
+@EVO_PLUGIN_RULE@
+
+plugin_DATA = org-gnome-evolution-startup-wizard.eplug
+
+liborg_gnome_evolution_startup_wizard_la_CPPFLAGS =	\
+	$(AM_CPPFLAGS)					\
+	-I .						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_builddir)/shell				\
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
 	$(EVOLUTION_MAIL_CFLAGS)
 
-@EVO_PLUGIN_RULE@
-
-plugin_DATA = org-gnome-evolution-startup-wizard.eplug
-plugin_LTLIBRARIES = liborg-gnome-evolution-startup-wizard.la
-
 liborg_gnome_evolution_startup_wizard_la_SOURCES = 	\
 	startup-wizard.c
 
diff --git a/plugins/subject-thread/Makefile.am b/plugins/subject-thread/Makefile.am
index e27b08bfbe..a5686b6dc8 100644
--- a/plugins/subject-thread/Makefile.am
+++ b/plugins/subject-thread/Makefile.am
@@ -1,11 +1,13 @@
-AM_CPPFLAGS =						\
-	-I$(top_srcdir)					\
-	$(EVOLUTION_MAIL_CFLAGS)
+plugin_LTLIBRARIES = liborg-gnome-subject-thread.la
 
 @EVO_PLUGIN_RULE@
 
 plugin_DATA = org-gnome-subject-thread.eplug
-plugin_LTLIBRARIES = liborg-gnome-subject-thread.la
+
+liborg_gnome_subject_thread_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)					\
+	-I$(top_srcdir)					\
+	$(EVOLUTION_MAIL_CFLAGS)
 
 liborg_gnome_subject_thread_la_SOURCES = subject-thread.c
 liborg_gnome_subject_thread_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am
index 6c9522dca2..8f47a03ef8 100644
--- a/plugins/templates/Makefile.am
+++ b/plugins/templates/Makefile.am
@@ -1,4 +1,13 @@
-AM_CPPFLAGS =						\
+@EVO_PLUGIN_RULE@
+
+plugin_DATA = 					\
+		org-gnome-templates.eplug	\
+		templates.glade
+
+plugin_LTLIBRARIES = liborg-gnome-templates.la
+
+liborg_gnome_templates_la_CPPFLAGS =			\
+	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_builddir)				\
@@ -8,16 +17,10 @@ AM_CPPFLAGS =						\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	-DEVOLUTION_PLUGINDIR="\"$(plugindir)\""
 
-@EVO_PLUGIN_RULE@
-
-plugin_DATA = 					\
-		org-gnome-templates.eplug	\
-		templates.glade
-
-plugin_LTLIBRARIES = liborg-gnome-templates.la
-
 liborg_gnome_templates_la_SOURCES = templates.c
+
 liborg_gnome_templates_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
 liborg_gnome_templates_la_LIBADD =	\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/shell/libeshell.la		\
diff --git a/plugins/tnef-attachments/Makefile.am b/plugins/tnef-attachments/Makefile.am
index 2273e6ed80..26a679b58a 100644
--- a/plugins/tnef-attachments/Makefile.am
+++ b/plugins/tnef-attachments/Makefile.am
@@ -6,7 +6,14 @@ NO_UNDEFINED_REQUIRED_LIBS = 				\
 	$(top_builddir)/mail/libevolution-mail.la
 endif
 
-AM_CPPFLAGS =						\
+@EVO_PLUGIN_RULE@
+
+plugin_DATA = org-gnome-tnef-attachments.eplug
+
+plugin_LTLIBRARIES = liborg-gnome-tnef-attachments.la
+
+liborg_gnome_tnef_attachments_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""	\
@@ -14,13 +21,10 @@ AM_CPPFLAGS =						\
 	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(TNEF_CFLAGS)
 
-@EVO_PLUGIN_RULE@
-
-plugin_DATA = org-gnome-tnef-attachments.eplug
-plugin_LTLIBRARIES = liborg-gnome-tnef-attachments.la
-
 liborg_gnome_tnef_attachments_la_SOURCES = tnef-plugin.c
+
 liborg_gnome_tnef_attachments_la_LDFLAGS = -module -avoid-version  $(NO_UNDEFINED)
+
 liborg_gnome_tnef_attachments_la_LIBADD = 		\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/em-format/libemformat.la	\
diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am
index a1267507ae..ead97d798c 100644
--- a/plugins/vcard-inline/Makefile.am
+++ b/plugins/vcard-inline/Makefile.am
@@ -5,19 +5,23 @@ NO_UNDEFINED_REQUIRED_LIBS =				\
 	$(GNOME_PLATFORM_LIBS)
 endif
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/widgets				\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)
-
 @EVO_PLUGIN_RULE@
 
 plugin_DATA = org-gnome-vcard-inline.eplug
+
 plugin_LTLIBRARIES = liborg-gnome-vcard-inline.la
 
+liborg_gnome_vcard_inline_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)					\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/widgets				\
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
+	$(EVOLUTION_MAIL_CFLAGS)
+
 liborg_gnome_vcard_inline_la_SOURCES = vcard-inline.c
+
 liborg_gnome_vcard_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
 liborg_gnome_vcard_inline_la_LIBADD =	\
 	$(top_builddir)/mail/libevolution-mail.la		\
 	$(top_builddir)/addressbook/util/libeabutil.la		\
diff --git a/plugins/webdav-account-setup/Makefile.am b/plugins/webdav-account-setup/Makefile.am
index 761cd69363..bc281a732d 100644
--- a/plugins/webdav-account-setup/Makefile.am
+++ b/plugins/webdav-account-setup/Makefile.am
@@ -1,13 +1,15 @@
-AM_CPPFLAGS = \
-	-I .				\
-	-I$(top_srcdir)			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
 @EVO_PLUGIN_RULE@
 
 plugin_DATA = org-gnome-evolution-webdav.eplug
+
 plugin_LTLIBRARIES = liborg-gnome-evolution-webdav.la
 
+liborg_gnome_evolution_webdav_la_CPPFLAGS = 	\
+	$(AM_CPPFLAGS)				\
+	-I .					\
+	-I$(top_srcdir)				\
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
 liborg_gnome_evolution_webdav_la_SOURCES = \
 	webdav-contacts-source.c