[xiph-commits] r10741 - in trunk/theora: . examples

[giles at svn.xiph.org]

Author: giles
Date: 2006-01-19 15:50:25 -0800 (Thu, 19 Jan 2006)
New Revision: 10741

Modified:
   trunk/theora/Makefile.am
   trunk/theora/examples/player_example.c
Log:
Remove the debian subdirectory from the distribution target at the 
request of the debian maintainer.


Modified: trunk/theora/Makefile.am
===================================================================
--- trunk/theora/Makefile.am	2006-01-19 23:31:14 UTC (rev 10740)
+++ trunk/theora/Makefile.am	2006-01-19 23:50:25 UTC (rev 10741)
@@ -10,16 +10,19 @@
 # because of it, breaking make dist.  This works just as well.
 EXTRA_DIST = \
 	COPYING autogen.sh win32 libtheora.spec libtheora.spec.in \
-	theora-uninstalled.pc.in \
-	debian
+	theora-uninstalled.pc.in
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = theora.pc
 
 dist-hook:
-	rm -rf `find $(distdir)/debian -name .svn`
-	rm -rf `find $(distdir)/debian -name "Makefile*"`
-	rm -rf `find $(distdir)/win32 -name .svn`
+	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
 
 debug:
 	$(MAKE) all CFLAGS="@DEBUG@"

Modified: trunk/theora/examples/player_example.c
===================================================================
--- trunk/theora/examples/player_example.c	2006-01-19 23:31:14 UTC (rev 10740)
+++ trunk/theora/examples/player_example.c	2006-01-19 23:50:25 UTC (rev 10741)
@@ -655,9 +655,9 @@
            keyframing.  Soon enough libtheora will be able to deal
            with non-keyframe seeks.  */
 
-        if(videobuf_time>=get_time())
+        //if(videobuf_time>=get_time())
         videobuf_ready=1;
-                
+	fprintf(stderr, "got frame at %fs\n", videobuf_time);                
       }else
         break;
     }