[farsight2/master] Put the ldadd, cflags in the right order and on different lines

Olivier Crête olivier.crete at collabora.co.uk
Tue Dec 23 15:22:29 PST 2008 

---
 gst-libs/gst/farsight/Makefile.am  |   15 ++++++++++++---
 gst/fsrtpconference/Makefile.am    |   11 ++++++++---
 gst/funnel/Makefile.am             |   10 ++++++++--
 tests/check/Makefile.am            |   33 ++++++++++++++++++---------------
 tests/rtp/Makefile.am              |   15 +++++++++++----
 transmitters/multicast/Makefile.am |   11 ++++++++---
 transmitters/rawudp/Makefile.am    |   11 ++++++++---
 7 files changed, 73 insertions(+), 33 deletions(-)

diff --git a/gst-libs/gst/farsight/Makefile.am b/gst-libs/gst/farsight/Makefile.am
index 8bd371c..4cfebf5 100644
--- a/gst-libs/gst/farsight/Makefile.am
+++ b/gst-libs/gst/farsight/Makefile.am
@@ -58,9 +58,18 @@ fs-marshal.c: Makefile fs-marshal.list
 		glib-genmarshal --body --prefix=_fs_marshal $(srcdir)/fs-marshal.list >> fs-marshal.c.tmp
 		mv fs-marshal.c.tmp fs-marshal.c
 
-libgstfarsight_ at GST_MAJORMINOR@_la_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(FS2_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstfarsight_ at GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
-libgstfarsight_ at GST_MAJORMINOR@_la_LDFLAGS = $(FS2_LIB_LDFLAGS) $(FS2_ALL_LDFLAGS) $(FS2_LT_LDFLAGS) 
+libgstfarsight_ at GST_MAJORMINOR@_la_CFLAGS = \
+	$(FS2_INTERNAL_CFLAGS) $(FS2_CFLAGS) \
+	$(GST_PLUGINS_BASE_CFLAGS) \
+	$(GST_BASE_CFLAGS) \
+	$(GST_CFLAGS)
+libgstfarsight_ at GST_MAJORMINOR@_la_LIBADD = \
+	$(GST_BASE_LIBS) \
+	$(GST_LIBS)
+libgstfarsight_ at GST_MAJORMINOR@_la_LDFLAGS = \
+	$(FS2_LIB_LDFLAGS) \
+	$(FS2_ALL_LDFLAGS) \
+	$(FS2_LT_LDFLAGS) 
 
 
 public_headers = fs-candidate.h \
diff --git a/gst/fsrtpconference/Makefile.am b/gst/fsrtpconference/Makefile.am
index cce7df2..f8025ff 100644
--- a/gst/fsrtpconference/Makefile.am
+++ b/gst/fsrtpconference/Makefile.am
@@ -38,12 +38,17 @@ EXTRA_libfsrtpconference_la_SOURCES = fs-rtp-marshal.list
 
 CLEANFILES = $(BUILT_SOURCES)
 
-libfsrtpconference_la_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(FS2_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+libfsrtpconference_la_CFLAGS = \
+	$(FS2_INTERNAL_CFLAGS) \
+	$(FS2_CFLAGS) \
+	$(GST_PLUGINS_BASE_CFLAGS) \
+	$(GST_CFLAGS)
 libfsrtpconference_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libfsrtpconference_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la \
-	$(FS2_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)
-
+	$(FS2_LIBS) \
+	$(GST_BASE_LIBS) \
+	$(GST_LIBS)
 
 fs-rtp-marshal.h: fs-rtp-marshal.list Makefile
 		glib-genmarshal --header --prefix=_fs_rtp_marshal $(srcdir)/$< > $@.tmp
diff --git a/gst/funnel/Makefile.am b/gst/funnel/Makefile.am
index e702c56..efcef82 100644
--- a/gst/funnel/Makefile.am
+++ b/gst/funnel/Makefile.am
@@ -1,8 +1,14 @@
 plugin_LTLIBRARIES = libfsfunnel.la
 
 libfsfunnel_la_SOURCES = gstfsfunnel.c
-libfsfunnel_la_CFLAGS = $(FS2_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+libfsfunnel_la_CFLAGS = \
+	$(FS2_CFLAGS) \
+	$(GST_BASE_CFLAGS) \
+	$(GST_CFLAGS)
 libfsfunnel_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libfsfunnel_la_LIBADD = $(FS2_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)
+libfsfunnel_la_LIBADD = \
+	$(FS2_LIBS) \
+	$(GST_BASE_LIBS) \
+	$(GST_LIBS)
 
 noinst_HEADERS = gstfsfunnel.h
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 08a42a1..979e267 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -42,50 +42,53 @@ check_PROGRAMS = \
 	utils/binadded
 
 
-AM_CFLAGS =  $(FS2_CFLAGS) $(GST_CFLAGS) $(GST_CHECK_CFLAGS)
-
-LDADD = $(GST_LIBS) $(GST_CHECK_LIBS) \
-	$(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la
-
-base_fscodec_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
-
-base_fstransmitter_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
-
-transmitter_rawudp_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
+AM_CFLAGS = \
+	$(CFLAGS) \
+	$(FS2_INTERNAL_CFLAGS) \
+	$(FS2_CFLAGS) \
+	$(GST_CHECK_CFLAGS) \
+	$(GST_CFLAGS)
+
+LDADD = \
+	$(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la \
+	$(GST_CHECK_LIBS) \
+	$(GST_LIBS)
+
+transmitter_rawudp_CFLAGS = $(AM_CFLAGS)
 transmitter_rawudp_SOURCES = \
 	check-threadsafe.h  \
 	transmitter/generic.c \
 	transmitter/generic.h \
 	transmitter/rawudp.c 
 
-transmitter_multicast_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
+transmitter_multicast_CFLAGS = $(AM_CFLAGS)
 transmitter_multicast_SOURCES = \
 	check-threadsafe.h  \
 	transmitter/generic.c \
 	transmitter/generic.h \
 	transmitter/multicast.c 
 
-main_rtpconference_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
+main_rtpconference_CFLAGS = $(AM_CFLAGS)
 main_rtpconference_SOURCES = \
 	check-threadsafe.h  \
 	main/generic.c \
 	main/generic.h \
 	main/rtpconference.c
 
-main_rtpcodecs_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
+main_rtpcodecs_CFLAGS = $(AM_CFLAGS)
 main_rtpcodecs_SOURCES = \
 	main/generic.c \
 	main/generic.h \
 	main/rtpcodecs.c
 
+main_rtpsendcodecs_CFLAGS = $(AM_CFLAGS)
 main_rtpsendcodecs_LDADD = $(LDADD) -lgstrtp-0.10
-main_rtpsendcodecs_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
 main_rtpsendcodecs_SOURCES = \
 	main/generic.c \
 	main/generic.h \
 	main/rtpsendcodecs.c
 
-utils_binadded_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
+utils_binadded_CFLAGS = $(AM_CFLAGS)
 utils_binadded_SOURCES = \
 	utils/binadded.c
 
diff --git a/tests/rtp/Makefile.am b/tests/rtp/Makefile.am
index 35bb18a..0608f5a 100644
--- a/tests/rtp/Makefile.am
+++ b/tests/rtp/Makefile.am
@@ -7,7 +7,14 @@ codec_discovery_SOURCES = codec-discovery.c \
 		$(top_srcdir)/gst/fsrtpconference/fs-rtp-special-source.c \
 		$(top_srcdir)/gst/fsrtpconference/fs-rtp-dtmf-event-source.c \
 		$(top_srcdir)/gst/fsrtpconference/fs-rtp-dtmf-sound-source.c
-codec_discovery_CFLAGS = -I$(top_srcdir)/gst/fsrtpconference/ \
-	$(FS2_INTERNAL_CFLAGS) $(FS2_CFLAGS) $(GST_CFLAGS)  $(CFLAGS)
-LDADD = $(GST_LIBS) $(GST_CHECK_LIBS) \
-	$(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la
+codec_discovery_CFLAGS = \
+	-I$(top_srcdir)/gst/fsrtpconference/ \
+	$(FS2_INTERNAL_CFLAGS) \
+	$(FS2_CFLAGS) \
+	$(GST_CFLAGS) \
+	$(CFLAGS)
+
+LDADD = \
+	$(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la \
+	$(GST_CHECK_LIBS) \
+	$(GST_LIBS) 
diff --git a/transmitters/multicast/Makefile.am b/transmitters/multicast/Makefile.am
index 4af71ec..36252d3 100644
--- a/transmitters/multicast/Makefile.am
+++ b/transmitters/multicast/Makefile.am
@@ -9,12 +9,17 @@ libmulticast_transmitter_la_SOURCES = \
 	fs-multicast-stream-transmitter.c
 
 # flags used to compile this plugin
-libmulticast_transmitter_la_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(FS2_CFLAGS) \
-	$(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+libmulticast_transmitter_la_CFLAGS = \
+	$(FS2_INTERNAL_CFLAGS) \
+	$(FS2_CFLAGS) \
+	$(GST_PLUGINS_BASE_CFLAGS) \
+	$(GST_CFLAGS)
 libmulticast_transmitter_la_LDFLAGS = $(FS2_PLUGIN_LDFLAGS)
 libmulticast_transmitter_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la \
-	$(FS2_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)
+	$(FS2_LIBS) \
+	$(GST_BASE_LIBS) \
+	$(GST_LIBS)
 
 noinst_HEADERS = \
 	fs-multicast-transmitter.h \
diff --git a/transmitters/rawudp/Makefile.am b/transmitters/rawudp/Makefile.am
index 2f908f0..f3cd60a 100644
--- a/transmitters/rawudp/Makefile.am
+++ b/transmitters/rawudp/Makefile.am
@@ -12,12 +12,17 @@ librawudp_transmitter_la_SOURCES = \
 	stun.c
 
 # flags used to compile this plugin
-librawudp_transmitter_la_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(FS2_CFLAGS) \
-	$(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+librawudp_transmitter_la_CFLAGS = \
+	$(FS2_INTERNAL_CFLAGS) \
+	$(FS2_CFLAGS) \
+	$(GST_PLUGINS_BASE_CFLAGS) \
+	$(GST_CFLAGS)
 librawudp_transmitter_la_LDFLAGS = $(FS2_PLUGIN_LDFLAGS)
 librawudp_transmitter_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la \
-	$(FS2_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)
+	$(FS2_LIBS) \
+	$(GST_BASE_LIBS) \
+	$(GST_LIBS)
 
 EXTRA_librawudp_transmitter_la_SOURCES = fs-rawudp-marshal.list
 
-- 
1.5.6.5

More information about the farsight-commits mailing list