[glade3/glade-3-8] * src/Makefile.am, gladeui/Makefile.am, plugins/gtk+/Makefile.am, plugins/gnome/Makefile.am: Fix

[Tristan Van Berkom <tvb src gnome org>]

commit 0b9def155b2828b2c17035226e540ef4c9c7fd29
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Sat Dec 18 19:26:40 2010 +0900

    	* src/Makefile.am, gladeui/Makefile.am, plugins/gtk+/Makefile.am, plugins/gnome/Makefile.am:
    	  Fixed makefiles as per bug 521713 (patch initially by Daniel Macks).

 ChangeLog                 |    5 +++++
 gladeui/Makefile.am       |   14 +++++++-------
 plugins/gnome/Makefile.am |    6 ++++--
 plugins/gtk+/Makefile.am  |   11 ++++-------
 src/Makefile.am           |    8 ++++----
 5 files changed, 24 insertions(+), 20 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index dc257fe..cfbd657 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-18  Tristan Van Berkom <tristanvb openismus com>
+
+	* src/Makefile.am, gladeui/Makefile.am, plugins/gtk+/Makefile.am, plugins/gnome/Makefile.am:
+	  Fixed makefiles as per bug 521713 (patch initially by Daniel Macks).
+
 2010-12-17  Tristan Van Berkom <tristanvb openismus com>
 
 	* plugins/gtk+/gtk+.xml.in, plugins/gtk+/glade-gtk.c: Added support for deprecated GtkOptionMenu.
diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am
index f8c423c..f861aae 100644
--- a/gladeui/Makefile.am
+++ b/gladeui/Makefile.am
@@ -6,13 +6,13 @@ lib_LTLIBRARIES = libgladeui-1.la
 glade_previewer_CPPFLAGS = \
 	-I$(top_srcdir)    \
 	-I$(top_builddir)  \
-	-DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\""
-	$(AM_CPPFLAGS)
-
-glade_previewer_CFLAGS =   \
+	-DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\"" \
 	$(GTK_CFLAGS)      \
 	$(IGE_MAC_CFLAGS)  \
 	$(WARN_CFLAGS)     \
+	$(AM_CPPFLAGS)
+
+glade_previewer_CFLAGS =   \
 	$(AM_CFLAGS)
 
 glade_previewer_LDFLAGS = $(AM_LDFLAGS)
@@ -100,13 +100,13 @@ libgladeui_1_la_CPPFLAGS =  \
 	$(common_defines)   \
 	-I$(top_srcdir)     \
 	-I$(top_builddir)   \
-	$(AM_CPPFLAGS)
-
-libgladeui_1_la_CFLAGS =    \
 	$(GTK_CFLAGS)       \
 	$(IGE_MAC_BUNDLE_FLAG) \
 	$(IGE_MAC_CFLAGS)  \
 	$(WARN_CFLAGS)      \
+	$(AM_CPPFLAGS)
+
+libgladeui_1_la_CFLAGS =    \
 	$(AM_CFLAGS)
 
 libgladeui_1_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS)
diff --git a/plugins/gnome/Makefile.am b/plugins/gnome/Makefile.am
index c6be160..87e8932 100644
--- a/plugins/gnome/Makefile.am
+++ b/plugins/gnome/Makefile.am
@@ -11,8 +11,7 @@ gladegnome_LTLIBRARIES = libgladegnome.la
 gladegnomedir = $(pkglibdir)/modules
 
 libgladegnome_la_SOURCES = glade-gnome.c
-libgladegnome_la_CPPFLAGS = $(AM_CPPFLAGS)
-libgladegnome_la_CFLAGS = \
+libgladegnome_la_CPPFLAGS = \
         -DG_LOG_DOMAIN=\"GladeUI-GNOME\" \
 	-I$(top_srcdir)                  \
 	-I$(top_builddir)                \
@@ -20,6 +19,9 @@ libgladegnome_la_CFLAGS = \
 	$(GNOME_CFLAGS)                  \
 	$(PLUGINS_WARN_CFLAGS)           \
 	$(AM_CPPFLAGS)
+
+libgladegnome_la_CFLAGS = \
+	$(AM_CFLAGS)
 libgladegnome_la_LDFLAGS = -module -avoid-version $(GNOME_LIBS) $(AM_LDFLAGS)
 libgladegnome_la_LIBADD = $(libgladeui) $(GLADE_LIBS)
 
diff --git a/plugins/gtk+/Makefile.am b/plugins/gtk+/Makefile.am
index 032397d..8d21b7f 100644
--- a/plugins/gtk+/Makefile.am
+++ b/plugins/gtk+/Makefile.am
@@ -10,18 +10,15 @@ libgladeui = $(top_builddir)/gladeui/libgladeui-1.la
 gladegtk_LTLIBRARIES = libgladegtk.la
 gladegtkdir = $(pkglibdir)/modules
 
-libgladegtk_la_CPPLAGS =   \
+libgladegtk_la_CPPFLAGS =   \
 	-I$(top_srcdir)    \
 	-I$(top_builddir)  \
-	$(AM_CPPFLAGS)
-
-libgladegtk_la_CFLAGS =  \
 	-DG_LOG_DOMAIN=\"GladeUI-GTK\" \
-	-I$(top_srcdir)                \
-	-I$(top_builddir)              \
 	$(GTK_CFLAGS)	               \
 	$(PLUGINS_WARN_CFLAGS)         \
-	$(AM_CFLAGS)
+	$(AM_CPPFLAGS)
+
+libgladegtk_la_CFLAGS = $(AM_CFLAGS)
 
 libgladegtk_la_SOURCES     = glade-gtk.c glade-accels.c glade-attributes.c glade-convert.c fixed-bg.xpm \
 	glade-column-types.c  glade-model-data.c glade-text-button.c \
diff --git a/src/Makefile.am b/src/Makefile.am
index ed147b0..4ec720a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,13 +5,13 @@ bin_PROGRAMS = glade-3
 glade_3_CPPFLAGS = \
 	-I$(top_srcdir)    \
 	-I$(top_builddir)  \
-	-DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\""
-	$(AM_CPPFLAGS)
-
-glade_3_CFLAGS =           \
+	-DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\"" \
 	$(GTK_CFLAGS)      \
 	$(IGE_MAC_CFLAGS)  \
 	$(WARN_CFLAGS)     \
+	$(AM_CPPFLAGS)
+
+glade_3_CFLAGS =           \
 	$(AM_CFLAGS)
 
 glade_3_LDFLAGS = $(AM_LDFLAGS)