From fcd8e10ff1996d89369a566ae2551c18b5495a29 Mon Sep 17 00:00:00 2001 From: erikd Date: Thu, 22 Nov 2007 11:18:25 +0000 Subject: [PATCH] fix 'make distcheck'. before and after tarballs almost identical. svn path=/trunk/vorbis/; revision=14215 --- Makefile.am | 4 ++-- doc/Makefile.am | 2 ++ doc/vorbisenc/Makefile.am | 6 ++++-- doc/vorbisfile/Makefile.am | 1 + examples/Makefile.am | 16 +++++++++++----- vq/Makefile.am | 10 +++++++++- 6 files changed, 29 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index 52f68d0..1ac8620 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 @@ EXTRA_DIST = \ vorbis-uninstalled.pc.in \ vorbisenc-uninstalled.pc.in \ vorbisfile-uninstalled.pc.in \ - doc examples symbian vq \ + symbian \ macos macosx win32 diff --git a/doc/Makefile.am b/doc/Makefile.am index cceea7f..fe466d7 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -10,6 +10,7 @@ static_docs = \ 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 @@ doc_sources = xml/Vorbis_I_spec.xml \ 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 \ diff --git a/doc/vorbisenc/Makefile.am b/doc/vorbisenc/Makefile.am index 331feef..f7eb4a9 100644 --- a/doc/vorbisenc/Makefile.am +++ b/doc/vorbisenc/Makefile.am @@ -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) diff --git a/doc/vorbisfile/Makefile.am b/doc/vorbisfile/Makefile.am index 64cfa52..26977e0 100644 --- a/doc/vorbisfile/Makefile.am +++ b/doc/vorbisfile/Makefile.am @@ -7,6 +7,7 @@ doc_DATA = OggVorbis_File.html callbacks.html chaining_example_c.html\ 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\ diff --git a/examples/Makefile.am b/examples/Makefile.am index 53db402..4518976 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -7,19 +7,25 @@ INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@ 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@" diff --git a/vq/Makefile.am b/vq/Makefile.am index f8ac59d..2dc8a7a 100644 --- a/vq/Makefile.am +++ b/vq/Makefile.am @@ -22,7 +22,15 @@ huffbuild_SOURCES = huffbuild.c vqgen.c bookutil.c\ 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@" -- 2.7.4