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.
This commit is contained in:
parent
c8ff215b02
commit
564488fcbd
@ -419,8 +419,8 @@ orc/audiomixer.c: $(top_srcdir)/gst/audiomixer/gstaudiomixerorc.orc
|
|||||||
$(ORCC) --test -o $@ $<
|
$(ORCC) --test -o $@ $<
|
||||||
|
|
||||||
libs_gstglcontext_LDADD = \
|
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 = \
|
libs_gstglcontext_CFLAGS = \
|
||||||
$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
|
$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
|
||||||
@ -428,8 +428,9 @@ libs_gstglcontext_CFLAGS = \
|
|||||||
$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS)
|
$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS)
|
||||||
|
|
||||||
libs_gstglmemory_LDADD = \
|
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 = \
|
libs_gstglmemory_CFLAGS = \
|
||||||
$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
|
$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
|
||||||
@ -442,9 +443,9 @@ libs_gstglupload_CFLAGS = \
|
|||||||
$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS)
|
$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS)
|
||||||
|
|
||||||
libs_gstglupload_LDADD = \
|
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:
|
distclean-local-orc:
|
||||||
rm -rf orc
|
rm -rf orc
|
||||||
|
Loading…
x
Reference in New Issue
Block a user