mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-11 09:55:36 +00:00
build: fix CFLAGS order and LIBS order
_BAD_CFLAGS should always come first, then GST_PLUGINS_BASE_CFLAGS, then GST_BASE_CFLAGS then GST_CFLAGS. Same for libs: first plugins base libs, then GST_BASE_LIB then GST_LIBS.
This commit is contained in:
parent
0d1c9624ea
commit
f8f4620451
15 changed files with 27 additions and 28 deletions
|
@ -5,9 +5,9 @@ include $(top_srcdir)/common/orc.mak
|
|||
|
||||
libgstcog_la_CFLAGS = \
|
||||
-DCOG_ENABLE_UNSTABLE_API \
|
||||
$(GST_PLUGINS_BAD_CFLAGS) \
|
||||
-I$(srcdir)/.. \
|
||||
$(GST_PLUGINS_BASE_CFLAGS) \
|
||||
$(GST_PLUGINS_BAD_CFLAGS) \
|
||||
$(GST_CFLAGS) \
|
||||
$(ORC_CFLAGS) \
|
||||
$(COG_CFLAGS)
|
||||
|
|
|
@ -2,8 +2,8 @@ plugin_LTLIBRARIES = libgstcurl.la
|
|||
|
||||
libgstcurl_la_SOURCES = gstcurl.c gstcurlsink.c
|
||||
libgstcurl_la_CFLAGS = \
|
||||
$(GST_BASE_CFLAGS) \
|
||||
$(GST_PLUGINS_BAD_CFLAGS) \
|
||||
$(GST_BASE_CFLAGS) \
|
||||
$(GST_CFLAGS) \
|
||||
$(CURL_CFLAGS)
|
||||
libgstcurl_la_LIBADD = \
|
||||
|
|
|
@ -18,7 +18,7 @@ libgstgsettingselements_la_SOURCES = \
|
|||
gstswitchsrc.c \
|
||||
plugin.c
|
||||
|
||||
libgstgsettingselements_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS) $(GSETTINGS_CFLAGS) $(DIR_CFLAGS) \
|
||||
libgstgsettingselements_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS) $(GSETTINGS_CFLAGS) $(DIR_CFLAGS) \
|
||||
-DGstSwitchSrc=GstGSettingsSwitchSrc \
|
||||
-DGstSwitchSrcClass=GstGSettingsSwitchSrcClass \
|
||||
-DGstSwitchSink=GstGSettingsSwitchSink \
|
||||
|
|
|
@ -9,7 +9,7 @@ libgstkate_la_SOURCES += gstkatetiger.c
|
|||
endif
|
||||
|
||||
# flags used to compile this plugin
|
||||
libgstkate_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS) $(TIGER_CFLAGS) $(KATE_CFLAGS)
|
||||
libgstkate_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(TIGER_CFLAGS) $(KATE_CFLAGS)
|
||||
libgstkate_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgsttag-$(GST_MAJORMINOR) $(GST_LIBS) $(TIGER_LIBS) $(KATE_LIBS)
|
||||
libgstkate_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||
libgstkate_la_LIBTOOLFLAGS = --tag=disable-static
|
||||
|
|
|
@ -8,7 +8,7 @@ libgstmpeg2enc_la_SOURCES = \
|
|||
gstmpeg2encpicturereader.cc
|
||||
|
||||
libgstmpeg2enc_la_CXXFLAGS = \
|
||||
$(GST_PLUGINS_BASE_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS) $(GST_CXXFLAGS) $(MPEG2ENC_CFLAGS)
|
||||
$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(MPEG2ENC_CFLAGS)
|
||||
libgstmpeg2enc_la_LIBADD = \
|
||||
$(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) $(MPEG2ENC_LIBS)
|
||||
libgstmpeg2enc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||
|
|
|
@ -7,7 +7,7 @@ libgstmplex_la_SOURCES = \
|
|||
gstmplexoutputstream.cc
|
||||
|
||||
libgstmplex_la_CXXFLAGS = \
|
||||
$(GST_PLUGINS_BASE_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS) $(GST_CXXFLAGS) $(MPLEX_CFLAGS)
|
||||
$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(MPLEX_CFLAGS)
|
||||
libgstmplex_la_LIBADD = \
|
||||
$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(MPLEX_LIBS)
|
||||
libgstmplex_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(MPLEX_LDFLAGS)
|
||||
|
|
|
@ -3,14 +3,13 @@ plugin_LTLIBRARIES = libgstopus.la
|
|||
libgstopus_la_SOURCES = gstopus.c gstopusdec.c gstopusenc.c gstopusparse.c gstopusheader.c gstopuscommon.c gstrtpopuspay.c gstrtpopusdepay.c
|
||||
libgstopus_la_CFLAGS = \
|
||||
-DGST_USE_UNSTABLE_API \
|
||||
$(GST_PLUGINS_BASE_CFLAGS) \
|
||||
$(GST_PLUGINS_BAD_CFLAGS) \
|
||||
$(GST_PLUGINS_BASE_CFLAGS) \
|
||||
$(GST_CFLAGS) \
|
||||
$(OPUS_CFLAGS)
|
||||
libgstopus_la_LIBADD = \
|
||||
-lgstaudio-$(GST_MAJORMINOR) \
|
||||
$(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \
|
||||
-lgstrtp-@GST_MAJORMINOR@ \
|
||||
$(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
|
||||
-lgsttag-$(GST_MAJORMINOR) -lgstrtp-$(GST_MAJORMINOR) \
|
||||
$(GST_BASE_LIBS) \
|
||||
$(GST_LIBS) \
|
||||
$(OPUS_LIBS)
|
||||
|
|
|
@ -5,7 +5,7 @@ libgstsdl_la_SOURCES = \
|
|||
sdlvideosink.c \
|
||||
sdlaudiosink.c
|
||||
|
||||
libgstsdl_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS) $(SDL_CFLAGS)
|
||||
libgstsdl_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(SDL_CFLAGS)
|
||||
libgstsdl_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
|
||||
-lgstvideo-$(GST_MAJORMINOR) \
|
||||
-lgstaudio-$(GST_MAJORMINOR) \
|
||||
|
|
|
@ -6,8 +6,8 @@ libgstfragmented_la_SOURCES = \
|
|||
gsthlsdemux.c \
|
||||
gstfragmentedplugin.c
|
||||
|
||||
libgstfragmented_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS) $(SOUP_CFLAGS)
|
||||
libgstfragmented_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(SOUP_LIBS)
|
||||
libgstfragmented_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(SOUP_CFLAGS)
|
||||
libgstfragmented_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(SOUP_LIBS)
|
||||
libgstfragmented_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -no-undefined
|
||||
libgstfragmented_la_LIBTOOLFLAGS = --tag=disable-static
|
||||
|
||||
|
|
|
@ -22,15 +22,15 @@ noinst_HEADERS = \
|
|||
gstintersurface.h
|
||||
|
||||
libgstinter_la_CFLAGS = \
|
||||
$(GST_CFLAGS) \
|
||||
$(GST_PLUGINS_BASE_CFLAGS) \
|
||||
$(GST_PLUGINS_BAD_CFLAGS) \
|
||||
$(GST_BASE_CFLAGS)
|
||||
$(GST_PLUGINS_BASE_CFLAGS) \
|
||||
$(GST_BASE_CFLAGS) \
|
||||
$(GST_CFLAGS)
|
||||
|
||||
libgstinter_la_LIBADD = \
|
||||
$(GST_LIBS) \
|
||||
$(GST_BASE_LIBS) \
|
||||
$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ -lgstaudio-@GST_MAJORMINOR@ \
|
||||
$(GST_BASE_LIBS) \
|
||||
$(GST_LIBS) \
|
||||
$(LIBM)
|
||||
|
||||
libgstinter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||
|
@ -40,13 +40,13 @@ gstintertest_SOURCES = \
|
|||
gstintertest.c
|
||||
|
||||
gstintertest_CFLAGS = \
|
||||
$(GST_CFLAGS) \
|
||||
$(GST_PLUGINS_BAD_CFLAGS) \
|
||||
$(GST_PLUGINS_BASE_CFLAGS) \
|
||||
$(GST_PLUGINS_BAD_CFLAGS)
|
||||
$(GST_CFLAGS)
|
||||
|
||||
gstintertest_LDADD = \
|
||||
$(GST_LIBS) \
|
||||
$(GST_PLUGINS_BASE_LIBS) \
|
||||
$(GST_LIBS) \
|
||||
$(LIBM)
|
||||
|
||||
Android.mk: Makefile.am $(BUILT_SOURCES)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
plugin_LTLIBRARIES = libgstliveadder.la
|
||||
|
||||
libgstliveadder_la_SOURCES = liveadder.c
|
||||
libgstliveadder_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS)
|
||||
libgstliveadder_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
|
||||
libgstliveadder_la_LIBADD = \
|
||||
$(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \
|
||||
$(GST_BASE_LIBS) $(GST_LIBS)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
plugin_LTLIBRARIES = libgstmve.la
|
||||
|
||||
libgstmve_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS)
|
||||
libgstmve_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
|
||||
libgstmve_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
|
||||
libgstmve_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||
libgstmve_la_LIBTOOLFLAGS = --tag=disable-static
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
plugin_LTLIBRARIES = libgstdecklink.la
|
||||
|
||||
libgstdecklink_la_CPPFLAGS = \
|
||||
$(GST_BASE_CFLAGS) \
|
||||
$(GST_PLUGINS_BAD_CFLAGS) \
|
||||
$(GST_BASE_CFLAGS) \
|
||||
$(GST_CXXFLAGS) \
|
||||
$(DECKLINK_CXXFLAGS)
|
||||
libgstdecklink_la_LIBADD = \
|
||||
|
|
|
@ -5,9 +5,9 @@ include $(top_srcdir)/common/glib-gen.mak
|
|||
plugin_LTLIBRARIES = libgstshm.la
|
||||
|
||||
libgstshm_la_SOURCES = shmpipe.c shmalloc.c gstshm.c gstshmsrc.c gstshmsink.c
|
||||
libgstshm_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS) -DSHM_PIPE_USE_GLIB
|
||||
libgstshm_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS) -DSHM_PIPE_USE_GLIB
|
||||
libgstshm_la_LIBADD = -lrt
|
||||
libgstshm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS)
|
||||
libgstshm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS)
|
||||
libgstshm_la_LIBTOOLFLAGS = --tag=disable-static
|
||||
|
||||
noinst_HEADERS = gstshmsrc.h gstshmsink.h shmpipe.h shmalloc.h
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
noinst_PROGRAMS = scaletempo-demo
|
||||
|
||||
scaletempo_demo_SOURCES = demo-main.c demo-player.c demo-gui.c
|
||||
scaletempo_demo_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS) $(GTK_CFLAGS)
|
||||
scaletempo_demo_LDFLAGS = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GTK_LIBS) -lgstinterfaces-@GST_MAJORMINOR@
|
||||
scaletempo_demo_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS)
|
||||
scaletempo_demo_LDFLAGS = $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-@GST_MAJORMINOR@ $(GST_LIBS) $(GTK_LIBS)
|
||||
|
||||
noinst_HEADERS = demo-player.h demo-gui.h
|
||||
|
||||
|
|
Loading…
Reference in a new issue