mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 20:21:24 +00:00
camerabin: fix link order
Move local version up in the link order.
This commit is contained in:
parent
0e1ee9031a
commit
4d9a0e832c
2 changed files with 6 additions and 5 deletions
|
@ -25,9 +25,9 @@ nodist_libgstcamerabin_la_SOURCES = $(built_sources)
|
||||||
libgstcamerabin_la_CFLAGS = \
|
libgstcamerabin_la_CFLAGS = \
|
||||||
$(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -DGST_USE_UNSTABLE_API
|
$(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -DGST_USE_UNSTABLE_API
|
||||||
libgstcamerabin_la_LIBADD = \
|
libgstcamerabin_la_LIBADD = \
|
||||||
|
$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-$(GST_MAJORMINOR).la \
|
||||||
$(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
|
$(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
|
||||||
-lgstinterfaces-$(GST_MAJORMINOR) \
|
-lgstinterfaces-$(GST_MAJORMINOR)
|
||||||
$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-$(GST_MAJORMINOR).la
|
|
||||||
|
|
||||||
libgstcamerabin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
libgstcamerabin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||||
libgstcamerabin_la_LIBTOOLFLAGS = --tag=disable-static
|
libgstcamerabin_la_LIBTOOLFLAGS = --tag=disable-static
|
||||||
|
|
|
@ -108,9 +108,10 @@ AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS) $(GST_OPTION_
|
||||||
LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS)
|
LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS)
|
||||||
|
|
||||||
elements_camerabin_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CHECK_CFLAGS)
|
elements_camerabin_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CHECK_CFLAGS)
|
||||||
elements_camerabin_LDADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_CHECK_LIBS) \
|
elements_camerabin_LDADD = \
|
||||||
-lgstinterfaces-@GST_MAJORMINOR@ \
|
$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \
|
||||||
$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la
|
$(GST_LIBS) $(GST_BASE_LIBS) $(GST_CHECK_LIBS) \
|
||||||
|
-lgstinterfaces-@GST_MAJORMINOR@
|
||||||
elements_camerabin_SOURCES = elements/camerabin.c
|
elements_camerabin_SOURCES = elements/camerabin.c
|
||||||
|
|
||||||
elements_timidity_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS)
|
elements_timidity_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS)
|
||||||
|
|
Loading…
Reference in a new issue