[farsight2/master] Don't distribute generated marshaller files

[Olivier Crête]

---
 gst-libs/gst/farsight/Makefile.am |   25 +++++++++++++------------
 gst/fsrtpconference/Makefile.am   |   17 ++++++++++-------
 tests/rtp/Makefile.am             |    7 +++++--
 transmitters/rawudp/Makefile.am   |   11 ++++++-----
 4 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/gst-libs/gst/farsight/Makefile.am b/gst-libs/gst/farsight/Makefile.am
index 6b874c6..77be44b 100644
--- a/gst-libs/gst/farsight/Makefile.am
+++ b/gst-libs/gst/farsight/Makefile.am
@@ -11,18 +11,18 @@ libgstfarsightinclude_HEADERS = \
 		fs-transmitter.h \
 		fs-stream-transmitter.h \
 		fs-plugin.h \
-		fs-marshal.h \
-		fs-enum-types.h \
 		fs-element-added-notifier.h \
 		fs-interfaces.h
 
+nodist_libgstfarsightinclude_HEADERS = \
+		fs-enum-types.h
+
+
 lib_LTLIBRARIES = libgstfarsight- at GST_MAJORMINOR@.la
 
 BUILT_SOURCES = \
-		fs-marshal.c \
-		fs-marshal.h \
-		fs-enum-types.c \
-		fs-enum-types.h
+	$(nodist_libgstfarsight_ at GST_MAJORMINOR@_la_SOURCES) \
+	$(nodist_libgstfarsightinclude_HEADERS)
 
 CLEANFILES = $(BUILT_SOURCES) fs-marshal.list
 
@@ -37,14 +37,15 @@ libgstfarsight_ at GST_MAJORMINOR@_la_SOURCES = \
 		fs-transmitter.c \
 		fs-stream-transmitter.c \
 		fs-plugin.c \
-		fs-marshal.c \
-		fs-enum-types.c \
 		fs-element-added-notifier.c \
-		fs-interfaces.c
+		fs-interfaces.c \
+		fs-private.h
+
+nodist_libgstfarsight_ at GST_MAJORMINOR@_la_SOURCES = \
+		fs-marshal.c \
+		fs-marshal.h \
+		fs-enum-types.c
 
-noinst_HEADERS = \
-	fs-marshal.h \
-	fs-private.h
 
 fs-marshal.list: $(libgstfarsight_ at GST_MAJORMINOR@_la_SOURCES) Makefile.am
 	( cd $(srcdir) && \
diff --git a/gst/fsrtpconference/Makefile.am b/gst/fsrtpconference/Makefile.am
index 91ac2f9..7f8957c 100644
--- a/gst/fsrtpconference/Makefile.am
+++ b/gst/fsrtpconference/Makefile.am
@@ -12,13 +12,16 @@ common_SOURCES = \
 	fs-rtp-specific-nego.c \
 	fs-rtp-special-source.c \
 	fs-rtp-dtmf-event-source.c \
-	fs-rtp-dtmf-sound-source.c \
-	fs-rtp-marshal.c
+	fs-rtp-dtmf-sound-source.c
+
 libfsrtpconference_la_SOURCES = gstfsrtpconference.c $(common_SOURCES)
 
-BUILT_SOURCES = \
-		fs-rtp-marshal.c \
-		fs-rtp-marshal.h
+nodist_libfsrtpconference_la_SOURCES = \
+	fs-rtp-marshal.c \
+	fs-rtp-marshal.h
+
+
+BUILT_SOURCES = $(nodist_libfsrtpconference_la_SOURCES)
 
 noinst_HEADERS = \
 	fs-rtp-conference.h \
@@ -32,8 +35,7 @@ noinst_HEADERS = \
 	fs-rtp-specific-nego.h \
 	fs-rtp-special-source.h \
 	fs-rtp-dtmf-event-source.h \
-	fs-rtp-dtmf-sound-source.h \
-	fs-rtp-marshal.h
+	fs-rtp-dtmf-sound-source.h
 
 CLEANFILES = $(BUILT_SOURCES) fs-rtp-marshal.list
 
@@ -55,6 +57,7 @@ if ENABLE_GTK_DOC
 noinst_LTLIBRARIES = libfsrtpconference_doc.la
 
 libfsrtpconference_doc_la_SOURCES = gstfsrtpconference_doc.c $(common_SOURCES)
+nodist_libfsrtpconference_doc_la_SOURCES = $(nodist_libfsrtpconference_la_SOURCES)
 libfsrtpconference_doc_la_CFLAGS = $(libfsrtpconference_la_CFLAGS)
 libfsrtpconference_doc_la_LIBADD = $(libfsrtpconference_la_LIBADD)
 
diff --git a/tests/rtp/Makefile.am b/tests/rtp/Makefile.am
index 54f383c..50dc6ab 100644
--- a/tests/rtp/Makefile.am
+++ b/tests/rtp/Makefile.am
@@ -13,11 +13,14 @@ codec_discovery_SOURCES = codec-discovery.c \
 		$(top_srcdir)/gst/fsrtpconference/fs-rtp-session.c \
 		$(top_srcdir)/gst/fsrtpconference/fs-rtp-stream.c \
 		$(top_srcdir)/gst/fsrtpconference/fs-rtp-substream.c \
-		$(top_srcdir)/gst/fsrtpconference/fs-rtp-participant.c \
-		$(top_srcdir)/gst/fsrtpconference/fs-rtp-marshal.c
+		$(top_srcdir)/gst/fsrtpconference/fs-rtp-participant.c
+
+nodist_codec_discovery_SOURCES = \
+		$(top_builddir)/gst/fsrtpconference/fs-rtp-marshal.c
 
 codec_discovery_CFLAGS = \
 	-I$(top_srcdir)/gst/fsrtpconference/ \
+	-I$(top_builddir)/gst/fsrtpconference/ \
 	$(FS2_INTERNAL_CFLAGS) \
 	$(FS2_CFLAGS) \
 	$(GST_CFLAGS) \
diff --git a/transmitters/rawudp/Makefile.am b/transmitters/rawudp/Makefile.am
index 66b07b9..8d16cb5 100644
--- a/transmitters/rawudp/Makefile.am
+++ b/transmitters/rawudp/Makefile.am
@@ -8,9 +8,13 @@ librawudp_transmitter_la_SOURCES = \
 	fs-rawudp-transmitter.c \
 	fs-rawudp-stream-transmitter.c \
 	fs-rawudp-component.c \
-	fs-rawudp-marshal.c \
 	stun.c
 
+nodist_librawudp_transmitter_la_SOURCES = \
+	fs-rawudp-marshal.c \
+	fs-rawudp-marshal.h
+
+
 # flags used to compile this plugin
 librawudp_transmitter_la_CFLAGS = \
 	$(FS2_INTERNAL_CFLAGS) \
@@ -29,12 +33,9 @@ noinst_HEADERS = \
 	fs-rawudp-transmitter.h \
 	fs-rawudp-stream-transmitter.h \
 	fs-rawudp-component.h \
-	fs-rawudp-marshal.h \
 	stun.h
 
-BUILT_SOURCES = \
-		fs-rawudp-marshal.c \
-		fs-rawudp-marshal.h
+BUILT_SOURCES = $(nodist_librawudp_transmitter_la_SOURCES)
 
 CLEANFILES = $(BUILT_SOURCES) fs-rawudp-marshal.list
 
-- 
1.5.6.5