[xiph-commits] r11433 - in trunk/theora: . doc

[giles at svn.xiph.org]

Author: giles
Date: 2006-05-26 13:45:26 -0700 (Fri, 26 May 2006)
New Revision: 11433

Modified:
   trunk/theora/Makefile.am
   trunk/theora/doc/Makefile.am
Log:
Add some missing files to the distribution and properly clean .svn 
directories from the documentation. Fixes #852.


Modified: trunk/theora/Makefile.am
===================================================================
--- trunk/theora/Makefile.am	2006-05-26 20:22:14 UTC (rev 11432)
+++ trunk/theora/Makefile.am	2006-05-26 20:45:26 UTC (rev 11433)
@@ -9,7 +9,8 @@
 # to pick up on the lowercase changelog file and add ChangeLog to DIST_COMMON
 # because of it, breaking make dist.  This works just as well.
 EXTRA_DIST = \
-	CHANGES COPYING autogen.sh win32 \
+	README CHANGES COPYING LICENSE \
+	autogen.sh win32 symbian SConstruct \
 	libtheora.spec libtheora.spec.in \
 	theora-uninstalled.pc.in
 

Modified: trunk/theora/doc/Makefile.am
===================================================================
--- trunk/theora/doc/Makefile.am	2006-05-26 20:22:14 UTC (rev 11432)
+++ trunk/theora/doc/Makefile.am	2006-05-26 20:45:26 UTC (rev 11433)
@@ -6,7 +6,9 @@
 
 built_docs =
 
-static_docs = vp3-format.txt color.html
+static_docs = vp3-format.txt color.html \
+	draft-barbato-avt-rtp-theora-00.xml \
+	draft-barbato-avt-rtp-theora-00.txt
 
 doc_DATA = $(built_docs) $(static_docs) doxygen-build.stamp
 
@@ -29,20 +31,30 @@
 dist-hook:
 	if test -d libtheora; then \
 	  mkdir $(dist_docdir); \
+	  echo -n "copying built documenation..."; \
 	  for dir in libtheora/*; do \
 	    b=`basename $$dir`; \
-	    if test $$b != "CVS"; then \
+	    if test $$b != ".svn"; then \
 	      if test -d $$dir; then \
 		mkdir $(dist_docdir)/$$b; \
 		for f in $$dir/*; do \
 		  cp -p $$f $(dist_docdir)/$$b; \
-		done \
-	      fi \
-	    fi \
-	  done \
+		done; \
+	      fi; \
+	    fi; \
+	  done; \
+	  echo "OK"; \
 	fi
+	for item in $(EXTRA_DIST); do \
+	  if test -d $$item; then \
+	    echo -n "cleaning $$item dir for distribution..."; \
+	    rm -rf `find $(distdir)/$$item -name .svn`; \
+	    echo "OK"; \
+	  fi; \
+	done
 
 
+
 install-data-local: doxygen-build.stamp
 	$(mkinstalldirs) $(DESTDIR)$(docdir)
 	if test -d libtheora; then \