motherfucking cvs...

build system is now libtool 1.3.5 capatable... sorry beos guys

svn path=/trunk/vorbis/; revision=1059

diff --git a/lib/Makefile.am b/lib/Makefile.am
index c84b7c4..638be6c 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -19,11 +19,9 @@ libvorbis_la_SOURCES = mdct.c smallft.c block.c envelope.c window.c lsp.c lpc.c\
 libvorbis_la_LDFLAGS = -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
 
 libvorbisfile_la_SOURCES = vorbisfile.c
-libvorbisfile_la_LIBADD = libvorbis.la
 libvorbisfile_la_LDFLAGS = -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
 
 libvorbisenc_la_SOURCES = vorbisenc.c
-libvorbisenc_la_LIBADD = libvorbis.la
 libvorbisenc_la_LDFLAGS = -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
 
 EXTRA_PROGRAMS = barkmel tone psytune

diff --git a/lib/books/Makefile.am b/lib/books/Makefile.am
index bf3b96c..c791b38 100644 (file)
--- a/lib/books/Makefile.am
+++ b/lib/books/Makefile.am
@@ -2,49 +2,31 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-EXTRA_DIST = lsp12_0.vqh lsp30_0.vqh res0_1024a_128_1.vqh res0_1024a_128_2.vqh\
-       res0_1024a_128_3.vqh res0_1024a_128_4.vqh res0_1024a_128_5.vqh\
-       res0_1024a_128_6.vqh res0_1024a_128_7.vqh res0_1024a_128_8.vqh\
-       res0_1024a_128_9.vqh res0_1024a_160_1.vqh res0_1024a_160_2.vqh\
-       res0_1024a_160_3.vqh res0_1024a_160_4.vqh res0_1024a_160_5.vqh\
-       res0_1024a_160_6.vqh res0_1024a_160_7.vqh res0_1024a_160_8.vqh\
-       res0_1024a_160_9.vqh res0_1024a_192_1.vqh res0_1024a_192_2.vqh\
-       res0_1024a_192_3.vqh res0_1024a_192_4.vqh res0_1024a_192_5.vqh\
-       res0_1024a_256_1.vqh res0_1024a_256_2.vqh res0_1024a_256_3.vqh\
-       res0_1024a_256_4.vqh res0_1024a_256_5.vqh res0_1024a_350_1.vqh\
-       res0_1024a_350_2.vqh res0_1024a_350_3.vqh res0_1024a_350_4.vqh\
-       res0_1024a_350_5.vqh res0_128_1024_1.vqh res0_128_1024_2.vqh\
+EXTRA_DIST = lsp12_0.vqh lsp30_0.vqh res0_128_1024_1.vqh res0_128_1024_2.vqh\
        res0_128_1024_3.vqh res0_128_1024_4.vqh res0_128_1024_5.vqh\
        res0_128_1024_6.vqh res0_128_1024_7.vqh res0_128_1024_8.vqh\
        res0_128_1024_9.vqh res0_128_1024aux.vqh res0_128_128_1.vqh\
        res0_128_128_2.vqh res0_128_128_3.vqh res0_128_128_4.vqh\
-       res0_128_128_5.vqh res0_128_128aux.vqh res0_128a_128_1.vqh\
-       res0_128a_128_2.vqh res0_128a_128_3.vqh res0_128a_128_4.vqh\
-       res0_128a_128_5.vqh res0_128a_160_1.vqh res0_128a_160_2.vqh\
-       res0_128a_160_3.vqh res0_128a_160_4.vqh res0_128a_160_5.vqh\
-       res0_128a_192_1.vqh res0_128a_192_2.vqh res0_128a_192_3.vqh\
-       res0_128a_192_4.vqh res0_128a_192_5.vqh res0_128a_256_1.vqh\
-       res0_128a_256_2.vqh res0_128a_256_3.vqh res0_128a_256_4.vqh\
-       res0_128a_256_5.vqh res0_128a_350_1.vqh res0_128a_350_2.vqh\
-       res0_128a_350_3.vqh res0_128a_350_4.vqh res0_128a_350_5.vqh\
-       res0_160_1024_1.vqh res0_160_1024_2.vqh res0_160_1024_3.vqh\
-       res0_160_1024_4.vqh res0_160_1024_5.vqh res0_160_1024_6.vqh\
-       res0_160_1024_7.vqh res0_160_1024_8.vqh res0_160_1024_9.vqh\
-       res0_160_1024aux.vqh res0_160_128_1.vqh res0_160_128_2.vqh\
-       res0_160_128_3.vqh res0_160_128_4.vqh res0_160_128_5.vqh\
-       res0_160_128aux.vqh res0_192_1024_1.vqh res0_192_1024_2.vqh\
-       res0_192_1024_3.vqh res0_192_1024_4.vqh res0_192_1024_5.vqh\
-       res0_192_1024aux.vqh res0_192_128_1.vqh res0_192_128_2.vqh\
-       res0_192_128_3.vqh res0_192_128_4.vqh res0_192_128_5.vqh\
-       res0_192_128aux.vqh res0_256_1024_1.vqh res0_256_1024_2.vqh\
-       res0_256_1024_3.vqh res0_256_1024_4.vqh res0_256_1024_5.vqh\
-       res0_256_1024aux.vqh res0_256_128_1.vqh res0_256_128_2.vqh\
-       res0_256_128_3.vqh res0_256_128_4.vqh res0_256_128_5.vqh\
-       res0_256_128aux.vqh res0_96_1024_1.vqh res0_96_1024_2.vqh\
-       res0_96_1024_3.vqh res0_96_1024_4.vqh res0_96_1024_5.vqh\
-       res0_96_1024_6.vqh res0_96_1024_7.vqh res0_96_1024aux.vqh\
-       res0_96_128_1.vqh res0_96_128_2.vqh res0_96_128_3.vqh\
-       res0_96_128_4.vqh res0_96_128aux.vqh resaux0_1024a_128.vqh\
-       resaux0_1024a_160.vqh resaux0_1024a_192.vqh resaux0_1024a_256.vqh\
-       resaux0_1024a_350.vqh resaux0_128a_128.vqh resaux0_128a_160.vqh\
-       resaux0_128a_192.vqh resaux0_128a_256.vqh resaux0_128a_350.vqh
+       res0_128_128_5.vqh res0_128_128aux.vqh res0_160_1024_1.vqh\
+       res0_160_1024_2.vqh res0_160_1024_3.vqh res0_160_1024_4.vqh\
+       res0_160_1024_5.vqh res0_160_1024_6.vqh res0_160_1024_7.vqh\
+       res0_160_1024_8.vqh res0_160_1024_9.vqh res0_160_1024aux.vqh\
+       res0_160_128_1.vqh res0_160_128_2.vqh res0_160_128_3.vqh\
+       res0_160_128_4.vqh res0_160_128_5.vqh res0_160_128aux.vqh\
+       res0_192_1024_1.vqh res0_192_1024_2.vqh res0_192_1024_3.vqh\
+       res0_192_1024_4.vqh res0_192_1024_5.vqh res0_192_1024aux.vqh\
+       res0_192_128_1.vqh res0_192_128_2.vqh res0_192_128_3.vqh\
+       res0_192_128_4.vqh res0_192_128_5.vqh res0_192_128aux.vqh\
+       res0_256_1024_1.vqh res0_256_1024_2.vqh res0_256_1024_3.vqh\
+       res0_256_1024_4.vqh res0_256_1024_5.vqh res0_256_1024aux.vqh\
+       res0_256_128_1.vqh res0_256_128_2.vqh res0_256_128_3.vqh\
+       res0_256_128_4.vqh res0_256_128_5.vqh res0_256_128aux.vqh\
+       res0_350_1024_1.vqh res0_350_1024_2.vqh res0_350_1024_3.vqh\
+       res0_350_1024_4.vqh res0_350_1024_5.vqh res0_350_1024aux.vqh\
+       res0_350_128_1.vqh res0_350_128_2.vqh res0_350_128_3.vqh\
+       res0_350_128_4.vqh res0_350_128_5.vqh res0_350_128aux.vqh\
+       res0_96_1024_1.vqh res0_96_1024_2.vqh res0_96_1024_3.vqh\
+       res0_96_1024_4.vqh res0_96_1024_5.vqh res0_96_1024_6.vqh\
+       res0_96_1024_7.vqh res0_96_1024aux.vqh res0_96_128_1.vqh\
+       res0_96_128_2.vqh res0_96_128_3.vqh res0_96_128_4.vqh\
+       res0_96_128_5.vqh res0_96_128aux.vqh

diff --git a/ltconfig b/ltconfig
deleted file mode 100644 (file)
index 1e804dc..0000000
--- a/ltconfig
+++ /dev/null
@@ -1,4 +0,0 @@
-This is not used.  And should be removed once a suitable automake comes
-out that doesn't hardcode this file in.
-
-jack.