autogen.sh:

Fix what I perceive to be a bug only on platforms that have a automake
installed that contains multiple version. Gentoo releases a package of
automake that contains all the latest stable version (1.4 to 1.8). In
order to use a specific one besides the default you need to declare
WANT_AUTOMAKE=1.6 in your environment varibles.
------------------------------------
doc/faq/Makefile.am
doc/hackersguide/Makefile.am
Applied Frantisek Dvorak changes for the documentation.

CVS patchset: 6939
CVS date: 2004/09/05 02:14:38

5 files changed, 41 insertions, 26 deletions

diff --git a/autogen.sh b/autogen.sh
index 94c254319..1c1411093 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,7 +18,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
 #
-# $Id: autogen.sh,v 1.14 2004/06/21 07:40:10 athp Exp $
+# $Id: autogen.sh,v 1.15 2004/09/05 02:14:39 storri Exp $
 #
 # Maintained by Stephen Torri <storri@users.sourceforge.net>
 #
@@ -27,7 +27,7 @@
 PROG=xine-lib
 
 # Minimum value required to build
-WANT_AUTOMAKE_1_6=1 export WANT_AUTOMAKE_1_6
+WANT_AUTOMAKE=1.6 export WANT_AUTOMAKE
 AUTOMAKE_MIN=1.6.0
 AUTOCONF_MIN=2.53
 LIBTOOL_MIN=1.4.0
diff --git a/doc/faq/Makefile.am b/doc/faq/Makefile.am
index c04c4442c..918c311c3 100644
--- a/doc/faq/Makefile.am
+++ b/doc/faq/Makefile.am
@@ -1,17 +1,19 @@
 include $(top_srcdir)/misc/Makefile.common
 
-EXTRA_DIST = README faq.sgml
-
 docs_DATA = faq.html faq.txt
 
+EXTRA_DIST = README faq.sgml $(docs_DATA)
+
 docsdir = $(prefix)/share/doc/xine/faq
 
-docs: docs-prepare $(docs_DATA)
+docs: $(docs_DATA)
 
 distclean-generic: clean-docs
 
 docs-prepare: $(srcdir)/faq.sgml
-	test -f ./faq.sgml || cp $^ .
+	if test "$(srcdir)" != "." ; then \
+	  test -f ./faq.sgml -a ./faq.sgml -nt $(srcdir)/faq.sgml || cp $^ . ; \
+	fi
 
 clean-docs:
 	rm -f $(docs_DATA)
@@ -19,17 +21,19 @@ clean-docs:
 
 dist-hook:
 	@make fail_if_missing=yes docs
-	cp $(docs_DATA) $(distdir)
 
 if HAVE_SGMLTOOLS
-faq.html: docs-prepare faq.sgml
+faq.html: faq.sgml
+	$(MAKE) docs-prepare
 	$(SGMLTOOLS) -b onehtml faq.sgml;
 else
-faq.html: docs-prepare faq.sgml
+faq.html: faq.sgml
+	$(MAKE) docs-prepare
 	if test x"$(fail_if_missing)" = x"yes"; then \
 	  echo "Please install sgmltools-lite."; \
 	  exit 1; \
-	else \
+	fi
+	-if test x"$(fail_if_missing)" != x"yes"; then \
 	  touch $@; \
 	  sleep 1; \
 	  touch $^; \
@@ -38,13 +42,16 @@ endif
 
 if HAVE_SGMLTOOLS
 faq.txt: faq.sgml
+	$(MAKE) docs-prepare
 	$(SGMLTOOLS) -b txt faq.sgml;
 else
 faq.txt: faq.sgml
+	$(MAKE) docs-prepare
 	if test x"$(fail_if_missing)" = x"yes"; then \
 	  echo "Please install sgmltools-lite."; \
 	  exit 1; \
-	else \
+	fi
+	-if test x"$(fail_if_missing)" != x"yes"; then \
 	  touch $@; \
 	  sleep 1; \
 	  touch $^; \
diff --git a/doc/hackersguide/Makefile.am b/doc/hackersguide/Makefile.am
index f720fa957..34dc05c56 100644
--- a/doc/hackersguide/Makefile.am
+++ b/doc/hackersguide/Makefile.am
@@ -12,7 +12,7 @@ docs_DATA = hackersguide.html \
             architecture.png library.png overlays.png post_frame.png
 
 EXTRA_DIST = README $(hackersguide_sgml) \
-	architecture.fig library.fig overlays.fig post_frame.fig
+	architecture.fig library.fig overlays.fig post_frame.fig $(docs_DATA)
 
 docsdir = $(prefix)/share/doc/xine/hackersguide
 
@@ -20,10 +20,12 @@ docs: $(docs_DATA)
 
 distclean-generic: clean-docs
 
-docs-prepare: $(addprefix $(srcdir)/, $(hackersguide_sgml))
-	for file in $(hackersguide_sgml); do \
-	  test -f ./$$file || cp $(srcdir)/$$file .; \
-	done
+docs-prepare: $(addprefix $(srcdir)/, $(hackersguide_sgml) $(wildcard *.fig))
+	if test "$(srcdir)" != "." ; then \
+	  for file in $(hackersguide_sgml) *.fig ; do \
+	    test -f ./$$file -a ./$$file -nt $(srcdir)/$$file || cp $(srcdir)/$$file .; \
+	  done ; \
+	fi
 
 clean-docs:
 	rm -f $(docs_DATA)
@@ -31,17 +33,19 @@ clean-docs:
 
 dist-hook:
 	@make fail_if_missing=yes docs
-	cp $(docs_DATA) $(distdir)
 
 if HAVE_SGMLTOOLS
-hackersguide.html: docs-prepare $(hackersguide_sgml)
+hackersguide.html: $(hackersguide_sgml)
+	$(MAKE) docs-prepare
 	$(SGMLTOOLS) -b onehtml hackersguide.sgml;
 else
-hackersguide.html: docs-prepare $(hackersguide_sgml)
+hackersguide.html: $(hackersguide_sgml)
+	$(MAKE) docs-prepare
 	if test x"$(fail_if_missing)" = x"yes"; then \
 	  echo "Please install sgmltools-lite."; \
 	  exit 1; \
-	else \
+	fi
+	-if test x"$(fail_if_missing)" != x"yes"; then \
 	  touch $@; \
 	  sleep 1; \
 	  touch $^; \
@@ -49,14 +53,17 @@ hackersguide.html: docs-prepare $(hackersguide_sgml)
 endif
 
 if HAVE_FIG2DEV
-%.png: $(srcdir)/%.fig
+%.png: %.fig
+	$(MAKE) docs-prepare
 	$(FIG2DEV) -L png -S 4 $< $@;
 else
-%.png: $(srcdir)/%.fig
-	-if test x"$(fail_if_missing)" = x"yes"; then \
+%.png: %.fig
+	$(MAKE) docs-prepare
+	if test x"$(fail_if_missing)" = x"yes"; then \
 	  echo "Please install fig2dev."; \
 	  exit 1; \
-	else \
+	fi
+	-if test x"$(fail_if_missing)" != x"yes"; then \
 	  touch $@; \
 	  sleep 1; \
 	  touch $^; \
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 2ed1fb453..a3d8c3000 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -38,4 +38,5 @@ EXTRA_DIST = \
 	theora.m4 \
 	xine.m4 \
 	_xine.m4 \
-	xvid.m4
+	xvid.m4 \
+	vcd.m4
diff --git a/misc/Makefile.common b/misc/Makefile.common
index 4f6f663d6..5e26106a0 100644
--- a/misc/Makefile.common
+++ b/misc/Makefile.common
@@ -43,7 +43,7 @@ uninstall-includeHEADERS:
 	done
 
 uninstall-hook:
-	@if test '$(libdir)' = '$(XINE_PLUGINDIR)'; then \
+	@if echo '$(libdir)' | egrep ^'$(XINE_PLUGINDIR)' >/dev/null; then \
 	  list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	    p="`echo $$p | sed -e 's/\.la$$/\.so/g;s|^.*/||'`"; \
 	    echo " rm -f $(DESTDIR)$(libdir)/$$p"; \