[farsight2/master] rtp: Re-order Makefile to split out common stuff from the different results

[Olivier Crête]

---
 .gitignore                      |    1 +
 gst/fsrtpconference/Makefile.am |   10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index d0211f5..c1df9a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ Makefile.in
 gst/fsrtpconference/fs-rtp-marshal.[ch]
 gst/fsrtpconference/fs-rtp-marshal.list
 gst/fsrtpconference/gstfsrtpconference_doc.c
+gst/fsmsnconference/fs-msn-conference-doc.c
 
 transmitters/rawudp/fs-rawudp-marshal.[ch]
 transmitters/rawudp/fs-rawudp-marshal.list
diff --git a/gst/fsrtpconference/Makefile.am b/gst/fsrtpconference/Makefile.am
index 78d432a..37dc65a 100644
--- a/gst/fsrtpconference/Makefile.am
+++ b/gst/fsrtpconference/Makefile.am
@@ -24,10 +24,6 @@ nodist_libfsrtpconference_convenience_la_SOURCES = \
 
 BUILT_SOURCES = $(nodist_libfsrtpconference_convenience_la_SOURCES)
 
-# Build the main plugin
-
-libfsrtpconference_la_SOURCES = gstfsrtpconference.c
-
 noinst_HEADERS = \
 	fs-rtp-conference.h \
 	fs-rtp-participant.h \
@@ -50,6 +46,10 @@ AM_CFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_CFLAGS)
 
+# Build the main plugin
+
+libfsrtpconference_la_SOURCES = gstfsrtpconference.c
+
 libfsrtpconference_la_LIBADD = \
 	libfsrtpconference-convenience.la \
 	$(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la \
@@ -77,6 +77,8 @@ gstfsrtpconference_doc.c: gstfsrtpconference.c
 BUILT_SOURCES += gstfsrtpconference_doc.c
 endif
 
+# Build the build sources
+
 fs-rtp-marshal.list: $(libfsrtpconference_la_SOURCES) Makefile.am
 	( cd $(srcdir) && \
 	sed -n -e 's/.*fs_rtp_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
-- 
1.5.6.5