From f62728b55e201ea92e682e07b3253ce4fb42d5af Mon Sep 17 00:00:00 2001
From: "H.Habighorst" <h.habighorst@googlemail.com>
Date: Wed, 30 Sep 2009 23:37:50 -0400
Subject: Bug 596848 - Use per-target CPPFLAGS in automake files

---
 modules/plugin-python/Makefile.am         | 7 ++++---
 modules/plugin-python/example/Makefile.am | 9 +++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'modules/plugin-python')

diff --git a/modules/plugin-python/Makefile.am b/modules/plugin-python/Makefile.am
index e6a32c3c83..4aaf14a7b2 100644
--- a/modules/plugin-python/Makefile.am
+++ b/modules/plugin-python/Makefile.am
@@ -1,11 +1,12 @@
-AM_CPPFLAGS =							\
+module_LTLIBRARIES = libevolution-module-plugin-python.la
+
+libevolution_module_plugin_python_la_CPPFLAGS =			\
+	$(AM_CPPFLAGS)						\
 	-DG_LOG_DOMAIN=\"evolution-plugin-python\"		\
 	-I$(top_srcdir)						\
 	$(E_UTIL_CFLAGS)					\
 	$(PY_INCLUDES)
 
-module_LTLIBRARIES = libevolution-module-plugin-python.la
-
 libevolution_module_plugin_python_la_SOURCES =			\
 	evolution-module-plugin-python.c			\
 	e-plugin-python.c					\
diff --git a/modules/plugin-python/example/Makefile.am b/modules/plugin-python/example/Makefile.am
index cc14dc94d9..57a18ec93d 100644
--- a/modules/plugin-python/example/Makefile.am
+++ b/modules/plugin-python/example/Makefile.am
@@ -1,7 +1,3 @@
-AM_CPPFLAGS =						\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	
-
 @EVO_PLUGIN_RULE@
 
 plugin_DATA = \
@@ -9,6 +5,11 @@ plugin_DATA = \
 	org-gnome-hello-python-ui.xml				\
 	org-gnome-hello-python.eplug
 
+liborg_gnome_py_plug_test_la_CPPFLAGS =			\
+	$(AM_CPPFLAGS)					\
+	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
+	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"
+
 liborg_gnome_py_plug_test_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 errordir = $(privdatadir)/errors
-- 
cgit