mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 12:11:13 +00:00
tests: fix CFLAGS and LIBADD order in Makefile.am
This commit is contained in:
parent
a044983745
commit
0f48601a35
1 changed files with 20 additions and 24 deletions
|
@ -186,43 +186,39 @@ AM_CFLAGS = $(GST_CHECK_CFLAGS) $(GST_OPTION_CFLAGS) \
|
||||||
LDADD = $(GST_CHECK_LIBS)
|
LDADD = $(GST_CHECK_LIBS)
|
||||||
|
|
||||||
elements_camerabin_CFLAGS = \
|
elements_camerabin_CFLAGS = \
|
||||||
-I$(top_builddir)/gst-libs \
|
$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
|
||||||
$(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
|
$(GST_BASE_CFLAGS) $(GST_CHECK_CFLAGS) $(GST_CFLAGS) \
|
||||||
$(GST_PLUGINS_BAD_CFLAGS) $(GST_CHECK_CFLAGS) $(AM_CFLAGS) \
|
$(AM_CFLAGS) -DGST_USE_UNSTABLE_API
|
||||||
-DGST_USE_UNSTABLE_API
|
|
||||||
elements_camerabin_LDADD = \
|
elements_camerabin_LDADD = \
|
||||||
$(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_PLUGINS_BASE_LIBS) \
|
$(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-@GST_MAJORMINOR@ \
|
||||||
$(GST_CHECK_LIBS) \
|
$(GST_BASE_LIBS) $(GST_CHECK_LIBS) $(GST_LIBS)
|
||||||
-lgstinterfaces-@GST_MAJORMINOR@
|
|
||||||
elements_camerabin_SOURCES = elements/camerabin.c
|
elements_camerabin_SOURCES = elements/camerabin.c
|
||||||
|
|
||||||
if BUILD_EXPERIMENTAL
|
if BUILD_EXPERIMENTAL
|
||||||
elements_camerabin2_CFLAGS = \
|
elements_camerabin2_CFLAGS = \
|
||||||
-I$(top_builddir)/gst-libs \
|
$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
|
||||||
$(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
|
$(GST_BASE_CFLAGS) $(GST_CHECK_CFLAGS) $(GST_CFLAGS) \
|
||||||
$(GST_PLUGINS_BAD_CFLAGS) $(GST_CHECK_CFLAGS) $(AM_CFLAGS) \
|
$(AM_CFLAGS) -DGST_USE_UNSTABLE_API
|
||||||
-DGST_USE_UNSTABLE_API
|
|
||||||
elements_camerabin2_LDADD = \
|
elements_camerabin2_LDADD = \
|
||||||
$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \
|
$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \
|
||||||
$(top_builddir)/gst-libs/gst/basecamerabinsrc/libgstbasecamerabinsrc-@GST_MAJORMINOR@.la \
|
$(top_builddir)/gst-libs/gst/basecamerabinsrc/libgstbasecamerabinsrc-@GST_MAJORMINOR@.la \
|
||||||
$(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
|
$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_CHECK_LIBS) $(GST_LIBS)
|
||||||
$(GST_CHECK_LIBS)
|
|
||||||
elements_camerabin2_SOURCES = elements/camerabin2.c
|
elements_camerabin2_SOURCES = elements/camerabin2.c
|
||||||
|
|
||||||
elements_imagecapturebin_CFLAGS = \
|
elements_imagecapturebin_CFLAGS = \
|
||||||
-I$(top_builddir)/gst-libs \
|
$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
|
||||||
$(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
|
$(GST_BASE_CFLAGS) $(GST_CHECK_CFLAGS) $(GST_CFLAGS) \
|
||||||
$(GST_CHECK_CFLAGS) $(AM_CFLAGS) \
|
$(AM_CFLAGS) -DGST_USE_UNSTABLE_API
|
||||||
-DGST_USE_UNSTABLE_API
|
|
||||||
elements_imagecapturebin_LDADD = \
|
elements_imagecapturebin_LDADD = \
|
||||||
$(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
|
$(GST_PLUGINS_BASE_LIBS) -lgstapp-@GST_MAJORMINOR@ \
|
||||||
$(GST_CHECK_LIBS) -lgstapp-@GST_MAJORMINOR@
|
$(GST_BASE_LIBS) $(GST_CHECK_LIBS) $(GST_LIBS)
|
||||||
elements_imagecapturebin_SOURCES = elements/imagecapturebin.c
|
elements_imagecapturebin_SOURCES = elements/imagecapturebin.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
elements_jifmux_CFLAGS = $(GST_CHECK_CFLAGS) $(GST_OPTION_CFLAGS) $(AM_CFLAGS) $(EXIF_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
|
elements_jifmux_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CHECK_CFLAGS) $(GST_OPTION_CFLAGS) $(AM_CFLAGS) $(EXIF_CFLAGS)
|
||||||
elements_jifmux_LDADD = $(GST_CHECK_LIBS) $(EXIF_LIBS) $(LDADD) $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR)
|
elements_jifmux_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) $(GST_CHECK_LIBS) $(EXIF_LIBS) $(LDADD)
|
||||||
elements_jifmux_SOURCES = elements/jifmux.c
|
elements_jifmux_SOURCES = elements/jifmux.c
|
||||||
|
|
||||||
elements_timidity_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS)
|
elements_timidity_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS)
|
||||||
|
@ -232,10 +228,10 @@ elements_kate_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS)
|
||||||
elements_kate_LDADD = $(GST_BASE_LIBS) $(LDADD)
|
elements_kate_LDADD = $(GST_BASE_LIBS) $(LDADD)
|
||||||
|
|
||||||
elements_rtpmux_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS)
|
elements_rtpmux_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS)
|
||||||
elements_rtpmux_LDADD = $(GST_BASE_LIBS) $(LDADD) -lgstrtp-0.10
|
elements_rtpmux_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-0.10 $(GST_BASE_LIBS) $(LDADD)
|
||||||
|
|
||||||
elements_assrender_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS)
|
elements_assrender_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS)
|
||||||
elements_assrender_LDADD = $(GST_BASE_LIBS) $(LDADD) -lgstvideo-0.10 -lgstapp-0.10
|
elements_assrender_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-0.10 -lgstapp-0.10 $(GST_BASE_LIBS) $(LDADD)
|
||||||
|
|
||||||
# parser unit test convenience lib
|
# parser unit test convenience lib
|
||||||
noinst_LTLIBRARIES = libparser.la
|
noinst_LTLIBRARIES = libparser.la
|
||||||
|
|
Loading…
Reference in a new issue