Index: docs/plugins/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/docs/plugins/Makefile.am,v
retrieving revision 1.17
diff -u -r1.17 Makefile.am
--- docs/plugins/Makefile.am	1 Feb 2008 10:17:40 -0000	1.17
+++ docs/plugins/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -98,7 +98,7 @@
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib
 # contains GtkObjects/GObjects and you want to document signals and properties.
-GTKDOC_CFLAGS = $(GST_OBJ_CFLAGS) -I$(top_builddir) -I$(top_builddir)/libs
+GTKDOC_CFLAGS = -I$(top_builddir) -I$(top_builddir)/libs $(GST_OBJ_CFLAGS)
 GTKDOC_LIBS = $(SCANOBJ_DEPS) $(GST_OBJ_LIBS)
 
 GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
Index: gst/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/Makefile.am,v
retrieving revision 1.233
diff -u -r1.233 Makefile.am
--- gst/Makefile.am	31 Jul 2008 15:20:29 -0000	1.233
+++ gst/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -119,7 +119,7 @@
 # DISTCLEANFILES is for files generated by configure
 DISTCLEANFILES = $(built_header_configure)
 
-libgstreamer_@GST_MAJORMINOR@_la_CFLAGS =		\
+libgstreamer_@GST_MAJORMINOR@_la_CPPFLAGS =		\
 	-D_GNU_SOURCE					\
 	-DGST_EXPORTS					\
 	-DG_LOG_DOMAIN=g_log_domain_gstreamer 		\
Index: gst/parse/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/parse/Makefile.am,v
retrieving revision 1.45
diff -u -r1.45 Makefile.am
--- gst/parse/Makefile.am	1 Apr 2008 13:48:58 -0000	1.45
+++ gst/parse/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -14,7 +14,7 @@
 nodist_libgstparse_la_SOURCES = lex._gst_parse_yy.c grammar.tab.c
 CLEANFILES += grammar.tab.c lex._gst_parse_yy.c
 
-libgstparse_la_CFLAGS = $(GST_ALL_CFLAGS)
+libgstparse_la_CPPFLAGS = $(GST_ALL_CFLAGS)
 libgstparse_la_LIBADD = $(GST_ALL_LIBS)
 
 noinst_HEADERS = grammar.tab.h types.h
Index: libs/gst/base/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/libs/gst/base/Makefile.am,v
retrieving revision 1.19
diff -u -r1.19 Makefile.am
--- libs/gst/base/Makefile.am	6 Oct 2008 12:41:51 -0000	1.19
+++ libs/gst/base/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -14,7 +14,7 @@
 	gsttypefindhelper.c	\
 	gstdataqueue.c
 
-libgstbase_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS)
+libgstbase_@GST_MAJORMINOR@_la_CPPFLAGS = $(GST_OBJ_CFLAGS)
 libgstbase_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS)
 libgstbase_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
Index: libs/gst/check/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/libs/gst/check/Makefile.am,v
retrieving revision 1.11
diff -u -r1.11 Makefile.am
--- libs/gst/check/Makefile.am	28 Apr 2008 18:44:48 -0000	1.11
+++ libs/gst/check/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -6,7 +6,7 @@
 	gstbufferstraw.c			\
 	gstcheck.c
 
-libgstcheck_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) $(CHECK_CFLAGS)
+libgstcheck_@GST_MAJORMINOR@_la_CPPFLAGS = $(GST_OBJ_CFLAGS) $(CHECK_CFLAGS)
 libgstcheck_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) $(CHECK_LIBS) $(LIBM)
 libgstcheck_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_CHECK_LIB_LDFLAGS) \
         $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
Index: libs/gst/controller/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/libs/gst/controller/Makefile.am,v
retrieving revision 1.10
diff -u -r1.10 Makefile.am
--- libs/gst/controller/Makefile.am	7 Aug 2007 16:06:47 -0000	1.10
+++ libs/gst/controller/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -21,7 +21,7 @@
 	gstinterpolationcontrolsource.c \
 	gstlfocontrolsource.c
 
-libgstcontroller_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS)
+libgstcontroller_@GST_MAJORMINOR@_la_CPPFLAGS = $(GST_OBJ_CFLAGS)
 libgstcontroller_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) $(LIBM)
 libgstcontroller_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
Index: libs/gst/dataprotocol/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/libs/gst/dataprotocol/Makefile.am,v
retrieving revision 1.16
diff -u -r1.16 Makefile.am
--- libs/gst/dataprotocol/Makefile.am	2 Jul 2006 09:04:45 -0000	1.16
+++ libs/gst/dataprotocol/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -8,7 +8,7 @@
 libgstdataprotocol_@GST_MAJORMINOR@_la_SOURCES = \
     dataprotocol.c
 
-libgstdataprotocol_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS)
+libgstdataprotocol_@GST_MAJORMINOR@_la_CPPFLAGS = $(GST_OBJ_CFLAGS)
 libgstdataprotocol_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS)
 libgstdataprotocol_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
Index: libs/gst/net/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/libs/gst/net/Makefile.am,v
retrieving revision 1.9
diff -u -r1.9 Makefile.am
--- libs/gst/net/Makefile.am	3 Nov 2008 10:59:49 -0000	1.9
+++ libs/gst/net/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -12,7 +12,7 @@
     gstnettimepacket.c \
     gstnettimeprovider.c
 
-libgstnet_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS)
+libgstnet_@GST_MAJORMINOR@_la_CPPFLAGS = $(GST_OBJ_CFLAGS)
 libgstnet_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) $(INET_ATON_LIBS) $(WIN32_LIBS)
 libgstnet_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
Index: plugins/elements/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/plugins/elements/Makefile.am,v
retrieving revision 1.88
diff -u -r1.88 Makefile.am
--- plugins/elements/Makefile.am	13 Oct 2008 16:47:51 -0000	1.88
+++ plugins/elements/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -25,7 +25,7 @@
 	gsttypefindelement.c	\
 	gstmultiqueue.c
 
-libgstcoreelements_la_CFLAGS = $(GST_OBJ_CFLAGS)
+libgstcoreelements_la_CPPFLAGS = $(GST_OBJ_CFLAGS)
 libgstcoreelements_la_LIBADD = \
 	$(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \
 	$(GST_OBJ_LIBS)
Index: plugins/indexers/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/plugins/indexers/Makefile.am,v
retrieving revision 1.16
diff -u -r1.16 Makefile.am
--- plugins/indexers/Makefile.am	13 Oct 2008 16:47:51 -0000	1.16
+++ plugins/indexers/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -16,7 +16,7 @@
 
 libgstcoreindexers_la_DEPENDENCIES = $(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la
 libgstcoreindexers_la_SOURCES = gstindexers.c gstmemindex.c $(GST_LOADSAVE_SRC)
-libgstcoreindexers_la_CFLAGS = $(GST_OBJ_CFLAGS)
+libgstcoreindexers_la_CPPFLAGS = $(GST_OBJ_CFLAGS)
 libgstcoreindexers_la_LIBADD = $(GST_OBJ_LIBS) $(GST_FILEINDEX_LIBS)
 libgstcoreindexers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstcoreindexers_la_LIBTOOLFLAGS = --tag=disable-static
Index: tests/benchmarks/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/benchmarks/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- tests/benchmarks/Makefile.am	28 Feb 2008 15:25:59 -0000	1.2
+++ tests/benchmarks/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -1,4 +1,4 @@
 noinst_PROGRAMS = caps mass-elements complexity gstpollstress
 
 LDADD = $(GST_OBJ_LIBS)
-AM_CFLAGS = $(GST_OBJ_CFLAGS)
+AM_CPPFLAGS = $(GST_OBJ_CFLAGS)
Index: tests/check/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/check/Makefile.am,v
retrieving revision 1.138
diff -u -r1.138 Makefile.am
--- tests/check/Makefile.am	7 Oct 2008 15:12:20 -0000	1.138
+++ tests/check/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -136,20 +136,20 @@
 EXTRA_DIST = \
 	libs/test_transform.c
 
-AM_CFLAGS = $(GST_OBJ_CFLAGS) $(CHECK_CFLAGS)
+AM_CPPFLAGS = $(GST_OBJ_CFLAGS) $(CHECK_CFLAGS)
 LDADD = $(top_builddir)/libs/gst/check/libgstcheck-@GST_MAJORMINOR@.la \
 	$(GST_OBJ_LIBS) \
 	$(CHECK_LIBS)
 
 libs_gdp_SOURCES = \
 	libs/gdp.c
-libs_gdp_CFLAGS = $(AM_CFLAGS)
+libs_gdp_CPPFLAGS = $(AM_CPPFLAGS)
 libs_gdp_LDADD = \
 	$(top_builddir)/libs/gst/dataprotocol/libgstdataprotocol-@GST_MAJORMINOR@.la \
 	$(LDADD)
 
-elements_fdsrc_CFLAGS=$(GST_OBJ_CFLAGS) $(CHECK_CFLAGS) -DTESTFILE=\"$(top_srcdir)/configure.ac\"
-elements_filesrc_CFLAGS=$(GST_OBJ_CFLAGS) $(CHECK_CFLAGS) -DTESTFILE=\"$(top_srcdir)/configure.ac\"
+elements_fdsrc_CPPFLAGS=$(GST_OBJ_CFLAGS) $(CHECK_CFLAGS) -DTESTFILE=\"$(top_srcdir)/configure.ac\"
+elements_filesrc_CPPFLAGS=$(GST_OBJ_CFLAGS) $(CHECK_CFLAGS) -DTESTFILE=\"$(top_srcdir)/configure.ac\"
 
 libs_basesrc_LDADD = \
 	$(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \
Index: tests/examples/adapter/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/examples/adapter/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- tests/examples/adapter/Makefile.am	9 Nov 2006 14:38:59 -0000	1.1
+++ tests/examples/adapter/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -1,4 +1,4 @@
 noinst_PROGRAMS = adapter_test
 
 adapter_test_LDADD = $(GST_OBJ_LIBS) $(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la
-adapter_test_CFLAGS = $(GST_OBJ_CFLAGS)
+adapter_test_CPPFLAGS = $(GST_OBJ_CFLAGS)
Index: tests/examples/controller/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/examples/controller/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- tests/examples/controller/Makefile.am	12 Dec 2005 14:02:14 -0000	1.1
+++ tests/examples/controller/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -1,5 +1,4 @@
 noinst_PROGRAMS = audio-example
 
-audio_example_CFLAGS  = $(GST_OBJ_CFLAGS) -I$(top_builddir)/libs
-audio_example_LDADD = $(GST_OBJ_LIBS)
-audio_example_LDFLAGS = $(top_builddir)/libs/gst/controller/libgstcontroller-@GST_MAJORMINOR@.la
+audio_example_CPPFLAGS  = -I$(top_builddir)/libs $(GST_OBJ_CFLAGS)
+audio_example_LDADD = $(top_builddir)/libs/gst/controller/libgstcontroller-@GST_MAJORMINOR@.la $(GST_OBJ_LIBS)
Index: tests/examples/helloworld/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/examples/helloworld/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- tests/examples/helloworld/Makefile.am	12 Dec 2005 14:02:14 -0000	1.1
+++ tests/examples/helloworld/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -1,4 +1,4 @@
 noinst_PROGRAMS = helloworld
 
 helloworld_LDADD = $(GST_OBJ_LIBS)
-helloworld_CFLAGS = $(GST_OBJ_CFLAGS)
+helloworld_CPPFLAGS = $(GST_OBJ_CFLAGS)
Index: tests/examples/launch/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/examples/launch/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- tests/examples/launch/Makefile.am	12 Dec 2005 14:46:06 -0000	1.2
+++ tests/examples/launch/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -1,7 +1,7 @@
 noinst_PROGRAMS = mp3parselaunch
 
 mp3parselaunch_LDADD = $(GST_OBJ_LIBS)
-mp3parselaunch_CFLAGS = $(GST_OBJ_CFLAGS)
+mp3parselaunch_CPPFLAGS = $(GST_OBJ_CFLAGS)
 
 #noinst_SCRIPTS = mp3play
 #EXTRA_DIST = mp3play
Index: tests/examples/manual/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/examples/manual/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- tests/examples/manual/Makefile.am	20 Sep 2007 07:42:35 -0000	1.4
+++ tests/examples/manual/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -13,7 +13,7 @@
 INCLUDES = $(GST_OBJ_CFLAGS)
 
 # gnome_LDADD = $(GST_OBJ_LIBS) $(LIBGNOMEUI_LIBS)
-# gnome_CFLAGS = $(GST_OBJ_CFLAGS) $(LIBGNOMEUI_CFLAGS)
+# gnome_CPPFLAGS = $(GST_OBJ_CFLAGS) $(LIBGNOMEUI_CFLAGS)
 
 CHECK_REGISTRY = $(top_builddir)/tests/examples/manual/test-registry.reg
 
Index: tests/examples/metadata/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/examples/metadata/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- tests/examples/metadata/Makefile.am	12 Dec 2005 14:02:15 -0000	1.1
+++ tests/examples/metadata/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -1,4 +1,4 @@
 noinst_PROGRAMS = read-metadata
 
 read_metadata_LDADD = $(GST_OBJ_LIBS)
-read_metadata_CFLAGS = $(GST_OBJ_CFLAGS)
+read_metadata_CPPFLAGS = $(GST_OBJ_CFLAGS)
Index: tests/examples/queue/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/examples/queue/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- tests/examples/queue/Makefile.am	12 Dec 2005 14:02:15 -0000	1.1
+++ tests/examples/queue/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -1,5 +1,5 @@
 noinst_PROGRAMS = queue
 
 queue_LDADD = $(GST_OBJ_LIBS)
-queue_CFLAGS = $(GST_OBJ_CFLAGS)
+queue_CPPFLAGS = $(GST_OBJ_CFLAGS)
 
Index: tests/examples/typefind/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/examples/typefind/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- tests/examples/typefind/Makefile.am	12 Dec 2005 14:02:15 -0000	1.1
+++ tests/examples/typefind/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -1,5 +1,5 @@
 noinst_PROGRAMS = typefind
 
 typefind_LDADD = $(GST_OBJ_LIBS)
-typefind_CFLAGS = $(GST_OBJ_CFLAGS)
+typefind_CPPFLAGS = $(GST_OBJ_CFLAGS)
 
Index: tests/examples/xml/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/examples/xml/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- tests/examples/xml/Makefile.am	12 Dec 2005 14:02:15 -0000	1.1
+++ tests/examples/xml/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -1,7 +1,7 @@
 noinst_PROGRAMS = createxml runxml
 
 createxml_LDADD = $(GST_OBJ_LIBS)
-createxml_CFLAGS = $(GST_OBJ_CFLAGS)
+createxml_CPPFLAGS = $(GST_OBJ_CFLAGS)
 runxml_LDADD = $(GST_OBJ_LIBS)
-runxml_CFLAGS = $(GST_OBJ_CFLAGS)
+runxml_CPPFLAGS = $(GST_OBJ_CFLAGS)
 
Index: tests/old/examples/appreader/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/old/examples/appreader/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- tests/old/examples/appreader/Makefile.am	4 May 2004 12:38:19 -0000	1.2
+++ tests/old/examples/appreader/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -1,5 +1,5 @@
 noinst_PROGRAMS = appreader
 
 appreader_LDADD = $(GST_OBJ_LIBS)
-appreader_CFLAGS = $(GST_OBJ_CFLAGS)
+appreader_CPPFLAGS = $(GST_OBJ_CFLAGS)
 
Index: tests/old/examples/cutter/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/old/examples/cutter/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- tests/old/examples/cutter/Makefile.am	4 May 2004 12:38:19 -0000	1.4
+++ tests/old/examples/cutter/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -2,4 +2,4 @@
 noinst_HEADERS = cutter.h
 
 cutter_LDADD = $(GST_OBJ_LIBS)
-cutter_CFLAGS = $(GST_OBJ_CFLAGS)
+cutter_CPPFLAGS = $(GST_OBJ_CFLAGS)
Index: tests/old/examples/events/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/old/examples/events/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- tests/old/examples/events/Makefile.am	4 May 2004 12:38:19 -0000	1.3
+++ tests/old/examples/events/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -1,4 +1,4 @@
 noinst_PROGRAMS = seek
 
 LDADD = $(GST_OBJ_LIBS)
-AM_CFLAGS = $(GST_OBJ_CFLAGS)
+AM_CPPFLAGS = $(GST_OBJ_CFLAGS)
Index: tests/old/examples/helloworld2/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/old/examples/helloworld2/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- tests/old/examples/helloworld2/Makefile.am	4 May 2004 12:38:19 -0000	1.6
+++ tests/old/examples/helloworld2/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -1,5 +1,5 @@
 noinst_PROGRAMS = helloworld2
 
 helloworld2_LDADD = $(GST_OBJ_LIBS)
-helloworld2_CFLAGS = $(GST_OBJ_CFLAGS)
+helloworld2_CPPFLAGS = $(GST_OBJ_CFLAGS)
 
Index: tests/old/examples/manual/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/old/examples/manual/Makefile.am,v
retrieving revision 1.21
diff -u -r1.21 Makefile.am
--- tests/old/examples/manual/Makefile.am	12 Dec 2005 14:02:16 -0000	1.21
+++ tests/old/examples/manual/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -12,12 +12,12 @@
 
 INCLUDES = $(GST_OBJ_CFLAGS)
 
-goption_CFLAGS = -DGETTEXT_PACKAGE="\"gstreamer-0.9\""
+goption_CPPFLAGS = -DGETTEXT_PACKAGE="\"gstreamer-0.9\""
 
 #dynamic_LDADD = $(GST_OBJ_LIBS) $(LIBGNOMEUI_LIBS)
-#dynamic_CFLAGS = $(GST_OBJ_CFLAGS) $(LIBGNOMEUI_CFLAGS)
+#dynamic_CPPFLAGS = $(GST_OBJ_CFLAGS) $(LIBGNOMEUI_CFLAGS)
 gnome_LDADD = $(GST_OBJ_LIBS) $(LIBGNOMEUI_LIBS)
-gnome_CFLAGS = $(GST_OBJ_CFLAGS) $(LIBGNOMEUI_CFLAGS)
+gnome_CPPFLAGS = $(GST_OBJ_CFLAGS) $(LIBGNOMEUI_CFLAGS)
 
 EXTRA_DIST = extract.pl
 
Index: tests/old/examples/mixer/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/old/examples/mixer/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- tests/old/examples/mixer/Makefile.am	4 May 2004 12:38:30 -0000	1.5
+++ tests/old/examples/mixer/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -2,4 +2,4 @@
 noinst_HEADERS = mixer.h
 
 mixer_LDADD = $(GST_OBJ_LIBS)
-mixer_CFLAGS = $(GST_OBJ_CFLAGS)
+mixer_CPPFLAGS = $(GST_OBJ_CFLAGS)
Index: tests/old/examples/pingpong/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/old/examples/pingpong/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- tests/old/examples/pingpong/Makefile.am	4 May 2004 12:38:30 -0000	1.2
+++ tests/old/examples/pingpong/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -1,5 +1,5 @@
 noinst_PROGRAMS = pingpong
 
 pingpong_LDADD = $(GST_OBJ_LIBS)
-pingpong_CFLAGS = $(GST_OBJ_CFLAGS)
+pingpong_CPPFLAGS = $(GST_OBJ_CFLAGS)
 
Index: tests/old/examples/plugins/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/old/examples/plugins/Makefile.am,v
retrieving revision 1.12
diff -u -r1.12 Makefile.am
--- tests/old/examples/plugins/Makefile.am	4 May 2004 12:38:30 -0000	1.12
+++ tests/old/examples/plugins/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -2,7 +2,7 @@
 plugin_LTLIBRARIES = libgstexample.la 
 
 libgstexample_la_SOURCES = example.c
-libgstexample_la_CFLAGS = $(GST_OBJ_CFLAGS)
+libgstexample_la_CPPFLAGS = $(GST_OBJ_CFLAGS)
 libgstexample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = example.h 
Index: tests/old/examples/queue2/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/old/examples/queue2/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- tests/old/examples/queue2/Makefile.am	4 May 2004 12:38:31 -0000	1.6
+++ tests/old/examples/queue2/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -1,5 +1,5 @@
 noinst_PROGRAMS = queue2
 
 queue2_LDADD = $(GST_OBJ_LIBS)
-queue2_CFLAGS = $(GST_OBJ_CFLAGS)
+queue2_CPPFLAGS = $(GST_OBJ_CFLAGS)
 
Index: tests/old/examples/queue3/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/old/examples/queue3/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- tests/old/examples/queue3/Makefile.am	4 May 2004 12:38:31 -0000	1.6
+++ tests/old/examples/queue3/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -1,5 +1,5 @@
 noinst_PROGRAMS = queue3
 
 queue3_LDADD = $(GST_OBJ_LIBS)
-queue3_CFLAGS = $(GST_OBJ_CFLAGS)
+queue3_CPPFLAGS = $(GST_OBJ_CFLAGS)
 
Index: tests/old/examples/queue4/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/old/examples/queue4/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- tests/old/examples/queue4/Makefile.am	4 May 2004 12:38:31 -0000	1.6
+++ tests/old/examples/queue4/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -1,5 +1,5 @@
 noinst_PROGRAMS = queue4
 
 queue4_LDADD = $(GST_OBJ_LIBS)
-queue4_CFLAGS = $(GST_OBJ_CFLAGS)
+queue4_CPPFLAGS = $(GST_OBJ_CFLAGS)
 
Index: tests/old/examples/retag/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/old/examples/retag/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- tests/old/examples/retag/Makefile.am	4 May 2004 12:38:31 -0000	1.2
+++ tests/old/examples/retag/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -1,7 +1,7 @@
 noinst_PROGRAMS = retag transcode
 
 retag_LDADD = $(GST_OBJ_LIBS) 
-retag_CFLAGS = $(GST_OBJ_CFLAGS)
+retag_CPPFLAGS = $(GST_OBJ_CFLAGS)
 
 transcode_LDADD = $(GST_OBJ_LIBS)
-transcode_CFLAGS = $(GST_OBJ_CFLAGS)
+transcode_CPPFLAGS = $(GST_OBJ_CFLAGS)
Index: tests/old/examples/thread/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/old/examples/thread/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- tests/old/examples/thread/Makefile.am	4 May 2004 12:38:31 -0000	1.7
+++ tests/old/examples/thread/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -1,5 +1,5 @@
 noinst_PROGRAMS = thread
 
 thread_LDADD = $(GST_OBJ_LIBS)
-thread_CFLAGS = $(GST_OBJ_CFLAGS)
+thread_CPPFLAGS = $(GST_OBJ_CFLAGS)
 
Index: tests/old/testsuite/Rules
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/old/testsuite/Rules,v
retrieving revision 1.10
diff -u -r1.10 Rules
--- tests/old/testsuite/Rules	2 Jul 2004 10:15:14 -0000	1.10
+++ tests/old/testsuite/Rules	12 Dec 2008 05:06:10 -0000
@@ -21,7 +21,7 @@
 	$(tests_pass) $(tests_fail)
 XFAIL_TESTS = $(tests_fail)
 
-AM_CFLAGS = $(GST_OBJ_CFLAGS)
+AM_CPPFLAGS = $(GST_OBJ_CFLAGS)
 LIBS = $(GST_OBJ_LIBS)
 
 # override to _not_ install the test plugins
Index: tests/old/testsuite/dlopen/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/old/testsuite/dlopen/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- tests/old/testsuite/dlopen/Makefile.am	28 Jul 2004 11:43:01 -0000	1.3
+++ tests/old/testsuite/dlopen/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -8,11 +8,11 @@
 tests_ignore =
 
 libloadgst_la_SOURCES = loadgst.c
-libloadgst_la_CFLAGS = $(GST_OBJ_CFLAGS)
+libloadgst_la_CPPFLAGS = $(GST_OBJ_CFLAGS)
 libloadgst_la_LDFLAGS = -module -avoid-version $(GST_OBJ_LIBS)
 
-dlopen_gst_CFLAGS = $(GLIB_CFLAGS)
-dlopen_gst_LDFLAGS = $(GLIB_LIBS)
+dlopen_gst_CPPFLAGS = $(GLIB_CFLAGS)
+dlopen_gst_LDADD = $(GLIB_LIBS)
 
 TESTS_ENVIRONMENT= \
 	G_DEBUG=fatal_warnings \
Index: tests/old/testsuite/plugin/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/old/testsuite/plugin/Makefile.am,v
retrieving revision 1.31
diff -u -r1.31 Makefile.am
--- tests/old/testsuite/plugin/Makefile.am	28 Jul 2004 11:43:02 -0000	1.31
+++ tests/old/testsuite/plugin/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -7,10 +7,10 @@
 tests_ignore =
 
 libtestplugin_la_SOURCES = testplugin.c
-libtestplugin_la_CFLAGS = $(GST_OBJ_CFLAGS)
+libtestplugin_la_CPPFLAGS = $(GST_OBJ_CFLAGS)
 libtestplugin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libtestplugin2_la_SOURCES = testplugin2.c
-libtestplugin2_la_CFLAGS = $(GST_OBJ_CFLAGS)
+libtestplugin2_la_CPPFLAGS = $(GST_OBJ_CFLAGS)
 libtestplugin2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 linked_LIBS = libtestplugin.la libtestplugin2.la
Index: tests/old/testsuite/threads/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/old/testsuite/threads/Makefile.am,v
retrieving revision 1.30
diff -u -r1.30 Makefile.am
--- tests/old/testsuite/threads/Makefile.am	1 Feb 2005 13:20:42 -0000	1.30
+++ tests/old/testsuite/threads/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -8,26 +8,26 @@
 tests_ignore = queue threadb threadc threadd staticrec threadi-nfy1 threadi-nfy2
 
 thread1_SOURCES = thread.c
-thread1_CFLAGS = -DTESTNUM=1 $(AM_CFLAGS)
+thread1_CPPFLAGS = -DTESTNUM=1 $(AM_CPPFLAGS)
 thread2_SOURCES = thread.c
-thread2_CFLAGS = -DTESTNUM=2 $(AM_CFLAGS)
+thread2_CPPFLAGS = -DTESTNUM=2 $(AM_CPPFLAGS)
 thread3_SOURCES = thread.c
-thread3_CFLAGS = -DTESTNUM=3 $(AM_CFLAGS)
+thread3_CPPFLAGS = -DTESTNUM=3 $(AM_CPPFLAGS)
 thread4_SOURCES = thread.c
-thread4_CFLAGS = -DTESTNUM=4 $(AM_CFLAGS)
+thread4_CPPFLAGS = -DTESTNUM=4 $(AM_CPPFLAGS)
 thread5_SOURCES = thread.c
-thread5_CFLAGS = -DTESTNUM=5 $(AM_CFLAGS)
+thread5_CPPFLAGS = -DTESTNUM=5 $(AM_CPPFLAGS)
 
 signal1_SOURCES = signals.c
-signal1_CFLAGS = -DTESTNUM=1 $(AM_CFLAGS)
+signal1_CPPFLAGS = -DTESTNUM=1 $(AM_CPPFLAGS)
 signal2_SOURCES = signals.c
-signal2_CFLAGS = -DTESTNUM=2 $(AM_CFLAGS)
+signal2_CPPFLAGS = -DTESTNUM=2 $(AM_CPPFLAGS)
 signal3_SOURCES = signals.c
-signal3_CFLAGS = -DTESTNUM=3 $(AM_CFLAGS)
+signal3_CPPFLAGS = -DTESTNUM=3 $(AM_CPPFLAGS)
 
 threadi_123775_SOURCES = threadi.c
-threadi_123775_CFLAGS = -DTESTNUM=123775 $(AM_CFLAGS)
+threadi_123775_CPPFLAGS = -DTESTNUM=123775 $(AM_CPPFLAGS)
 threadi_nfy1_SOURCES = threadi.c
-threadi_nfy1_CFLAGS = -DTESTNUM=999998 $(AM_CFLAGS)
+threadi_nfy1_CPPFLAGS = -DTESTNUM=999998 $(AM_CPPFLAGS)
 threadi_nfy2_SOURCES = threadi.c
-threadi_nfy2_CFLAGS = -DTESTNUM=999999 $(AM_CFLAGS)
+threadi_nfy2_CPPFLAGS = -DTESTNUM=999999 $(AM_CPPFLAGS)
Index: tools/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tools/Makefile.am,v
retrieving revision 1.72
diff -u -r1.72 Makefile.am
--- tools/Makefile.am	2 May 2007 17:09:30 -0000	1.72
+++ tools/Makefile.am	12 Dec 2008 05:06:10 -0000
@@ -38,25 +38,25 @@
 # make sure each versioned tool has the right source file and flags
 if !GST_DISABLE_LOADSAVE
 gst_xmllaunch_@GST_MAJORMINOR@_SOURCES = gst-launch.c tools.h
-gst_xmllaunch_@GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS)
-gst_xmllaunch_@GST_MAJORMINOR@_LDFLAGS = $(GST_OBJ_LIBS)
+gst_xmllaunch_@GST_MAJORMINOR@_CPPFLAGS = $(GST_OBJ_CFLAGS)
+gst_xmllaunch_@GST_MAJORMINOR@_LDADD = $(GST_OBJ_LIBS)
 endif
 
 if !GST_DISABLE_PARSE
 gst_launch_@GST_MAJORMINOR@_SOURCES = gst-launch.c tools.h
-gst_launch_@GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS)
-gst_launch_@GST_MAJORMINOR@_LDFLAGS = $(GST_OBJ_LIBS)
+gst_launch_@GST_MAJORMINOR@_CPPFLAGS = $(GST_OBJ_CFLAGS)
+gst_launch_@GST_MAJORMINOR@_LDADD = $(GST_OBJ_LIBS)
 endif
 
 gst_inspect_@GST_MAJORMINOR@_SOURCES = gst-inspect.c tools.h
-gst_inspect_@GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS)
-gst_inspect_@GST_MAJORMINOR@_LDFLAGS = $(GST_OBJ_LIBS)
+gst_inspect_@GST_MAJORMINOR@_CPPFLAGS = $(GST_OBJ_CFLAGS)
+gst_inspect_@GST_MAJORMINOR@_LDADD = $(GST_OBJ_LIBS)
 gst_typefind_@GST_MAJORMINOR@_SOURCES = gst-typefind.c tools.h
-gst_typefind_@GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS)
-gst_typefind_@GST_MAJORMINOR@_LDFLAGS = $(GST_OBJ_LIBS)
+gst_typefind_@GST_MAJORMINOR@_CPPFLAGS = $(GST_OBJ_CFLAGS)
+gst_typefind_@GST_MAJORMINOR@_LDADD = $(GST_OBJ_LIBS)
 gst_xmlinspect_@GST_MAJORMINOR@_SOURCES = gst-xmlinspect.c tools.h
-gst_xmlinspect_@GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS)
-gst_xmlinspect_@GST_MAJORMINOR@_LDFLAGS = $(GST_OBJ_LIBS)
+gst_xmlinspect_@GST_MAJORMINOR@_CPPFLAGS = $(GST_OBJ_CFLAGS)
+gst_xmlinspect_@GST_MAJORMINOR@_LDADD = $(GST_OBJ_LIBS)
 
 gst-feedback-@GST_MAJORMINOR@: gst-feedback-m.m
 	cp $(srcdir)/gst-feedback-m.m $@
@@ -77,9 +77,7 @@
 gst_xmlinspect_SOURCES = gst-run.c
 
 # CFLAGS and libs for nonversioned frontend binaries
-AM_CFLAGS = $(GLIB_ONLY_CFLAGS)
 LDADD = $(GLIB_ONLY_LIBS)
-# due to depcomp not using AM_CFLAGS for rh9/yd3, we also set AM_CPPFLAGS
 AM_CPPFLAGS = $(GLIB_ONLY_CFLAGS)
 
 ### man pages we want to install
