From 8ad360670dab476777c02f26c8fb8a444c88e106 Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan@noraisin.net>
Date: Mon, 5 Oct 2009 11:02:16 +0100
Subject: [PATCH] Fix CFLAGS and LDFLAGS for dirac/schrodinger

Include the local headers and libs before ones outside this
module.
---
 ext/dirac/Makefile.am        |  8 ++++++--
 ext/schroedinger/Makefile.am | 10 +++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ext/dirac/Makefile.am b/ext/dirac/Makefile.am
index 4196091bf1..02f4a3998c 100644
--- a/ext/dirac/Makefile.am
+++ b/ext/dirac/Makefile.am
@@ -4,10 +4,14 @@ libgstdirac_la_SOURCES = \
 	gstdirac.cc \
 	gstdiracenc.cc
 
-libgstdirac_la_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(DIRAC_CFLAGS) \
+libgstdirac_la_CXXFLAGS = \
+        -I$(top_srcdir)/gst-libs/gst/video \
+        $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(DIRAC_CFLAGS) \
 	-DGST_USE_UNSTABLE_API
-libgstdirac_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
+libgstdirac_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_MAJORMINOR@.la \
+        $(GST_PLUGINS_BASE_LIBS) \
+        $(GST_BASE_LIBS) $(GST_LIBS) \
 	$(DIRAC_LIBS) -lz $(LIBM)
 libgstdirac_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstdirac_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/ext/schroedinger/Makefile.am b/ext/schroedinger/Makefile.am
index 6a895c5104..f1934b8333 100644
--- a/ext/schroedinger/Makefile.am
+++ b/ext/schroedinger/Makefile.am
@@ -11,16 +11,16 @@ libgstschro_la_SOURCES = \
 	gstschroparse.c \
 	gstschroutils.c
 libgstschro_la_CFLAGS = \
-	$(GST_CFLAGS) \
-        $(GST_BASE_CFLAGS) \
+        -I$(top_srcdir)/gst-libs/gst/video \
 	$(GST_PLUGINS_BASE_CFLAGS) \
+        $(GST_BASE_CFLAGS) \
+	$(GST_CFLAGS) \
 	-DGST_USE_UNSTABLE_API \
 	$(SCHRO_CFLAGS)
 libgstschro_la_LIBADD = \
-	$(GST_LIBS) \
-        $(GST_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \
 	$(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_MAJORMINOR@.la \
-	$(GST_PLUGINS_BASE_LIBS) \
+	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \
+        $(GST_BASE_LIBS) $(GST_LIBS) \
 	$(SCHRO_LIBS)
 libgstschro_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstschro_la_LIBTOOLFLAGS = --tag=disable-static