From: Edward Hervey <bilboed@bilboed.com>
Date: Mon, 5 Jul 2010 13:48:06 +0000 (+0200)
Subject: ext: Fix CFLAGS order
X-Git-Tag: RELEASE-0.10.11~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=00e177458cec1f0ab80299719aa2107d0c3e5aeb;p=platform%2Fupstream%2Fgst-libav.git

ext: Fix CFLAGS order

We'd pick up system-wide ffmpeg headers otherwise
---

diff --git a/ext/ffmpeg/Makefile.am b/ext/ffmpeg/Makefile.am
index 083f2657..3c028172 100644
--- a/ext/ffmpeg/Makefile.am
+++ b/ext/ffmpeg/Makefile.am
@@ -20,8 +20,7 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c	\
 # 	\
 # 			  gstffmpegscale.c
 
-libgstffmpeg_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
-	$(FFMPEG_CFLAGS)
+libgstffmpeg_la_CFLAGS = $(FFMPEG_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstffmpeg_la_LIBADD = $(FFMPEG_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LIBM) $(WIN32_LIBS) -lz $(BZ2_LIBS)
 libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS)
 libgstffmpeg_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/ext/libpostproc/Makefile.am b/ext/libpostproc/Makefile.am
index 1c4e7d82..e77dd008 100644
--- a/ext/libpostproc/Makefile.am
+++ b/ext/libpostproc/Makefile.am
@@ -2,8 +2,7 @@ plugin_LTLIBRARIES = libgstpostproc.la
 
 libgstpostproc_la_SOURCES = gstpostproc.c
 
-libgstpostproc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS) \
-	$(POSTPROC_CFLAGS)
+libgstpostproc_la_CFLAGS = $(POSTPROC_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS)
 libgstpostproc_la_LIBADD = -lgstvideo-@GST_MAJORMINOR@ \
 	$(POSTPROC_LIBS) \
 	$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(ORC_LIBS)
diff --git a/ext/libswscale/Makefile.am b/ext/libswscale/Makefile.am
index 9363a337..8bc2e35b 100644
--- a/ext/libswscale/Makefile.am
+++ b/ext/libswscale/Makefile.am
@@ -2,9 +2,8 @@ plugin_LTLIBRARIES = libgstffmpegscale.la
 
 libgstffmpegscale_la_SOURCES = gstffmpegscale.c
 
-libgstffmpegscale_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
-	$(GST_PLUGINS_BASE_CFLAGS) \
-	$(ORC_CFLAGS) $(SWSCALE_CFLAGS)
+libgstffmpegscale_la_CFLAGS = $(SWSCALE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) \
+	$(ORC_CFLAGS)
 libgstffmpegscale_la_LIBADD = $(SWSCALE_LIBS) \
 	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
 	$(GST_BASE_LIBS) $(ORC_LIBS) $(LIBM) -lz