tests: fix libs order in some makefiles
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 8 Aug 2011 13:16:39 +0000 (14:16 +0100)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 8 Aug 2011 13:16:39 +0000 (14:16 +0100)
Local libs should come first.

tests/examples/overlay/Makefile.am
tests/icles/Makefile.am

index 24404c6..31615b4 100644 (file)
@@ -7,8 +7,9 @@ EXAMPLES += gtk-videooverlay
 
 gtk_videooverlay_SOURCES = gtk-videooverlay.c
 gtk_videooverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS)
-gtk_videooverlay_LDADD = $(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS) \
-       $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la
+gtk_videooverlay_LDADD = \
+       $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
+       $(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS)
 endif
 
 if HAVE_QT
@@ -16,9 +17,9 @@ EXAMPLES += qt-videooverlay
 
 qt_videooverlay_SOURCES = qt-videooverlay.cpp
 qt_videooverlay_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(X_CFLAGS) $(QT_CFLAGS)
-qt_videooverlay_LDADD = $(GST_LIBS) $(X_LIBS) $(LIBM) $(QT_LIBS) \
-       $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la
-
+qt_videooverlay_LDADD = \
+       $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
+       $(GST_LIBS) $(X_LIBS) $(LIBM) $(QT_LIBS)
 endif
 
 if HAVE_QT_GV
@@ -26,8 +27,9 @@ EXAMPLES += qtgv-videooverlay
 
 qtgv_videooverlay_SOURCES = qtgv-videooverlay.cpp qtgv-videooverlay.h
 qtgv_videooverlay_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(X_CFLAGS) $(QT_CFLAGS)
-qtgv_videooverlay_LDADD = $(GST_LIBS) $(X_LIBS) $(LIBM) $(QT_LIBS) \
-       $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la
+qtgv_videooverlay_LDADD = \
+       $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
+       $(GST_LIBS) $(X_LIBS) $(LIBM) $(QT_LIBS)
 
 # qt moc support, according to http://qtnode.net/wiki/Qt_with_autotools
 
index a3764c1..de853c4 100644 (file)
@@ -7,8 +7,9 @@ X_TESTS = stress-videooverlay
 stress_videooverlay_SOURCES = stress-videooverlay.c
 stress_videooverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS)
-stress_videooverlay_LDADD = $(GST_LIBS) $(X_LIBS) $(LIBM) \
-       $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la
+stress_videooverlay_LDADD = \
+       $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
+       $(GST_LIBS) $(X_LIBS) $(LIBM)
 
 if HAVE_GTK_X11
 X_TESTS += test-colorkey test-videooverlay
@@ -16,14 +17,16 @@ X_TESTS += test-colorkey test-videooverlay
 test_colorkey_SOURCES = test-colorkey.c
 test_colorkey_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS)
-test_colorkey_LDADD = $(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS) \
-       $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la
+test_colorkey_LDADD = \
+       $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
+       $(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS)
 
 test_videooverlay_SOURCES = test-videooverlay.c
 test_videooverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS)
-test_videooverlay_LDADD = $(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS) \
-       $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la
+test_videooverlay_LDADD = \
+       $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
+       $(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS)
 endif
 
 output_selector_test_SOURCES = output-selector-test.c