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

[Tristan Van Berkom <tvb src gnome org>]

commit 88360eb4b775d8817c13ecd4107e3c9bc40afd83
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Sat Dec 18 19:40:01 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).
    
    Conflicts:
    
    	gladeui/Makefile.am
    	plugins/gnome/Makefile.am
    	src/Makefile.am

 ChangeLog                |    5 +++++
 gladeui/Makefile.am      |   14 +++++++-------
 plugins/gtk+/Makefile.am |   11 ++++-------
 src/Makefile.am          |    8 ++++----
 4 files changed, 20 insertions(+), 18 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0e46aa0..06ffe9b 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>
 
 	* gladeui/glade-project.c: Restore proper sorting of objects at save time.
diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am
index c52043c..ded650b 100644
--- a/gladeui/Makefile.am
+++ b/gladeui/Makefile.am
@@ -6,13 +6,13 @@ lib_LTLIBRARIES = libgladeui-2.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)
@@ -96,13 +96,13 @@ libgladeui_2_la_CPPFLAGS =  \
 	$(common_defines)   \
 	-I$(top_srcdir)     \
 	-I$(top_builddir)   \
-	$(AM_CPPFLAGS)
-
-libgladeui_2_la_CFLAGS =    \
 	$(GTK_CFLAGS)       \
 	$(IGE_MAC_BUNDLE_FLAG) \
 	$(IGE_MAC_CFLAGS)  \
 	$(WARN_CFLAGS)      \
+	$(AM_CPPFLAGS)
+
+libgladeui_1_la_CFLAGS =    \
 	$(AM_CFLAGS)
 
 libgladeui_2_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS)
diff --git a/plugins/gtk+/Makefile.am b/plugins/gtk+/Makefile.am
index c420717..b84285f 100644
--- a/plugins/gtk+/Makefile.am
+++ b/plugins/gtk+/Makefile.am
@@ -10,18 +10,15 @@ libgladeui = $(top_builddir)/gladeui/libgladeui-2.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 1b6a13e..52db167 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,13 +5,13 @@ bin_PROGRAMS = glade
 glade_CPPFLAGS = \
 	-I$(top_srcdir)    \
 	-I$(top_builddir)  \
-	-DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\""
-	$(AM_CPPFLAGS)
-
-glade_CFLAGS =           \
+	-DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\"" \
 	$(GTK_CFLAGS)      \
 	$(IGE_MAC_CFLAGS)  \
 	$(WARN_CFLAGS)     \
+	$(AM_CPPFLAGS)
+
+glade_CFLAGS =           \
 	$(AM_CFLAGS)
 
 glade_LDFLAGS = $(AM_LDFLAGS)