From 564488fcbd552901036016320ffd5b5112e5b9ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 28 Mar 2014 19:30:16 +0000 Subject: [PATCH] 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. --- tests/check/Makefile.am | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 0a1ae01667..879f052e40 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