build: fix up Makefile.am
Mostly just add $(GST_BASE_CFLAGS) where they're missing and fix the order a bit here and there (see docs/random/moving-plugins).
This commit is contained in:
parent
402ea5ec77
commit
c8e931574e
@ -5,8 +5,8 @@ libgstamrnb_la_SOURCES = \
|
|||||||
amrnbdec.c \
|
amrnbdec.c \
|
||||||
amrnbenc.c
|
amrnbenc.c
|
||||||
|
|
||||||
libgstamrnb_la_CFLAGS = $(GST_CFLAGS) $(AMRNB_CFLAGS)
|
libgstamrnb_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AMRNB_CFLAGS)
|
||||||
libgstamrnb_la_LIBADD = $(GST_BASE_LIBS) $(AMRNB_LIBS)
|
libgstamrnb_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(AMRNB_LIBS)
|
||||||
libgstamrnb_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
libgstamrnb_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||||
libgstamrnb_la_LIBTOOLFLAGS = --tag=disable-static
|
libgstamrnb_la_LIBTOOLFLAGS = --tag=disable-static
|
||||||
|
|
||||||
|
@ -4,8 +4,8 @@ libgstamrwbdec_la_SOURCES = \
|
|||||||
amrwb.c \
|
amrwb.c \
|
||||||
amrwbdec.c
|
amrwbdec.c
|
||||||
|
|
||||||
libgstamrwbdec_la_CFLAGS = $(GST_CFLAGS) $(AMRWB_CFLAGS)
|
libgstamrwbdec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AMRWB_CFLAGS)
|
||||||
libgstamrwbdec_la_LIBADD = $(GST_BASE_LIBS) $(AMRWB_LIBS)
|
libgstamrwbdec_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(AMRWB_LIBS)
|
||||||
libgstamrwbdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
libgstamrwbdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||||
libgstamrwbdec_la_LIBTOOLFLAGS = --tag=disable-static
|
libgstamrwbdec_la_LIBTOOLFLAGS = --tag=disable-static
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
plugin_LTLIBRARIES = libgstsid.la
|
plugin_LTLIBRARIES = libgstsid.la
|
||||||
|
|
||||||
libgstsid_la_SOURCES = gstsiddec.cc
|
libgstsid_la_SOURCES = gstsiddec.cc
|
||||||
libgstsid_la_CXXFLAGS = $(GST_CXXFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(SIDPLAY_CFLAGS)
|
libgstsid_la_CXXFLAGS = $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(SIDPLAY_CFLAGS)
|
||||||
libgstsid_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(SIDPLAY_LIBS)
|
libgstsid_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(SIDPLAY_LIBS)
|
||||||
libgstsid_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
libgstsid_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||||
libgstsid_la_LIBTOOLFLAGS = --tag=disable-static
|
libgstsid_la_LIBTOOLFLAGS = --tag=disable-static
|
||||||
|
|
||||||
|
@ -1,10 +1,11 @@
|
|||||||
plugin_LTLIBRARIES = libgstasf.la
|
plugin_LTLIBRARIES = libgstasf.la
|
||||||
|
|
||||||
libgstasf_la_SOURCES = gstasfdemux.c gstasf.c asfheaders.c asfpacket.c gstrtpasfdepay.c gstrtspwms.c
|
libgstasf_la_SOURCES = gstasfdemux.c gstasf.c asfheaders.c asfpacket.c gstrtpasfdepay.c gstrtspwms.c
|
||||||
libgstasf_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
|
libgstasf_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
|
||||||
libgstasf_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)\
|
libgstasf_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
|
||||||
-lgstriff-@GST_MAJORMINOR@ -lgstrtsp-@GST_MAJORMINOR@ -lgstsdp-@GST_MAJORMINOR@ \
|
-lgstriff-@GST_MAJORMINOR@ -lgstrtsp-@GST_MAJORMINOR@ -lgstsdp-@GST_MAJORMINOR@ \
|
||||||
-lgstrtp-@GST_MAJORMINOR@ -lgstaudio-@GST_MAJORMINOR@ -lgsttag-@GST_MAJORMINOR@ \
|
-lgstrtp-@GST_MAJORMINOR@ -lgstaudio-@GST_MAJORMINOR@ -lgsttag-@GST_MAJORMINOR@ \
|
||||||
|
$(GST_BASE_LIBS) $(GST_LIBS) \
|
||||||
$(WIN32_LIBS)
|
$(WIN32_LIBS)
|
||||||
libgstasf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
libgstasf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||||
libgstasf_la_LIBTOOLFLAGS = --tag=disable-static
|
libgstasf_la_LIBTOOLFLAGS = --tag=disable-static
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
plugin_LTLIBRARIES = libgstmpegaudioparse.la
|
plugin_LTLIBRARIES = libgstmpegaudioparse.la
|
||||||
|
|
||||||
libgstmpegaudioparse_la_SOURCES = plugin.c gstmpegaudioparse.c gstxingmux.c
|
libgstmpegaudioparse_la_SOURCES = plugin.c gstmpegaudioparse.c gstxingmux.c
|
||||||
libgstmpegaudioparse_la_CFLAGS = $(GST_CFLAGS)
|
libgstmpegaudioparse_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS)
|
||||||
libgstmpegaudioparse_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
|
libgstmpegaudioparse_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
|
||||||
libgstmpegaudioparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
libgstmpegaudioparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||||
libgstmpegaudioparse_la_LIBTOOLFLAGS = --tag=disable-static
|
libgstmpegaudioparse_la_LIBTOOLFLAGS = --tag=disable-static
|
||||||
|
Loading…
x
Reference in New Issue
Block a user