From c8e931574e8a51139e9f95f7f5713db95f2e258c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 19 Mar 2010 00:03:53 +0000 Subject: [PATCH] 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). --- ext/amrnb/Makefile.am | 4 ++-- ext/amrwbdec/Makefile.am | 4 ++-- ext/sidplay/Makefile.am | 4 ++-- gst/asfdemux/Makefile.am | 5 +++-- gst/mpegaudioparse/Makefile.am | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ext/amrnb/Makefile.am b/ext/amrnb/Makefile.am index ff0d8fe457..63bf82b88f 100644 --- a/ext/amrnb/Makefile.am +++ b/ext/amrnb/Makefile.am @@ -5,8 +5,8 @@ libgstamrnb_la_SOURCES = \ amrnbdec.c \ amrnbenc.c -libgstamrnb_la_CFLAGS = $(GST_CFLAGS) $(AMRNB_CFLAGS) -libgstamrnb_la_LIBADD = $(GST_BASE_LIBS) $(AMRNB_LIBS) +libgstamrnb_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AMRNB_CFLAGS) +libgstamrnb_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(AMRNB_LIBS) libgstamrnb_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstamrnb_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/amrwbdec/Makefile.am b/ext/amrwbdec/Makefile.am index 236cfa0efd..08eda533e3 100644 --- a/ext/amrwbdec/Makefile.am +++ b/ext/amrwbdec/Makefile.am @@ -4,8 +4,8 @@ libgstamrwbdec_la_SOURCES = \ amrwb.c \ amrwbdec.c -libgstamrwbdec_la_CFLAGS = $(GST_CFLAGS) $(AMRWB_CFLAGS) -libgstamrwbdec_la_LIBADD = $(GST_BASE_LIBS) $(AMRWB_LIBS) +libgstamrwbdec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AMRWB_CFLAGS) +libgstamrwbdec_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(AMRWB_LIBS) libgstamrwbdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstamrwbdec_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/sidplay/Makefile.am b/ext/sidplay/Makefile.am index ff9f98aa7b..50f31353ec 100644 --- a/ext/sidplay/Makefile.am +++ b/ext/sidplay/Makefile.am @@ -1,8 +1,8 @@ plugin_LTLIBRARIES = libgstsid.la libgstsid_la_SOURCES = gstsiddec.cc -libgstsid_la_CXXFLAGS = $(GST_CXXFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(SIDPLAY_CFLAGS) -libgstsid_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(SIDPLAY_LIBS) +libgstsid_la_CXXFLAGS = $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(SIDPLAY_CFLAGS) +libgstsid_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(SIDPLAY_LIBS) libgstsid_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstsid_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/asfdemux/Makefile.am b/gst/asfdemux/Makefile.am index 0732335566..5fda983052 100644 --- a/gst/asfdemux/Makefile.am +++ b/gst/asfdemux/Makefile.am @@ -1,10 +1,11 @@ plugin_LTLIBRARIES = libgstasf.la 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_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)\ +libgstasf_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) +libgstasf_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ -lgstriff-@GST_MAJORMINOR@ -lgstrtsp-@GST_MAJORMINOR@ -lgstsdp-@GST_MAJORMINOR@ \ -lgstrtp-@GST_MAJORMINOR@ -lgstaudio-@GST_MAJORMINOR@ -lgsttag-@GST_MAJORMINOR@ \ + $(GST_BASE_LIBS) $(GST_LIBS) \ $(WIN32_LIBS) libgstasf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstasf_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/mpegaudioparse/Makefile.am b/gst/mpegaudioparse/Makefile.am index 90f05339c8..6d3c464cea 100644 --- a/gst/mpegaudioparse/Makefile.am +++ b/gst/mpegaudioparse/Makefile.am @@ -1,7 +1,7 @@ plugin_LTLIBRARIES = libgstmpegaudioparse.la 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_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstmpegaudioparse_la_LIBTOOLFLAGS = --tag=disable-static