Move a bunch of CPPFLAGS defs into INCLUDES so they doesn't override

any CPPFLAGS set at configure time

svn path=/trunk/; revision=5935

11 files changed, 37 insertions, 34 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 50e8296bff..e68eca698a 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,15 @@
+2000-10-15  Dan Winship  <danw@helixcode.com>
+
+	* gui/component/select-names/Makefile.am:
+	* gui/component/Makefile.am: Remove CPPFLAGS since they just
+	duplicate flags that were already in INCLUDES.
+
+	* printing/Makefile.am (ecpsdir): 
+	* gui/widgets/Makefile.am:
+	* contact-editor/Makefile.am: Move -D flags from CPPFLAGS to
+	INCLUDES so they don't override any CPPFLAGS set at configure
+	time.
+
 2000-10-14  Michael Meeks  <michael@helixcode.com>
 
 	* gui/component/addressbook.c (control_activate): if we are in
diff --git a/addressbook/contact-editor/Makefile.am b/addressbook/contact-editor/Makefile.am
index a424cbc55d..1016d38301 100644
--- a/addressbook/contact-editor/Makefile.am
+++ b/addressbook/contact-editor/Makefile.am
@@ -1,9 +1,3 @@
-CPPFLAGS =					\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
-	-DDATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"	\
-	-DEVOLUTIONDIR=\""$(evolutiondir)"\"
-
 INCLUDES =					\
 	$(BONOBO_GNOME_CFLAGS)			\
 	$(EXTRA_GNOME_CFLAGS)			\
@@ -11,6 +5,10 @@ INCLUDES =					\
 	-I$(top_srcdir)/addressbook/		\
 	-I$(top_srcdir)/addressbook/backend	\
 	-I$(top_srcdir)/widgets/e-table		\
+	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
+	-DDATADIR=\""$(datadir)"\"		\
+	-DEVOLUTION_DATADIR=\""$(datadir)"\"	\
+	-DEVOLUTIONDIR=\""$(evolutiondir)"\"	\
 	-DG_LOG_DOMAIN=\"contact-editor\"
 
 noinst_LIBRARIES =				\
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 63125a42f2..642c7f91c7 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -1,8 +1,5 @@
 SUBDIRS	= select-names
 
-CPPFLAGS =					\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
-
 INCLUDES =						\
 	-DG_LOG_DOMAIN=\"evolution-addressbook\"	\
 	$(EXTRA_GNOME_CFLAGS)				\
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
index 6116b36b06..ef8d0bf14f 100644
--- a/addressbook/gui/component/select-names/Makefile.am
+++ b/addressbook/gui/component/select-names/Makefile.am
@@ -20,9 +20,6 @@ oaf_DATA = evolution-addressbook-select-names.oafinfo
 
 #
 
-CPPFLAGS =					\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
-
 INCLUDES =						\
 	-DG_LOG_DOMAIN=\"evolution-addressbook\"	\
 	$(EXTRA_GNOME_CFLAGS)				\
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index a424cbc55d..1016d38301 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -1,9 +1,3 @@
-CPPFLAGS =					\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
-	-DDATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"	\
-	-DEVOLUTIONDIR=\""$(evolutiondir)"\"
-
 INCLUDES =					\
 	$(BONOBO_GNOME_CFLAGS)			\
 	$(EXTRA_GNOME_CFLAGS)			\
@@ -11,6 +5,10 @@ INCLUDES =					\
 	-I$(top_srcdir)/addressbook/		\
 	-I$(top_srcdir)/addressbook/backend	\
 	-I$(top_srcdir)/widgets/e-table		\
+	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
+	-DDATADIR=\""$(datadir)"\"		\
+	-DEVOLUTION_DATADIR=\""$(datadir)"\"	\
+	-DEVOLUTIONDIR=\""$(evolutiondir)"\"	\
 	-DG_LOG_DOMAIN=\"contact-editor\"
 
 noinst_LIBRARIES =				\
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index c0c4c7d488..03bd9a4d6e 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -1,8 +1,6 @@
-CPPFLAGS =					\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
-
 INCLUDES =						\
 	-DG_LOG_DOMAIN=\"e-minicard\"			\
+	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/addressbook/backend/ebook	\
 	-I$(top_srcdir)/addressbook/contact-editor	\
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index 959f8ff924..a3156db610 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -11,19 +11,17 @@ glade_DATA = 				\
 	e-contact-print.glade		\
 	e-contact-print.glade.h
 
-CPPFLAGS = \
+INCLUDES =					\
+	$(GNOME_INCLUDEDIR)			\
+	-DG_LOG_DOMAIN=\"addressbook-printing\"	\
+	-I$(top_srcdir)/addressbook		\
+	-I$(top_srcdir)				\
         -DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
 	-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\"	\
 	-DDATADIR=\""$(datadir)"\"		\
 	$(GNOME_PRINT_CFLAGS)			\
         $(BONOBO_GNOME_CFLAGS)
 
-INCLUDES =					\
-	$(GNOME_INCLUDEDIR)			\
-	-DG_LOG_DOMAIN=\"addressbook-printing\"	\
-	-I$(top_srcdir)/addressbook		\
-	-I$(top_srcdir)
-
 noinst_LIBRARIES =				\
 	libecontactprint.a
 
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index afda2ef5cd..3f94458346 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-15  Dan Winship  <danw@helixcode.com>
+
+	* gui/Makefile.am: Remove CPPFLAGS def since the -D there was
+	already in INCLUDES
+
 2000-10-14  Ettore Perazzoli  <ettore@helixcode.com>
 
 	* gui/evolution-calendar.oafinfo: Added an
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index de1f72b2c6..9b5a81a68a 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -4,9 +4,6 @@ help_base = $(datadir)/gnome/help/cal
 
 bin_PROGRAMS = evolution-calendar
 
-CPPFLAGS =					\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
-
 INCLUDES = 						\
 	-DG_LOG_DOMAIN=\"calendar-gui\"			\
 	-I$(top_builddir)/shell				\
diff --git a/composer/ChangeLog b/composer/ChangeLog
index b625664ac7..670e2eb9c8 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-15  Dan Winship  <danw@helixcode.com>
+
+	* Makefile.am: Move CPPFLAGS flags to INCLUDES to avoid bashing
+	any CPPFLAGS set at configure time.
+
 2000-10-14  Jeffrey Stedfast  <fejj@helixcode.com>
 
 	* e-msg-composer-attachment.c (set_entry): If the entry widget is
diff --git a/composer/Makefile.am b/composer/Makefile.am
index f6559b43a6..ea7407b326 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -44,11 +44,9 @@ INCLUDES =								\
 	$(BONOBO_GNOME_CFLAGS)						\
 	$(GTKHTML_CFLAGS)						\
 	$(UNICODE_CFLAGS)						\
+	-DE_GLADEDIR=\"$(gladedir)\"					\
 	-DG_LOG_DOMAIN=\"composer\"
 
-CPPFLAGS =					\
-	-DE_GLADEDIR=\"$(gladedir)\"
-
 libcomposer_la_SOURCES = 			\
 	$(IDL_GENERATED)			\
 	e-msg-composer-address-dialog.c		\