diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2014-03-28 19:30:16 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2014-03-28 19:30:16 +0000 |
| commit | 564488fcbd552901036016320ffd5b5112e5b9ec (patch) | |
| tree | ee28cc44cbd308896b2bcbd55f06b57dbd50d486 /tests | |
| parent | c8ff215b02ee178513e076e2dfbd14e9ce77ec49 (diff) | |
| download | gstreamer-plugins-bad-564488fcbd552901036016320ffd5b5112e5b9ec.tar.gz | |
tests: fix build of gl unit tests in uninstalled setup
Put local .la files first, and add link to libgstvideo
for tests that use the libgstvideo API directly.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/check/Makefile.am | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 0a1ae0166..879f052e4 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -419,8 +419,8 @@ orc/audiomixer.c: $(top_srcdir)/gst/audiomixer/gstaudiomixerorc.orc $(ORCC) --test -o $@ $< libs_gstglcontext_LDADD = \ - $(GST_PLUGINS_BAD_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) \ - $(top_builddir)/gst-libs/gst/gl/libgstgl-@GST_API_VERSION@.la + $(top_builddir)/gst-libs/gst/gl/libgstgl-@GST_API_VERSION@.la \ + $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) libs_gstglcontext_CFLAGS = \ $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \ @@ -428,8 +428,9 @@ libs_gstglcontext_CFLAGS = \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS) libs_gstglmemory_LDADD = \ - $(GST_PLUGINS_BAD_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) \ - $(top_builddir)/gst-libs/gst/gl/libgstgl-@GST_API_VERSION@.la + $(top_builddir)/gst-libs/gst/gl/libgstgl-@GST_API_VERSION@.la \ + $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \ + $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) libs_gstglmemory_CFLAGS = \ $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \ @@ -442,9 +443,9 @@ libs_gstglupload_CFLAGS = \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS) libs_gstglupload_LDADD = \ - $(GST_PLUGINS_BAD_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) \ - $(top_builddir)/gst-libs/gst/gl/libgstgl-@GST_API_VERSION@.la - + $(top_builddir)/gst-libs/gst/gl/libgstgl-@GST_API_VERSION@.la \ + $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \ + $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) distclean-local-orc: rm -rf orc |