clean up install/dist problem

Original commit message from CVS:
clean up install/dist problem

diff --git a/ChangeLog b/ChangeLog
index 6930c4ee712e5ea87e7bd046f76cf20127168133..c46d95fbc72de0606f6dba305974e126cd310a8b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-07-02  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * Makefile.am:
+       * gst-libs/gst/colorbalance/Makefile.am:
+       * gst-libs/gst/mixer/Makefile.am:
+       * gst-libs/gst/play/Makefile.am:
+       * gst-libs/gst/tuner/Makefile.am:
+         (hopefully) fix both install and dist and make error message useful.
+         needs testing across automakes.
+
 2004-07-02  Benjamin Otte  <otte@gnome.org>
 
        * ext/ogg/gstogg.c: (plugin_init):

diff --git a/Makefile.am b/Makefile.am
index d773bc68a38089e7e0a27c889536967cc298371b..e20dd34a4eb90fa2a8cfdd3b7fc4f5e3bc21c3f8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,9 +48,13 @@ DISTCLEANFILES=_stdint.h
 # 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 \*-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 )
+       ( $(ECHO) "*** Leftover enumtypes or marshal files in the tarball." && \
+          $(ECHO) "*** Make sure the following files are not disted:" && \
+          find $(distdir) -name \*-enumtypes.[ch] && \
+          find $(distdir) -name \*-marshal.[ch] && \
+          false )
 
 include $(top_srcdir)/common/release.mak
 include $(top_srcdir)/common/po.mak