don't include -enumtypes.[ch] or -marshal.[ch] files in the disted tarball.

Original commit message from CVS:
* gst-libs/gst/colorbalance/Makefile.am:
* gst-libs/gst/mixer/Makefile.am:
* gst-libs/gst/play/Makefile.am:
* gst-libs/gst/tuner/Makefile.am:
* gst/tcp/Makefile.am:
* sys/dxr3/Makefile.am:
don't include -enumtypes.[ch] or -marshal.[ch] files in the disted
tarball.
Also add all *.list files that were missing.
* Makefile.am:
add a distcheck hook to ensure the above doesn't happen again.

7 files changed, 42 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 44ed1d29..0a9456a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2004-06-24  Benjamin Otte  <otte@gnome.org>
+
+	* gst-libs/gst/colorbalance/Makefile.am:
+	* gst-libs/gst/mixer/Makefile.am:
+	* gst-libs/gst/play/Makefile.am:
+	* gst-libs/gst/tuner/Makefile.am:
+	* gst/tcp/Makefile.am:
+	* sys/dxr3/Makefile.am:
+	  don't include -enumtypes.[ch] or -marshal.[ch] files in the disted
+	  tarball.
+	  Also add all *.list files that were missing.
+	* Makefile.am:
+	  add a distcheck hook to ensure the above doesn't happen again.
+
 2004-06-23  David I. Lehn  <dlehn@users.sourceforge.net>
 
 	* ext/Makefile.am: s/DTS_DIR=dvdread/DTS_DIR=dts/
diff --git a/Makefile.am b/Makefile.am
index 258a79c8..d773bc68 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,5 +44,13 @@ EXTRA_DIST=gst-plugins.spec depcomp \
 
 DISTCLEANFILES=_stdint.h
 
+# check that no marshal or enumtypes files are included
+# this in turn ensures that distcheck fails for missing .list files which is currently
+# shadowed when the corresponding .c and .h files are included.
+distcheck-hook:
+	test "x" = "x`find $(distdir) -name \*-enumtypes.[ch]`" && \
+	test "x" = "x`find $(distdir) -name \*-marshal.[ch]`" || \
+	( $(ECHO) "*** Still leftover enumtypes or marshal files in the tarball. Please make sure those are not disted." && false )
+
 include $(top_srcdir)/common/release.mak
 include $(top_srcdir)/common/po.mak
diff --git a/gst-libs/gst/colorbalance/Makefile.am b/gst-libs/gst/colorbalance/Makefile.am
index a410ad32..e7cf3d8c 100644
--- a/gst-libs/gst/colorbalance/Makefile.am
+++ b/gst-libs/gst/colorbalance/Makefile.am
@@ -18,7 +18,9 @@ built_headers =	\
 	colorbalance-marshal.h \
 	colorbalance-enumtypes.h
 
-libgstcolorbalanceinclude_HEADERS = $(colorbalance_headers) \
+libgstcolorbalanceinclude_HEADERS = $(colorbalance_headers)
+
+nodist_libgstcolorbalanceinclude_HEADERS = \
 	colorbalance-enumtypes.h
 
 noinst_LTLIBRARIES = libgstcolorbalance.la
@@ -26,6 +28,7 @@ noinst_LTLIBRARIES = libgstcolorbalance.la
 libgstcolorbalance_la_SOURCES = \
 	colorbalance.c \
 	colorbalancechannel.c
+
 nodist_libgstcolorbalance_la_SOURCES = \
         $(built_sources) \
 	colorbalance-marshal.h
diff --git a/gst-libs/gst/mixer/Makefile.am b/gst-libs/gst/mixer/Makefile.am
index e556ab0e..e5abf687 100644
--- a/gst-libs/gst/mixer/Makefile.am
+++ b/gst-libs/gst/mixer/Makefile.am
@@ -21,8 +21,11 @@ built_headers =	\
 	mixer-enumtypes.h
 
 libgstmixerinclude_HEADERS = \
-	$(mixer_headers) \
-	mixer-enumtypes.h
+	$(mixer_headers) 
+
+# FIXME 0.9: don't include marshal files
+nodist_libgstmixerinclude_HEADERS = \
+	$(built_headers)
 
 noinst_LTLIBRARIES = libgstmixer.la
 
@@ -32,7 +35,6 @@ libgstmixer_la_SOURCES = \
 	mixertrack.c
 
 nodist_libgstmixer_la_SOURCES = \
-	mixer-marshal.h \
 	$(built_sources)
 
 libgstmixer_la_CFLAGS = $(GST_CFLAGS)
diff --git a/gst-libs/gst/play/Makefile.am b/gst-libs/gst/play/Makefile.am
index ad2ca458..ef17d461 100644
--- a/gst-libs/gst/play/Makefile.am
+++ b/gst-libs/gst/play/Makefile.am
@@ -13,10 +13,11 @@ built_headers = \
 
 library_LTLIBRARIES = libgstplay-@GST_MAJORMINOR@.la
 
-libgstplay_@GST_MAJORMINOR@_la_SOURCES = play.c play-enumtypes.c
+libgstplay_@GST_MAJORMINOR@_la_SOURCES = play.c 
+nodist_libgstplay_@GST_MAJORMINOR@_la_SOURCES = play-enumtypes.c
 
 libgstplay_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/play
-libgstplay_@GST_MAJORMINOR@include_HEADERS = $(play_headers) $(built_headers)
+libgstplay_@GST_MAJORMINOR@include_HEADERS = $(play_headers) 
 
 libgstplay_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_CFLAGS)
 libgstplay_@GST_MAJORMINOR@_la_LIBADD =	\
diff --git a/gst-libs/gst/tuner/Makefile.am b/gst-libs/gst/tuner/Makefile.am
index c5c4e5e4..804e33db 100644
--- a/gst-libs/gst/tuner/Makefile.am
+++ b/gst-libs/gst/tuner/Makefile.am
@@ -20,7 +20,10 @@ built_headers =	\
 	tuner-enumtypes.h
 
 libgsttunerinclude_HEADERS = \
-	$(tuner_headers) \
+	$(tuner_headers)
+
+# FIXME 0.9: don't install
+nodist_libgsttunerinclude_HEADERS = \
 	tuner-enumtypes.h
 
 noinst_LTLIBRARIES = libgsttuner.la
@@ -29,6 +32,7 @@ libgsttuner_la_SOURCES = \
 	tuner.c \
 	tunernorm.c \
 	tunerchannel.c
+
 nodist_libgsttuner_la_SOURCES = \
 	$(built_sources) \
 	tuner-marshal.h
diff --git a/sys/dxr3/Makefile.am b/sys/dxr3/Makefile.am
index 071fc367..3968db3e 100644
--- a/sys/dxr3/Makefile.am
+++ b/sys/dxr3/Makefile.am
@@ -2,7 +2,8 @@
 plugin_LTLIBRARIES = libgstdxr3.la
 
 libgstdxr3_la_SOURCES = dxr3videosink.c dxr3audiosink.c dxr3spusink.c \
-			dxr3init.c ac3_padder.c dxr3marshal.c
+			dxr3init.c ac3_padder.c 
+noinst_libgstdxr3_la_SOURCES = dxr3marshal.c
 libgstdxr3_la_CFLAGS = $(GST_CFLAGS)
 libgstdxr3_la_LIBADD =
 libgstdxr3_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
@@ -25,3 +26,4 @@ dxr3marshal.c: dxr3marshal.list
 	glib-genmarshal --body --prefix=dxr3_marshal $^ >> dxr3marshal.c.tmp
 	mv dxr3marshal.c.tmp dxr3marshal.c
 
+CLEANFILES = $(BUILT_SOURCES)