diff options
| author | Edward Hervey <bilboed@bilboed.com> | 2009-10-24 13:19:08 +0200 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2009-10-24 13:21:05 +0200 |
| commit | 05667813ad040c39aff4e051f3555b2283c8a840 (patch) | |
| tree | 731c3bc9a12353e6dd1f5e9b67367a12610d817e | |
| parent | 4de2ab48ea692bac341f8c8bb258921755443509 (diff) | |
examples: fix linking order.
the uninstalled wrapper would create a LD_LIBRARY_PATH with system-wide
path before the local ones... resulting in the example applications picking
up the system-wide libraries and not the (potentially modified) uninstalled
libraries
| -rw-r--r-- | tests/examples/app/Makefile.am | 8 | ||||
| -rw-r--r-- | tests/examples/seek/Makefile.am | 6 | ||||
| -rw-r--r-- | tests/examples/v4l/Makefile.am | 7 |
3 files changed, 12 insertions, 9 deletions
diff --git a/tests/examples/app/Makefile.am b/tests/examples/app/Makefile.am index 375e27e6f..7d721b4c7 100644 --- a/tests/examples/app/Makefile.am +++ b/tests/examples/app/Makefile.am @@ -5,8 +5,8 @@ noinst_PROGRAMS = appsrc_ex appsrc-stream appsrc-stream2 appsrc-ra \ appsrc_ex_SOURCES = appsrc_ex.c appsrc_ex_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) appsrc_ex_LDFLAGS = \ - $(GST_LIBS) \ - $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la + $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la \ + $(GST_LIBS) appsrc_stream_SOURCES = appsrc-stream.c appsrc_stream_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) @@ -27,6 +27,6 @@ appsrc_seekable_LDFLAGS = $(GST_LIBS) appsink_src_SOURCES = appsink-src.c appsink_src_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) appsink_src_LDFLAGS = \ - $(GST_LIBS) \ - $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la + $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la \ + $(GST_LIBS) diff --git a/tests/examples/seek/Makefile.am b/tests/examples/seek/Makefile.am index 9969d5a82..feadfd92a 100644 --- a/tests/examples/seek/Makefile.am +++ b/tests/examples/seek/Makefile.am @@ -6,6 +6,8 @@ examples = $(GTK_EXAMPLES) stepping stepping2 noinst_PROGRAMS = $(examples) -LDADD = $(GST_LIBS) $(GTK_LIBS) \ - $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la +LDADD = \ + $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \ + $(GST_LIBS) $(GTK_LIBS) + AM_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GTK_CFLAGS) -I$(top_builddir)/gst-libs diff --git a/tests/examples/v4l/Makefile.am b/tests/examples/v4l/Makefile.am index fae35d4b8..6132cdc06 100644 --- a/tests/examples/v4l/Makefile.am +++ b/tests/examples/v4l/Makefile.am @@ -3,7 +3,8 @@ noinst_PROGRAMS = probe probe_SOURCES = probe.c probe_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) -probe_LDFLAGS = $(GST_PLUGINS_BASE_LIBS) \ - $(GST_BASE_LIBS) $(GST_LIBS) \ - $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la +probe_LDFLAGS = \ + $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \ + $(GST_PLUGINS_BASE_LIBS) \ + $(GST_BASE_LIBS) $(GST_LIBS) |