summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.am15
-rw-r--r--configure.ac7
3 files changed, 20 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 77f4f630..8618aa73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-24 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * Makefile.am:
+ * configure.ac:
+ disable docs again until it actually passes make distcheck.
+
2004-12-24 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* gst/qtdemux/qtdemux.c: (qtdemux_type_get), (qtdemux_audio_caps):
diff --git a/Makefile.am b/Makefile.am
index e7b261f4..c59421e3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
if BUILD_DOCS
-SUBDIRS_DOCS = docs
+# disabled until it actually works
+# SUBDIRS_DOCS = docs
+SUBDIRS_DOCS =
else
SUBDIRS_DOCS =
endif
@@ -32,8 +34,9 @@ SUBDIRS = \
po \
common \
m4 \
- pkgconfig \
- $(SUBDIRS_DOCS)
+ pkgconfig
+# disabled
+# $(SUBDIRS_DOCS)
DIST_SUBDIRS = \
gst-libs \
@@ -45,8 +48,10 @@ DIST_SUBDIRS = \
po \
common \
m4 \
- pkgconfig \
- docs
+ pkgconfig
+
+# disabled
+# docs
EXTRA_DIST = \
gst-plugins.spec depcomp \
diff --git a/configure.ac b/configure.ac
index 00f99652..5f263854 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2109,11 +2109,12 @@ pkgconfig/gstreamer-plugins-uninstalled.pc
po/Makefile.in
common/Makefile
common/m4/Makefile
-docs/Makefile
-docs/libs/Makefile
-docs/version.entities
m4/Makefile
)
+dnl disabled until it actually passes make distcheck
+dnl docs/Makefile
+dnl docs/libs/Makefile
+dnl docs/version.entities
AC_OUTPUT
echo -n "configure: *** Plug-ins that will be built :"