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

---
 shell/Makefile.am | 88 +++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 56 insertions(+), 32 deletions(-)

(limited to 'shell/Makefile.am')

diff --git a/shell/Makefile.am b/shell/Makefile.am
index c1e4b11a75..d8eea3c5e3 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -2,46 +2,18 @@ if ENABLE_TEST_COMPONENT
 SUBDIRS = . test
 endif
 
-AM_CPPFLAGS =							\
-	-I$(top_srcdir)/widgets					\
-	-I$(top_srcdir)/widgets/menus				\
-	-I$(top_srcdir)/widgets/misc				\
-	-I$(top_srcdir)						\
-	-I$(top_srcdir)/shell					\
-	-DEVOLUTION_BINDIR=\""$(bindir)"\"			\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"			\
-	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
-	-DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\"		\
-	-DEVOLUTION_MODULEDIR=\""$(moduledir)"\"		\
-	-DEVOLUTION_RULEDIR=\""$(privdatadir)"\"		\
-	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"		\
-	-DPREFIX=\""$(prefix)"\"				\
-	-DSYSCONFDIR=\""$(sysconfdir)"\"			\
-	-DDATADIR=\""$(datadir)"\"				\
-	-DLIBDIR=\""$(datadir)"\"				\
-	-DG_LOG_DOMAIN=\"evolution-shell\"			\
-	$(TZDIALOG_CFLAGS)					\
-	$(SHELL_CFLAGS)
-
 if NM_SUPPORT
-AM_CPPFLAGS += \
+NM_CPPFLAGS = \
 	$(DBUS_GLIB_CFLAGS) \
 	$(NM_CFLAGS)
+NM_SUPPORT_FILES = e-shell-nm.c
 endif
 
+# Executable
 bin_PROGRAMS = evolution
 
-if NM_SUPPORT
-NM_SUPPORT_FILES = e-shell-nm.c
-endif
-
 # Shell library
-
-privsolib_LTLIBRARIES =	\
-	libeshell.la
+privsolib_LTLIBRARIES =	libeshell.la
 
 eshellincludedir = $(privincludedir)/shell
 
@@ -59,6 +31,32 @@ eshellinclude_HEADERS = 			\
 	e-shell-window-actions.h		\
 	es-event.h
 
+libeshell_la_CPPFLAGS =						\
+	$(AM_CPPFLAGS)						\
+	$(NM_CPPFLAGS)						\
+	-I$(top_srcdir)/widgets					\
+	-I$(top_srcdir)/widgets/menus				\
+	-I$(top_srcdir)/widgets/misc				\
+	-I$(top_srcdir)						\
+	-I$(top_srcdir)/shell					\
+	-DEVOLUTION_BINDIR=\""$(bindir)"\"			\
+	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"		\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
+	-DEVOLUTION_DATADIR=\""$(datadir)"\"			\
+	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"		\
+	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
+	-DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\"		\
+	-DEVOLUTION_MODULEDIR=\""$(moduledir)"\"		\
+	-DEVOLUTION_RULEDIR=\""$(privdatadir)"\"		\
+	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"		\
+	-DPREFIX=\""$(prefix)"\"				\
+	-DSYSCONFDIR=\""$(sysconfdir)"\"			\
+	-DDATADIR=\""$(datadir)"\"				\
+	-DLIBDIR=\""$(datadir)"\"				\
+	-DG_LOG_DOMAIN=\"evolution-shell\"			\
+	$(TZDIALOG_CFLAGS)					\
+	$(SHELL_CFLAGS)
+
 libeshell_la_SOURCES =				\
 	$(NM_SUPPORT_FILES)			\
 	$(IDL_GENERATED)			\
@@ -99,6 +97,32 @@ if HAVE_WINDRES
 EVOLUTIONICONRC = evolution-icon.o
 endif
 
+evolution_CPPFLAGS =						\
+	$(AM_CPPFLAGS)						\
+	$(NM_CPPFLAGS)						\
+	-I$(top_srcdir)/widgets					\
+	-I$(top_srcdir)/widgets/menus				\
+	-I$(top_srcdir)/widgets/misc				\
+	-I$(top_srcdir)						\
+	-I$(top_srcdir)/shell					\
+	-DEVOLUTION_BINDIR=\""$(bindir)"\"			\
+	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"		\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
+	-DEVOLUTION_DATADIR=\""$(datadir)"\"			\
+	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"		\
+	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
+	-DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\"		\
+	-DEVOLUTION_MODULEDIR=\""$(moduledir)"\"		\
+	-DEVOLUTION_RULEDIR=\""$(privdatadir)"\"		\
+	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"		\
+	-DPREFIX=\""$(prefix)"\"				\
+	-DSYSCONFDIR=\""$(sysconfdir)"\"			\
+	-DDATADIR=\""$(datadir)"\"				\
+	-DLIBDIR=\""$(datadir)"\"				\
+	-DG_LOG_DOMAIN=\"evolution-shell\"			\
+	$(TZDIALOG_CFLAGS)					\
+	$(SHELL_CFLAGS)
+
 evolution_SOURCES =				\
 	e-config-upgrade.c			\
 	e-config-upgrade.h			\
-- 
cgit