Bug 596848 - Use per-target CPPFLAGS in automake files

9 files changed, 46 insertions, 39 deletions

diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
index 2b02156274..3ac06da3e9 100644
--- a/addressbook/conduit/Makefile.am
+++ b/addressbook/conduit/Makefile.am
@@ -1,15 +1,15 @@
-AM_CPPFLAGS = 					\
+# Address Conduit
+privconduit_LTLIBRARIES = libeaddress_conduit.la
+
+libeaddress_conduit_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)				\
 	-I$(top_srcdir)/e-util			\
 	-I$(top_builddir)/e-util		\
 	-I$(top_srcdir)/widgets/misc		\
 	-I$(top_builddir)/widgets/misc		\
 	$(EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS)
 
-# Address Conduit
-privconduit_LTLIBRARIES = libeaddress_conduit.la
-
-libeaddress_conduit_la_SOURCES = 		\
-	address-conduit.c
+libeaddress_conduit_la_SOURCES = address-conduit.c
 
 libeaddress_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 29ddb6ee9c..588dcc51f7 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -2,7 +2,10 @@ if OS_WIN32
 WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-addressbook.la
 endif
 
-AM_CPPFLAGS =						\
+privsolib_LTLIBRARIES =	libecontacteditor.la
+
+libecontacteditor_la_CPPFLAGS =				\
+	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/addressbook/			\
@@ -14,9 +17,6 @@ AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"contact-editor\"		\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
-privsolib_LTLIBRARIES =				\
-	libecontacteditor.la
-
 libecontacteditor_la_SOURCES = 			\
 	eab-editor.c				\
 	eab-editor.h				\
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index 63774863a4..71ef3703b0 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -2,7 +2,10 @@ if OS_WIN32
 WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-addressbook.la
 endif
 
-AM_CPPFLAGS =						\
+privsolib_LTLIBRARIES =	libecontactlisteditor.la
+
+libecontactlisteditor_la_CPPFLAGS =			\
+	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/addressbook/			\
@@ -13,9 +16,6 @@ AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"contact-list-editor\"		\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
-privsolib_LTLIBRARIES =				\
-	libecontactlisteditor.la
-
 libecontactlisteditor_la_SOURCES = 		\
 	e-contact-list-editor.c			\
 	e-contact-list-editor.h			\
diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am
index e399c19747..92f9dc6ef6 100644
--- a/addressbook/gui/merging/Makefile.am
+++ b/addressbook/gui/merging/Makefile.am
@@ -1,4 +1,7 @@
-AM_CPPFLAGS =						\
+noinst_LTLIBRARIES = libeabbookmerging.la
+
+libeabbookmerging_la_CPPFLAGS =				\
+	$(AM_CPPFLAGS)					\
 	-DG_LOG_DOMAIN=\"eab-contact-merging\"		\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	-I$(top_srcdir)					\
@@ -6,9 +9,6 @@ AM_CPPFLAGS =						\
 	-I$(top_srcdir)/addressbook			\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
-noinst_LTLIBRARIES =				\
-	libeabbookmerging.la
-
 libeabbookmerging_la_SOURCES =			\
 	eab-contact-compare.c			\
 	eab-contact-compare.h			\
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index e9075802d1..ffe064a349 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -1,7 +1,10 @@
 ruledir = $(privdatadir)
 rule_DATA = addresstypes.xml
 
-AM_CPPFLAGS =						\
+noinst_LTLIBRARIES = libeabwidgets.la
+
+libeabwidgets_la_CPPFLAGS =				\
+	$(AM_CPPFLAGS)					\
 	-DG_LOG_DOMAIN=\"eab-widgets\"			\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
 	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"	\
@@ -17,9 +20,6 @@ AM_CPPFLAGS =						\
 	$(GNOME_PLATFORM_CFLAGS)			\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
-noinst_LTLIBRARIES =				\
-	libeabwidgets.la
-
 eabincludedir = $(privincludedir)/addressbook/gui/widgets
 
 eabinclude_HEADERS = 			\
diff --git a/addressbook/importers/Makefile.am b/addressbook/importers/Makefile.am
index 27c463b7b3..7ccc4c7545 100644
--- a/addressbook/importers/Makefile.am
+++ b/addressbook/importers/Makefile.am
@@ -1,8 +1,7 @@
+privsolib_LTLIBRARIES = libevolution-addressbook-importers.la
 
-privsolib_LTLIBRARIES = 				\
-	libevolution-addressbook-importers.la
-
-AM_CPPFLAGS = 						\
+libevolution_addressbook_importers_la_CPPFLAGS =	\
+	$(AM_CPPFLAGS)					\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DEVOLUTION_SOUNDDIR=\""$(soundsdir)"\"		\
 	-DG_LOG_DOMAIN=\"Evolution-Importer\"		\
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index 5304e21c01..2c0d824c93 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -4,7 +4,8 @@ ecps_DATA  =				\
 	medbook.ecps			\
 	phonelist.ecps
 
-AM_CPPFLAGS =					\
+libecontactprint_la_CPPFLAGS =			\
+	$(AM_CPPFLAGS)				\
 	-DG_LOG_DOMAIN=\"addressbook-printing\"	\
 	-I$(top_srcdir)/addressbook		\
 	-I$(top_srcdir)				\
@@ -12,8 +13,7 @@ AM_CPPFLAGS =					\
 	-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\"	\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
-noinst_LTLIBRARIES =				\
-	libecontactprint.la
+noinst_LTLIBRARIES = libecontactprint.la
 
 libecontactprint_la_SOURCES = 			\
 	e-contact-print-types.h			\
@@ -24,11 +24,18 @@ libecontactprint_la_LIBADD =					\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la
 
-noinst_PROGRAMS =			\
-	contact-print-test
+noinst_PROGRAMS = contact-print-test
 
-contact_print_test_SOURCES = 	\
-	test-print.c
+contact_print_test_CPPFLAGS = \
+	$(AM_CPPFLAGS)				\
+	-DG_LOG_DOMAIN=\"addressbook-printing\"	\
+	-I$(top_srcdir)/addressbook		\
+	-I$(top_srcdir)				\
+        -DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
+	-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\"	\
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+contact_print_test_SOURCES = test-print.c
 
 contact_print_test_LDADD =	\
 	libecontactprint.la					\
diff --git a/addressbook/tools/Makefile.am b/addressbook/tools/Makefile.am
index 4444d018f8..35d742ef3d 100644
--- a/addressbook/tools/Makefile.am
+++ b/addressbook/tools/Makefile.am
@@ -2,10 +2,10 @@ privlibexec_SCRIPTS =					\
 	csv2vcard					\
 	evolution-addressbook-clean
 
-privlibexec_PROGRAMS =			\
-	evolution-addressbook-export	
+privlibexec_PROGRAMS = evolution-addressbook-export
 
-AM_CPPFLAGS =						\
+evolution_addressbook_export_CPPFLAGS =			\
+	$(AM_CPPFLAGS)					\
 	-DG_LOG_DOMAIN=\"evolution-addressbook-tools\"	\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am
index 50d5d430e2..c5afbaf84f 100644
--- a/addressbook/util/Makefile.am
+++ b/addressbook/util/Makefile.am
@@ -1,4 +1,7 @@
-AM_CPPFLAGS =						\
+privsolib_LTLIBRARIES = libeabutil.la
+
+libeabutil_la_CPPFLAGS =				\
+	$(AM_CPPFLAGS)					\
 	-DPREFIX=\"$(prefix)\"				\
 	-DSYSCONFDIR=\"$(sysconfdir)\"			\
 	-DDATADIR=\"$(datadir)\"			\
@@ -9,8 +12,6 @@ AM_CPPFLAGS =						\
 	-I$(top_srcdir)/shell				\
         $(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
-privsolib_LTLIBRARIES = libeabutil.la
-
 libeabutil_la_SOURCES =					\
 	addressbook.c					\
 	addressbook.h					\