[gst-cvs] gst-plugins-bad: camerabin: fix link order

[Stefan Kost]

Module: gst-plugins-bad
Branch: master
Commit: 4d9a0e832cfc69c612e32902017390560024cd7e
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=4d9a0e832cfc69c612e32902017390560024cd7e

Author: Stefan Kost <ensonic at users.sf.net>
Date:   Fri Jun  5 21:17:55 2009 +0300

camerabin: fix link order

Move local version up in the link order.

---

 gst/camerabin/Makefile.am |    4 ++--
 tests/check/Makefile.am   |    7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/gst/camerabin/Makefile.am b/gst/camerabin/Makefile.am
index 4f38224..d5085da 100644
--- a/gst/camerabin/Makefile.am
+++ b/gst/camerabin/Makefile.am
@@ -25,9 +25,9 @@ nodist_libgstcamerabin_la_SOURCES = $(built_sources)
 libgstcamerabin_la_CFLAGS = \
 	$(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -DGST_USE_UNSTABLE_API
 libgstcamerabin_la_LIBADD = \
+	$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-$(GST_MAJORMINOR).la \
 	$(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
-	-lgstinterfaces-$(GST_MAJORMINOR)    \
-	$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-$(GST_MAJORMINOR).la
+	-lgstinterfaces-$(GST_MAJORMINOR)
 
 libgstcamerabin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstcamerabin_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index cbc228e..940d1f4 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -108,9 +108,10 @@ AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS)  $(GST_OPTION_
 LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS)
 
 elements_camerabin_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CHECK_CFLAGS)
-elements_camerabin_LDADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_CHECK_LIBS) \
-         -lgstinterfaces- at GST_MAJORMINOR@ \
-        $(top_builddir)/gst-libs/gst/interfaces/libgstphotography- at GST_MAJORMINOR@.la
+elements_camerabin_LDADD = \
+        $(top_builddir)/gst-libs/gst/interfaces/libgstphotography- at GST_MAJORMINOR@.la \
+        $(GST_LIBS) $(GST_BASE_LIBS) $(GST_CHECK_LIBS) \
+         -lgstinterfaces- at GST_MAJORMINOR@
 elements_camerabin_SOURCES = elements/camerabin.c
 
 elements_timidity_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS)