[xiph-commits] r14215 - in trunk/vorbis: . doc doc/vorbisenc doc/vorbisfile examples vq

[erikd at svn.xiph.org]

Author: erikd
Date: 2007-11-22 03:18:25 -0800 (Thu, 22 Nov 2007)
New Revision: 14215

Modified:
   trunk/vorbis/Makefile.am
   trunk/vorbis/doc/Makefile.am
   trunk/vorbis/doc/vorbisenc/Makefile.am
   trunk/vorbis/doc/vorbisfile/Makefile.am
   trunk/vorbis/examples/Makefile.am
   trunk/vorbis/vq/Makefile.am
Log:
fix 'make distcheck'. before and after tarballs almost identical.

Modified: trunk/vorbis/Makefile.am
===================================================================
--- trunk/vorbis/Makefile.am	2007-11-22 11:03:09 UTC (rev 14214)
+++ trunk/vorbis/Makefile.am	2007-11-22 11:18:25 UTC (rev 14215)
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = 1.6 foreign dist-zip dist-bzip2
 
-SUBDIRS = m4 include vq lib examples doc
+SUBDIRS = m4 include vq lib examples test doc
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = vorbis.m4
@@ -19,7 +19,7 @@
 	vorbis-uninstalled.pc.in \
 	vorbisenc-uninstalled.pc.in \
 	vorbisfile-uninstalled.pc.in \
-	doc examples symbian vq \
+	symbian \
 	macos macosx win32
 
 

Modified: trunk/vorbis/doc/Makefile.am
===================================================================
--- trunk/vorbis/doc/Makefile.am	2007-11-22 11:03:09 UTC (rev 14214)
+++ trunk/vorbis/doc/Makefile.am	2007-11-22 11:18:25 UTC (rev 14215)
@@ -10,6 +10,7 @@
 	draft-ietf-avt-rtp-vorbis-08.txt \
 	eightphase.png \
 	evenlsp.png \
+	fish_xiph_org.png \
 	floor1_inverse_dB_table.html \
 	floorval.png \
 	fourphase.png \
@@ -75,6 +76,7 @@
 	xml/08-residue.xml \
 	xml/09-helper.xml \
 	xml/10-tables.xml \
+	xml/TODO \
 	xml/a1-encapsulation_ogg.xml \
 	xml/a2-encapsulation_rtp.xml \
 	xml/footer.xml \

Modified: trunk/vorbis/doc/vorbisenc/Makefile.am
===================================================================
--- trunk/vorbis/doc/vorbisenc/Makefile.am	2007-11-22 11:03:09 UTC (rev 14214)
+++ trunk/vorbis/doc/vorbisenc/Makefile.am	2007-11-22 11:18:25 UTC (rev 14215)
@@ -2,8 +2,10 @@
 
 docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisenc
 
-doc_DATA = index.html overview.html reference.html style.css\
-	 vorbis_encode_ctl.html vorbis_encode_init.html vorbis_info.html\
+doc_DATA = changes.html examples.html index.html ov_ectl_ratemanage2_arg.html \
+	ov_ectl_ratemanage_arg.html overview.html reference.html style.css\
+	vorbis_encode_ctl.html vorbis_encode_init.html vorbis_encode_setup_init.html \
+	vorbis_encode_setup_managed.html vorbis_encode_setup_vbr.html vorbis_info.html \
 	vorbis_encode_init_vbr.html
 
 EXTRA_DIST = $(doc_DATA)

Modified: trunk/vorbis/doc/vorbisfile/Makefile.am
===================================================================
--- trunk/vorbis/doc/vorbisfile/Makefile.am	2007-11-22 11:03:09 UTC (rev 14214)
+++ trunk/vorbis/doc/vorbisfile/Makefile.am	2007-11-22 11:18:25 UTC (rev 14215)
@@ -7,6 +7,7 @@
 	example.html exampleindex.html fileinfo.html index.html\
 	initialization.html ov_bitrate.html ov_bitrate_instant.html\
 	ov_callbacks.html ov_clear.html ov_comment.html ov_crosslap.html\
+	ov_fopen.html\
 	ov_info.html ov_open.html ov_open_callbacks.html ov_pcm_seek.html\
 	ov_pcm_seek_lap.html ov_pcm_seek_page.html ov_pcm_seek_page_lap.html\
 	ov_pcm_tell.html ov_pcm_total.html ov_raw_seek.html\

Modified: trunk/vorbis/examples/Makefile.am
===================================================================
--- trunk/vorbis/examples/Makefile.am	2007-11-22 11:03:09 UTC (rev 14214)
+++ trunk/vorbis/examples/Makefile.am	2007-11-22 11:18:25 UTC (rev 14215)
@@ -7,19 +7,25 @@
 noinst_PROGRAMS = decoder_example encoder_example chaining_example\
 		vorbisfile_example seeking_example
 
+EXTRA_DIST = frameview.pl
+
 # uncomment to build static executables from the example code
 #LDFLAGS = -all-static 
-LDADD = ../lib/libvorbis.la 
 
 decoder_example_SOURCES = decoder_example.c
+decoder_example_LDADD = $(top_builddir)/lib/libvorbis.la 
+
 encoder_example_SOURCES = encoder_example.c
-encoder_example_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la 
+encoder_example_LDADD = $(top_builddir)/lib/libvorbisenc.la $(top_builddir)/lib/libvorbis.la 
+
 chaining_example_SOURCES = chaining_example.c
-chaining_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la 
+chaining_example_LDADD = $(top_builddir)/lib/libvorbisfile.la $(top_builddir)/lib/libvorbis.la 
+
 vorbisfile_example_SOURCES = vorbisfile_example.c
-vorbisfile_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la 
+vorbisfile_example_LDADD = $(top_builddir)/lib/libvorbisfile.la $(top_builddir)/lib/libvorbis.la 
+
 seeking_example_SOURCES = seeking_example.c
-seeking_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la 
+seeking_example_LDADD = $(top_builddir)/lib/libvorbisfile.la $(top_builddir)/lib/libvorbis.la 
 
 debug:
 	$(MAKE) all CFLAGS="@DEBUG@"

Modified: trunk/vorbis/vq/Makefile.am
===================================================================
--- trunk/vorbis/vq/Makefile.am	2007-11-22 11:03:09 UTC (rev 14214)
+++ trunk/vorbis/vq/Makefile.am	2007-11-22 11:18:25 UTC (rev 14215)
@@ -22,8 +22,16 @@
 distribution_SOURCES = distribution.c bookutil.c\
 	bookutil.h localcodebook.h
 
-EXTRA_DIST = residue_entropy auxpartition.pl
+vqs_files = 16.vqs 16u.vqs 44c-1.vqs 44c0.vqs 44c1.vqs 44c2.vqs \
+	44c3.vqs 44c4.vqs 44c5.vqs 44c6.vqs 44c7.vqs 44c8.vqs 44c9.vqs \
+	44u0.vqs 44u1.vqs 44u2.vqs 44u3.vqs 44u4.vqs 44u5.vqs 44u6.vqs \
+	44u7.vqs 44u8.vqs 44u9.vqs 8.vqs 8u.vqs floor_11.vqs floor_22.vqs \
+	floor_44.vqs
 
+EXTRA_DIST = $(vqs_files) build.c cascade.c genericdata.c lspdata.c \
+	make_floor_books.pl make_residue_books.pl metrics.c residue_entropy \
+	residuedata.c residuesplit.c run.c train.c vqext.h auxpartition.pl
+
 debugvq:
 	$(MAKE) vq CFLAGS="@DEBUG@"