Fix build failures reported by 'make distcheck'. Apparently automake

can't glob reliably.

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

diff --git a/configure.in b/configure.in
index 74f0455..467c292 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -187,4 +187,4 @@ AC_SUBST(DEBUG)
 AC_SUBST(PROFILE)
 AC_SUBST(pthread_lib)
 
-AC_OUTPUT(Makefile lib/Makefile lib/modes/Makefile lib/books/Makefile doc/Makefile doc/vorbisfile/Makefile doc/vorbisenc/Makefile include/Makefile include/vorbis/Makefile examples/Makefile win32/Makefile debian/Makefile vq/Makefile)
+AC_OUTPUT(Makefile lib/Makefile lib/modes/Makefile lib/books/Makefile lib/books/coupled/Makefile lib/books/uncoupled/Makefile lib/books/floor/Makefile doc/Makefile doc/vorbisfile/Makefile doc/vorbisenc/Makefile include/Makefile include/vorbis/Makefile examples/Makefile win32/Makefile debian/Makefile vq/Makefile)

diff --git a/lib/books/Makefile.am b/lib/books/Makefile.am
index 1bae988..498ec3d 100644 (file)
--- a/lib/books/Makefile.am
+++ b/lib/books/Makefile.am
@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-
-EXTRA_DIST = floor/*.vqh coupled/*.vqh uncoupled/*.vqh
+SUBDIRS = coupled uncoupled floor

diff --git a/lib/books/coupled/.cvsignore b/lib/books/coupled/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/lib/books/coupled/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/lib/books/coupled/Makefile.am b/lib/books/coupled/Makefile.am
new file mode 100644 (file)
index 0000000..e67b0c6
--- /dev/null
+++ b/lib/books/coupled/Makefile.am
@@ -0,0 +1,106 @@
+## Process this file with automake to produce Makefile.in
+
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = _44c0_long.vqh _44c0_s0_p0_r0.vqh _44c0_s0_p0_r1.vqh \
+       _44c0_s0_p1_0.vqh _44c0_s0_p2_0.vqh _44c0_s0_p3_0.vqh\
+       _44c0_s0_p4_0.vqh _44c0_s0_p4_1.vqh _44c0_s0_p5_0.vqh\
+       _44c0_s0_p6_0.vqh _44c0_s0_p7_0.vqh _44c0_s0_p7_1.vqh\
+       _44c0_s0_p7_2.vqh _44c0_s0_pN_r0.vqh _44c0_s0_pN_r1.vqh\
+       _44c0_s1_p5_0.vqh _44c0_s1_p5_s0.vqh _44c0_s1_p6_0.vqh\
+       _44c0_s1_p6_s0.vqh _44c0_s1_p7_0.vqh _44c0_s1_p7_1.vqh _44c0_s1_p7_2.vqh\
+       _44c0_s1_p7_s0.vqh _44c0_s1_pS_r0.vqh _44c0_s1_pS_r1.vqh\
+       _44c0_s2_p6_0.vqh _44c0_s2_p6_s0.vqh _44c0_s2_p7_0.vqh\
+       _44c0_s2_p7_1.vqh _44c0_s2_p7_2.vqh _44c0_s2_p7_s0.vqh _44c0_s3_p7_0.vqh\
+       _44c0_s3_p7_1.vqh _44c0_s3_p7_2.vqh _44c0_s3_p7_s0.vqh\
+       _44c0_s4_p7_0.vqh _44c0_s4_p7_1.vqh _44c0_s4_p7_2.vqh _44c0_short.vqh\
+       _44c1_long.vqh _44c1_s0_p1_0.vqh _44c1_s0_p2_0.vqh\
+       _44c1_s0_p3_0.vqh _44c1_s0_p4_0.vqh _44c1_s0_p4_1.vqh\
+       _44c1_s0_p5_0.vqh _44c1_s0_p6_0.vqh _44c1_s0_p7_0.vqh\
+       _44c1_s0_p7_1.vqh _44c1_s0_p7_2.vqh _44c1_s1_p5_0.vqh\
+       _44c1_s1_p6_0.vqh _44c1_s1_p7_0.vqh _44c1_s1_p7_1.vqh\
+       _44c1_s1_p7_2.vqh _44c1_s2_p6_0.vqh _44c1_s2_p7_0.vqh\
+       _44c1_s2_p7_1.vqh _44c1_s2_p7_2.vqh _44c1_s3_p7_0.vqh\
+       _44c1_s3_p7_1.vqh _44c1_s3_p7_2.vqh _44c1_short.vqh\
+       _44c2_long.vqh _44c2_s0_p1_0.vqh _44c2_s0_p2_0.vqh\
+       _44c2_s0_p3_0.vqh _44c2_s0_p4_0.vqh _44c2_s0_p4_1.vqh\
+       _44c2_s0_p5_0.vqh _44c2_s0_p6_0.vqh _44c2_s0_p7_0.vqh\
+       _44c2_s0_p7_1.vqh _44c2_s0_p7_2.vqh _44c2_s1_p5_0.vqh\
+       _44c2_s1_p6_0.vqh _44c2_s1_p7_0.vqh _44c2_s1_p7_1.vqh\
+       _44c2_s1_p7_2.vqh _44c2_s2_p6_0.vqh _44c2_s2_p7_0.vqh\
+       _44c2_s2_p7_1.vqh _44c2_s2_p7_2.vqh _44c2_s3_p7_0.vqh\
+       _44c2_s3_p7_1.vqh _44c2_s3_p7_2.vqh _44c2_short.vqh\
+       _44c3_long.vqh _44c3_s0_p1_0.vqh _44c3_s0_p2_0.vqh\
+       _44c3_s0_p3_0.vqh _44c3_s0_p4_0.vqh _44c3_s0_p4_1.vqh\
+       _44c3_s0_p5_0.vqh _44c3_s0_p6_0.vqh _44c3_s0_p7_0.vqh\
+       _44c3_s0_p7_1.vqh _44c3_s0_p7_2.vqh _44c3_s1_p5_0.vqh\
+       _44c3_s1_p6_0.vqh _44c3_s1_p7_0.vqh _44c3_s1_p7_1.vqh\
+       _44c3_s1_p7_2.vqh _44c3_s2_p6_0.vqh _44c3_s2_p7_0.vqh\
+       _44c3_s2_p7_1.vqh _44c3_s2_p7_2.vqh _44c3_s3_p7_0.vqh\
+       _44c3_s3_p7_1.vqh _44c3_s3_p7_2.vqh _44c3_short.vqh\
+       _44c4_long.vqd _44c4_long.vqh _44c4_s0_p0_r0.vqh\
+       _44c4_s0_p0_r1.vqh _44c4_s0_p1_0.vqh _44c4_s0_p2_0.vqh\
+       _44c4_s0_p3_0.vqh _44c4_s0_p4_0.vqh _44c4_s0_p5_0.vqh\
+       _44c4_s0_p6_0.vqh _44c4_s0_p7_0.vqh _44c4_s0_p7_1.vqh\
+       _44c4_s0_p8_0.vqh _44c4_s0_p8_1.vqh _44c4_s0_p9_0.vqh\
+       _44c4_s0_p9_1.vqh _44c4_s0_p9_2.vqh _44c4_s0_pN_r0.vqh\
+       _44c4_s0_pN_r1.vqh _44c4_s1_p2_0.vqh _44c4_s1_p2_s0.vqh\
+       _44c4_s1_p4_0.vqh _44c4_s1_p4_s0.vqh _44c4_s1_p6_0.vqh\
+       _44c4_s1_p6_s0.vqh _44c4_s1_p7_0.vqh _44c4_s1_p7_1.vqh\
+       _44c4_s1_p7_s0.vqh _44c4_s1_p8_0.vqh _44c4_s1_p8_1.vqh\
+       _44c4_s1_p8_s0.vqh _44c4_s1_p9_0.vqh _44c4_s1_p9_1.vqh\
+       _44c4_s1_p9_2.vqh _44c4_s1_p9_s0.vqh _44c4_s1_pS_r0.vqh\
+       _44c4_s1_pS_r1.vqh _44c4_s2_p6_0.vqh _44c4_s2_p6_s0.vqh\
+       _44c4_s2_p7_0.vqh _44c4_s2_p7_1.vqh _44c4_s2_p7_s0.vqh\
+       _44c4_s2_p8_0.vqh _44c4_s2_p8_1.vqh _44c4_s2_p8_s0.vqh\
+       _44c4_s2_p9_0.vqh _44c4_s2_p9_1.vqh _44c4_s2_p9_2.vqh\
+       _44c4_s2_p9_s0.vqh _44c4_s3_p7_0.vqh _44c4_s3_p7_1.vqh\
+       _44c4_s3_p8_0.vqh _44c4_s3_p8_1.vqh _44c4_s3_p9_0.vqh\
+       _44c4_s3_p9_1.vqh _44c4_s3_p9_2.vqh _44c4_s3_p9_s0.vqh\
+       _44c4_short.vqd _44c4_short.vqh _44c5_long.vqh\
+       _44c5_s0_p1_0.vqh _44c5_s0_p2_0.vqh _44c5_s0_p3_0.vqh\
+       _44c5_s0_p4_0.vqh _44c5_s0_p5_0.vqh _44c5_s0_p6_0.vqh\
+       _44c5_s0_p7_0.vqh _44c5_s0_p7_1.vqh _44c5_s0_p8_0.vqh\
+       _44c5_s0_p8_1.vqh _44c5_s0_p9_0.vqh _44c5_s0_p9_1.vqh\
+       _44c5_s0_p9_2.vqh _44c5_s1_p2_0.vqh _44c5_s1_p4_0.vqh\
+       _44c5_s1_p6_0.vqh _44c5_s1_p7_0.vqh _44c5_s1_p7_1.vqh\
+       _44c5_s1_p8_0.vqh _44c5_s1_p8_1.vqh _44c5_s1_p9_0.vqh\
+       _44c5_s1_p9_1.vqh _44c5_s1_p9_2.vqh _44c5_s2_p6_0.vqh\
+       _44c5_s2_p7_0.vqh _44c5_s2_p7_1.vqh _44c5_s2_p8_0.vqh\
+       _44c5_s2_p8_1.vqh _44c5_s2_p9_0.vqh _44c5_s2_p9_1.vqh\
+       _44c5_s2_p9_2.vqh _44c5_s3_p7_0.vqh _44c5_s3_p7_1.vqh\
+       _44c5_s3_p8_0.vqh _44c5_s3_p8_1.vqh _44c5_s3_p9_0.vqh\
+       _44c5_s3_p9_1.vqh _44c5_s3_p9_2.vqh _44c5_short.vqh\
+       _44c6_long.vqh _44c6_s0_p1_0.vqh _44c6_s0_p2_0.vqh\
+       _44c6_s0_p3_0.vqh _44c6_s0_p4_0.vqh _44c6_s0_p5_0.vqh\
+       _44c6_s0_p6_0.vqh _44c6_s0_p7_0.vqh _44c6_s0_p7_1.vqh\
+       _44c6_s0_p8_0.vqh _44c6_s0_p8_1.vqh _44c6_s0_p9_0.vqh\
+       _44c6_s0_p9_1.vqh _44c6_s0_p9_2.vqh _44c6_s1_p2_0.vqh\
+       _44c6_s1_p4_0.vqh _44c6_s1_p6_0.vqh _44c6_s1_p7_0.vqh\
+       _44c6_s1_p7_1.vqh _44c6_s1_p8_0.vqh _44c6_s1_p8_1.vqh\
+       _44c6_s1_p9_0.vqh _44c6_s1_p9_1.vqh _44c6_s1_p9_2.vqh\
+       _44c6_s2_p6_0.vqh _44c6_s2_p7_0.vqh _44c6_s2_p7_1.vqh\
+       _44c6_s2_p8_0.vqh _44c6_s2_p8_1.vqh _44c6_s2_p9_0.vqh\
+       _44c6_s2_p9_1.vqh _44c6_s2_p9_2.vqh _44c6_s3_p7_0.vqh\
+       _44c6_s3_p7_1.vqh _44c6_s3_p8_0.vqh _44c6_s3_p8_1.vqh\
+       _44c6_s3_p9_0.vqh _44c6_s3_p9_1.vqh _44c6_s3_p9_2.vqh\
+       _44c6_short.vqh _44c7_long.vqh _44c7_s0_p0_r0.vqh\
+       _44c7_s0_p0_r1.vqh _44c7_s0_p1_0.vqh _44c7_s0_p1_1.vqh\
+       _44c7_s0_p2_0.vqh _44c7_s0_p2_1.vqh _44c7_s0_p3_0.vqh\
+       _44c7_s0_p4_0.vqh _44c7_s0_p5_0.vqh _44c7_s0_p6_0.vqh\
+       _44c7_s0_p6_1.vqh _44c7_s0_p7_0.vqh _44c7_s0_p7_1.vqh\
+       _44c7_s0_p8_0.vqh _44c7_s0_p8_1.vqh _44c7_s0_p9_0.vqh\
+       _44c7_s0_p9_1.vqh _44c7_s0_p9_2.vqh _44c7_s0_pN_r0.vqh\
+       _44c7_s0_pN_r1.vqh _44c7_short.vqh _44c8_long.vqh\
+       _44c8_s0_p1_0.vqh _44c8_s0_p1_1.vqh _44c8_s0_p2_0.vqh\
+       _44c8_s0_p2_1.vqh _44c8_s0_p3_0.vqh _44c8_s0_p4_0.vqh\
+       _44c8_s0_p5_0.vqh _44c8_s0_p6_0.vqh _44c8_s0_p6_1.vqh\
+       _44c8_s0_p7_0.vqh _44c8_s0_p7_1.vqh _44c8_s0_p8_0.vqh\
+       _44c8_s0_p8_1.vqh _44c8_s0_p9_0.vqh _44c8_s0_p9_1.vqh\
+       _44c8_s0_p9_2.vqh _44c8_short.vqh _44c9_long.vqh\
+       _44c9_s0_p1_0.vqh _44c9_s0_p1_1.vqh _44c9_s0_p2_0.vqh\
+       _44c9_s0_p2_1.vqh _44c9_s0_p3_0.vqh _44c9_s0_p4_0.vqh\
+       _44c9_s0_p5_0.vqh _44c9_s0_p6_0.vqh _44c9_s0_p6_1.vqh\
+       _44c9_s0_p7_0.vqh _44c9_s0_p7_1.vqh _44c9_s0_p8_0.vqh\
+       _44c9_s0_p8_1.vqh _44c9_s0_p9_0.vqh _44c9_s0_p9_1.vqh\
+       _44c9_s0_p9_2.vqh _44c9_short.vqh

diff --git a/lib/books/floor/.cvsignore b/lib/books/floor/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/lib/books/floor/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/lib/books/floor/Makefile.am b/lib/books/floor/Makefile.am
new file mode 100644 (file)
index 0000000..15aded6
--- /dev/null
+++ b/lib/books/floor/Makefile.am
@@ -0,0 +1,18 @@
+## Process this file with automake to produce Makefile.in
+
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = line_1024x31_0sub0.vqh line_1024x31_0sub1.vqh\
+       line_1024x31_1sub0.vqh line_1024x31_1sub1.vqh line_1024x31_2sub1.vqh\
+       line_1024x31_2sub2.vqh line_1024x31_2sub3.vqh line_1024x31_3sub1.vqh\
+       line_1024x31_3sub2.vqh line_1024x31_3sub3.vqh line_1024x31_class0.vqh\
+       line_1024x31_class1.vqh line_1024x31_class2.vqh line_1024x31_class3.vqh\
+       line_128x19_0sub0.vqh line_128x19_1sub1.vqh line_128x19_1sub2.vqh\
+       line_128x19_1sub3.vqh line_128x19_2sub1.vqh line_128x19_2sub2.vqh\
+       line_128x19_2sub3.vqh line_128x19_class1.vqh line_128x19_class2.vqh\
+       line_128x7_0sub0.vqh line_128x7_1sub1.vqh line_128x7_1sub2.vqh\
+       line_128x7_1sub3.vqh line_128x7_2sub1.vqh line_128x7_2sub2.vqh\
+       line_128x7_2sub3.vqh line_128x7_class1.vqh line_128x7_class2.vqh\
+       line_128x9_0sub0.vqh line_128x9_1sub1.vqh line_128x9_1sub2.vqh\
+       line_128x9_1sub3.vqh line_128x9_2sub1.vqh line_128x9_2sub2.vqh\
+       line_128x9_2sub3.vqh line_128x9_class1.vqh line_128x9_class2.vqh

diff --git a/lib/books/uncoupled/.cvsignore b/lib/books/uncoupled/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/lib/books/uncoupled/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/lib/books/uncoupled/Makefile.am b/lib/books/uncoupled/Makefile.am
new file mode 100644 (file)
index 0000000..9167d25
--- /dev/null
+++ b/lib/books/uncoupled/Makefile.am
@@ -0,0 +1,20 @@
+## Process this file with automake to produce Makefile.in
+
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = _44u0_p0_r0.vqh _44u0_p0_r1.vqh _44u0_p1_0.vqh\
+       _44u0_p1_r0.vqh _44u0_p1_r1.vqh _44u0_p2_0.vqh _44u0_p3_0.vqh\
+       _44u0_p4_0.vqh _44u0_p4_1.vqh _44u0_p5_0.vqh\
+       _44u0_p6_0.vqh _44u0_p7_0.vqh _44u0_p7_1.vqh\
+       _44u0_p7_2.vqh _44u4_p0_r0.vqh _44u4_p0_r1.vqh\
+       _44u4_p1_0.vqh _44u4_p1_r0.vqh _44u4_p1_r1.vqh\
+       _44u4_p2_0.vqh _44u4_p3_0.vqh _44u4_p4_0.vqh\
+       _44u4_p5_0.vqh _44u4_p6_0.vqh _44u4_p7_0.vqh\
+       _44u4_p7_1.vqh _44u4_p8_0.vqh _44u4_p8_1.vqh\
+       _44u4_p9_0.vqh _44u4_p9_1.vqh _44u4_p9_2.vqh\
+       _44u7_p0_r0.vqh _44u7_p0_r1.vqh _44u7_p1_0.vqh\
+       _44u7_p1_r0.vqh _44u7_p1_r1.vqh _44u7_p2_0.vqh\
+       _44u7_p2_1.vqh _44u7_p3_0.vqh _44u7_p4_0.vqh\
+       _44u7_p5_0.vqh _44u7_p6_0.vqh _44u7_p7_0.vqh\
+       _44u7_p7_1.vqh _44u7_p8_0.vqh _44u7_p8_1.vqh\
+       _44u7_p9_0.vqh _44u7_p9_1.vqh _44u7_p9_2.vqh