diff -Nurd -x'*~' gstreamer-0.10.35.orig/configure.ac gstreamer-0.10.35/configure.ac
--- gstreamer-0.10.35.orig/configure.ac	2011-06-15 13:49:21.000000000 -0400
+++ gstreamer-0.10.35/configure.ac	2015-02-14 16:56:21.000000000 -0500
@@ -9,7 +9,7 @@
 AG_GST_INIT
 
 dnl initialize automake (we require GNU make)
-AM_INIT_AUTOMAKE([-Wno-portability 1.10])
+AM_INIT_AUTOMAKE([-Wno-portability 1.10 subdir-objects])
 
 dnl define PACKAGE_VERSION_* variables
 AS_VERSION
@@ -68,7 +68,6 @@
 
 dnl set up gettext
 dnl the version check needs to stay here because autopoint greps for it
-AM_GNU_GETTEXT_VERSION([0.17])
 AM_GNU_GETTEXT([external])
 AG_GST_GETTEXT([gstreamer-$GST_MAJORMINOR])
 
diff -Nurd -x'*~' gstreamer-0.10.35.orig/docs/plugins/Makefile.am gstreamer-0.10.35/docs/plugins/Makefile.am
--- gstreamer-0.10.35.orig/docs/plugins/Makefile.am	2011-06-13 18:35:22.000000000 -0400
+++ gstreamer-0.10.35/docs/plugins/Makefile.am	2015-02-14 16:54:45.000000000 -0500
@@ -108,7 +108,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) --tag=CC --mode=compile $(CC)
diff -Nurd -x'*~' gstreamer-0.10.35.orig/gst/Makefile.am gstreamer-0.10.35/gst/Makefile.am
--- gstreamer-0.10.35.orig/gst/Makefile.am	2011-06-13 18:35:23.000000000 -0400
+++ gstreamer-0.10.35/gst/Makefile.am	2015-02-14 16:54:45.000000000 -0500
@@ -121,7 +121,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 		\
diff -Nurd -x'*~' gstreamer-0.10.35.orig/libs/gst/base/Makefile.am gstreamer-0.10.35/libs/gst/base/Makefile.am
--- gstreamer-0.10.35.orig/libs/gst/base/Makefile.am	2011-06-13 18:35:30.000000000 -0400
+++ gstreamer-0.10.35/libs/gst/base/Makefile.am	2015-02-14 16:54:45.000000000 -0500
@@ -16,7 +16,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)
 
diff -Nurd -x'*~' gstreamer-0.10.35.orig/libs/gst/check/Makefile.am gstreamer-0.10.35/libs/gst/check/Makefile.am
--- gstreamer-0.10.35.orig/libs/gst/check/Makefile.am	2011-06-13 18:35:31.000000000 -0400
+++ gstreamer-0.10.35/libs/gst/check/Makefile.am	2015-02-14 16:54:45.000000000 -0500
@@ -13,7 +13,7 @@
 	gstcheck.c				\
 	gstconsistencychecker.c
 
-libgstcheck_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) \
+libgstcheck_@GST_MAJORMINOR@_la_CPPFLAGS = $(GST_OBJ_CFLAGS) \
 	-I$(top_builddir)/libs \
 	-I$(top_builddir)/libs/gst/check \
 	-I$(top_builddir)/libs/gst/check/libcheck
diff -Nurd -x'*~' gstreamer-0.10.35.orig/libs/gst/controller/Makefile.am gstreamer-0.10.35/libs/gst/controller/Makefile.am
--- gstreamer-0.10.35.orig/libs/gst/controller/Makefile.am	2011-06-13 18:35:31.000000000 -0400
+++ gstreamer-0.10.35/libs/gst/controller/Makefile.am	2015-02-14 16:54:45.000000000 -0500
@@ -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)
 
diff -Nurd -x'*~' gstreamer-0.10.35.orig/libs/gst/dataprotocol/Makefile.am gstreamer-0.10.35/libs/gst/dataprotocol/Makefile.am
--- gstreamer-0.10.35.orig/libs/gst/dataprotocol/Makefile.am	2011-06-13 18:35:31.000000000 -0400
+++ gstreamer-0.10.35/libs/gst/dataprotocol/Makefile.am	2015-02-14 16:54:45.000000000 -0500
@@ -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)
 
diff -Nurd -x'*~' gstreamer-0.10.35.orig/libs/gst/net/Makefile.am gstreamer-0.10.35/libs/gst/net/Makefile.am
--- gstreamer-0.10.35.orig/libs/gst/net/Makefile.am	2011-06-13 18:35:32.000000000 -0400
+++ gstreamer-0.10.35/libs/gst/net/Makefile.am	2015-02-14 16:54:45.000000000 -0500
@@ -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)
 
diff -Nurd -x'*~' gstreamer-0.10.35.orig/plugins/elements/Makefile.am gstreamer-0.10.35/plugins/elements/Makefile.am
--- gstreamer-0.10.35.orig/plugins/elements/Makefile.am	2011-06-13 18:35:32.000000000 -0400
+++ gstreamer-0.10.35/plugins/elements/Makefile.am	2015-02-14 16:54:45.000000000 -0500
@@ -22,7 +22,7 @@
 	gsttypefindelement.c	\
 	gstvalve.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)
diff -Nurd -x'*~' gstreamer-0.10.35.orig/plugins/indexers/Makefile.am gstreamer-0.10.35/plugins/indexers/Makefile.am
--- gstreamer-0.10.35.orig/plugins/indexers/Makefile.am	2011-06-13 18:35:33.000000000 -0400
+++ gstreamer-0.10.35/plugins/indexers/Makefile.am	2015-02-14 16:54:45.000000000 -0500
@@ -19,7 +19,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
diff -Nurd -x'*~' gstreamer-0.10.35.orig/tests/benchmarks/Makefile.am gstreamer-0.10.35/tests/benchmarks/Makefile.am
--- gstreamer-0.10.35.orig/tests/benchmarks/Makefile.am	2011-06-13 18:35:34.000000000 -0400
+++ gstreamer-0.10.35/tests/benchmarks/Makefile.am	2015-02-14 16:54:45.000000000 -0500
@@ -10,7 +10,7 @@
 	gstbufferstress
 
 LDADD = $(GST_OBJ_LIBS)
-AM_CFLAGS = $(GST_OBJ_CFLAGS)
+AM_CPPFLAGS = $(GST_OBJ_CFLAGS)
 
 controller_CFLAGS  = $(GST_OBJ_CFLAGS) -I$(top_builddir)/libs
 controller_LDADD = $(top_builddir)/libs/gst/controller/libgstcontroller-@GST_MAJORMINOR@.la $(LDADD)
diff -Nurd -x'*~' gstreamer-0.10.35.orig/tests/check/Makefile.am gstreamer-0.10.35/tests/check/Makefile.am
--- gstreamer-0.10.35.orig/tests/check/Makefile.am	2011-06-13 18:35:35.000000000 -0400
+++ gstreamer-0.10.35/tests/check/Makefile.am	2015-02-14 16:54:45.000000000 -0500
@@ -160,7 +160,7 @@
 EXTRA_DIST = \
 	libs/test_transform.c
 
-AM_CFLAGS = $(GST_OBJ_CFLAGS) -UG_DISABLE_ASSERT -UG_DISABLE_CAST_CHECKS
+AM_CPPFLAGS = $(GST_OBJ_CFLAGS) -UG_DISABLE_ASSERT -UG_DISABLE_CAST_CHECKS
 AM_CXXFLAGS = $(GST_OBJ_CXXFLAGS) -UG_DISABLE_ASSERT -UG_DISABLE_CAST_CHECKS
 LDADD = $(top_builddir)/libs/gst/check/libgstcheck-@GST_MAJORMINOR@.la \
 	$(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \
@@ -178,9 +178,9 @@
 	$(top_builddir)/libs/gst/dataprotocol/libgstdataprotocol-@GST_MAJORMINOR@.la \
 	$(LDADD)
 
-elements_fdsrc_CFLAGS=$(GST_OBJ_CFLAGS) $(AM_CFLAGS) \
+elements_fdsrc_CPPFLAGS=$(GST_OBJ_CFLAGS) $(AM_CPPFLAGS) \
 	-DTESTFILE=\"$(top_srcdir)/configure.ac\"
-elements_filesrc_CFLAGS=$(GST_OBJ_CFLAGS) $(AM_CFLAGS) \
+elements_filesrc_CPPFLAGS=$(GST_OBJ_CFLAGS) $(AM_CPPFLAGS) \
 	-DTESTFILE=\"$(top_srcdir)/configure.ac\"
 
 libs_controller_LDADD = \
diff -Nurd -x'*~' gstreamer-0.10.35.orig/tests/examples/adapter/Makefile.am gstreamer-0.10.35/tests/examples/adapter/Makefile.am
--- gstreamer-0.10.35.orig/tests/examples/adapter/Makefile.am	2011-06-13 18:35:42.000000000 -0400
+++ gstreamer-0.10.35/tests/examples/adapter/Makefile.am	2015-02-14 16:54:45.000000000 -0500
@@ -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)
diff -Nurd -x'*~' gstreamer-0.10.35.orig/tests/examples/controller/Makefile.am gstreamer-0.10.35/tests/examples/controller/Makefile.am
--- gstreamer-0.10.35.orig/tests/examples/controller/Makefile.am	2011-06-13 18:35:42.000000000 -0400
+++ gstreamer-0.10.35/tests/examples/controller/Makefile.am	2015-02-14 16:54:45.000000000 -0500
@@ -1,6 +1,6 @@
 noinst_PROGRAMS = audio-example
 
-audio_example_CFLAGS  = $(GST_OBJ_CFLAGS) -I$(top_builddir)/libs
+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)
diff -Nurd -x'*~' gstreamer-0.10.35.orig/tests/examples/helloworld/Makefile.am gstreamer-0.10.35/tests/examples/helloworld/Makefile.am
--- gstreamer-0.10.35.orig/tests/examples/helloworld/Makefile.am	2011-06-13 18:35:42.000000000 -0400
+++ gstreamer-0.10.35/tests/examples/helloworld/Makefile.am	2015-02-14 16:54:45.000000000 -0500
@@ -1,4 +1,4 @@
 noinst_PROGRAMS = helloworld
 
 helloworld_LDADD = $(GST_OBJ_LIBS)
-helloworld_CFLAGS = $(GST_OBJ_CFLAGS)
+helloworld_CPPFLAGS = $(GST_OBJ_CFLAGS)
diff -Nurd -x'*~' gstreamer-0.10.35.orig/tests/examples/launch/Makefile.am gstreamer-0.10.35/tests/examples/launch/Makefile.am
--- gstreamer-0.10.35.orig/tests/examples/launch/Makefile.am	2011-06-13 18:35:42.000000000 -0400
+++ gstreamer-0.10.35/tests/examples/launch/Makefile.am	2015-02-14 16:54:45.000000000 -0500
@@ -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
diff -Nurd -x'*~' gstreamer-0.10.35.orig/tests/examples/metadata/Makefile.am gstreamer-0.10.35/tests/examples/metadata/Makefile.am
--- gstreamer-0.10.35.orig/tests/examples/metadata/Makefile.am	2011-06-13 18:35:43.000000000 -0400
+++ gstreamer-0.10.35/tests/examples/metadata/Makefile.am	2015-02-14 16:54:45.000000000 -0500
@@ -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)
diff -Nurd -x'*~' gstreamer-0.10.35.orig/tests/examples/queue/Makefile.am gstreamer-0.10.35/tests/examples/queue/Makefile.am
--- gstreamer-0.10.35.orig/tests/examples/queue/Makefile.am	2011-06-13 18:35:43.000000000 -0400
+++ gstreamer-0.10.35/tests/examples/queue/Makefile.am	2015-02-14 16:54:45.000000000 -0500
@@ -1,5 +1,5 @@
 noinst_PROGRAMS = queue
 
 queue_LDADD = $(GST_OBJ_LIBS)
-queue_CFLAGS = $(GST_OBJ_CFLAGS)
+queue_CPPFLAGS = $(GST_OBJ_CFLAGS)
 
diff -Nurd -x'*~' gstreamer-0.10.35.orig/tests/examples/typefind/Makefile.am gstreamer-0.10.35/tests/examples/typefind/Makefile.am
--- gstreamer-0.10.35.orig/tests/examples/typefind/Makefile.am	2011-06-13 18:35:43.000000000 -0400
+++ gstreamer-0.10.35/tests/examples/typefind/Makefile.am	2015-02-14 16:54:45.000000000 -0500
@@ -1,5 +1,5 @@
 noinst_PROGRAMS = typefind
 
 typefind_LDADD = $(GST_OBJ_LIBS)
-typefind_CFLAGS = $(GST_OBJ_CFLAGS)
+typefind_CPPFLAGS = $(GST_OBJ_CFLAGS)
 
diff -Nurd -x'*~' gstreamer-0.10.35.orig/tools/Makefile.am gstreamer-0.10.35/tools/Makefile.am
--- gstreamer-0.10.35.orig/tools/Makefile.am	2011-06-13 18:35:44.000000000 -0400
+++ gstreamer-0.10.35/tools/Makefile.am	2015-02-14 16:54:45.000000000 -0500
@@ -38,24 +38,24 @@
 # 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) -UGST_DISABLE_DEPRECATED
+gst_xmllaunch_@GST_MAJORMINOR@_CPPFLAGS = $(GST_OBJ_CFLAGS) -UGST_DISABLE_DEPRECATED
 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) -UGST_DISABLE_DEPRECATED
+gst_launch_@GST_MAJORMINOR@_CPPFLAGS = $(GST_OBJ_CFLAGS) -UGST_DISABLE_DEPRECATED
 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@_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@_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@_CPPFLAGS = $(GST_OBJ_CFLAGS)
 gst_xmlinspect_@GST_MAJORMINOR@_LDADD = $(GST_OBJ_LIBS)
 
 gst-feedback-@GST_MAJORMINOR@: gst-feedback-m.m
@@ -77,7 +77,7 @@
 gst_xmlinspect_SOURCES = gst-run.c
 
 # CFLAGS and libs for nonversioned frontend binaries
-AM_CFLAGS = $(GLIB_ONLY_CFLAGS)
+#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)