summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--Makefile.am8
-rw-r--r--gst-libs/gst/colorbalance/Makefile.am3
-rw-r--r--gst-libs/gst/mixer/Makefile.am3
-rw-r--r--gst-libs/gst/play/Makefile.am3
-rw-r--r--gst-libs/gst/tuner/Makefile.am4
6 files changed, 21 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 6930c4ee..c46d95fb 100644
--- 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 d773bc68..e20dd34a 100644
--- 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
diff --git a/gst-libs/gst/colorbalance/Makefile.am b/gst-libs/gst/colorbalance/Makefile.am
index db2ba4d6..5888fb50 100644
--- a/gst-libs/gst/colorbalance/Makefile.am
+++ b/gst-libs/gst/colorbalance/Makefile.am
@@ -19,8 +19,7 @@ built_headers = \
colorbalance-enumtypes.h
libgstcolorbalanceinclude_HEADERS = \
- $(colorbalance_headers) \
- colorbalance-enumtypes.h
+ $(colorbalance_headers)
nodist_libgstcolorbalanceinclude_HEADERS = \
colorbalance-enumtypes.h
diff --git a/gst-libs/gst/mixer/Makefile.am b/gst-libs/gst/mixer/Makefile.am
index ba5348dd..ab32349d 100644
--- a/gst-libs/gst/mixer/Makefile.am
+++ b/gst-libs/gst/mixer/Makefile.am
@@ -21,8 +21,7 @@ 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 = \
diff --git a/gst-libs/gst/play/Makefile.am b/gst-libs/gst/play/Makefile.am
index 1a2e86ff..a06e1d97 100644
--- a/gst-libs/gst/play/Makefile.am
+++ b/gst-libs/gst/play/Makefile.am
@@ -17,7 +17,8 @@ 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)
+nodist_libgstplay_@GST_MAJORMINOR@include_HEADERS = $(built_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 96c62b67..0f2b43bc 100644
--- a/gst-libs/gst/tuner/Makefile.am
+++ b/gst-libs/gst/tuner/Makefile.am
@@ -20,10 +20,8 @@ built_headers = \
tuner-enumtypes.h
libgsttunerinclude_HEADERS = \
- $(tuner_headers) \
- tuner-enumtypes.h
+ $(tuner_headers)
-# FIXME 0.9: don't install
nodist_libgsttunerinclude_HEADERS = \
tuner-enumtypes.h