Minor build fixes, integrate XMMS into the autoconfed stuff

Extend copyright notices to 2000 Add RCS Id tags to all files Monty svn path=/trunk/vorbis/; revision=218
jhasse · Dec 30, 1999 · 685d068 · 685d068
1 parent 05f2976
commit 685d068
Show file tree

Hide file tree

Showing 44 changed files with 185 additions and 193 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -1,6 +1,6 @@
 # vorbis makefile configured for use with gcc on any platform
 
-# $Id: Makefile.in,v 1.3 1999/12/30 03:46:16 xiphmont Exp $
+# $Id: Makefile.in,v 1.4 1999/12/30 07:26:22 xiphmont Exp $
 
 ###############################################################################
 #                                                                             #
@@ -17,7 +17,11 @@
 
 @SET_MAKE@
 
-SUBDIRS =	lib examples #cmdline
+SUBDIRS =	lib vq examples # cmdline xmms
 
 all debug profile selftest target clean:
 	@for dir in $(SUBDIRS); do (cd $$dir && $(MAKE) $(MFLAGS) $@) || exit 1; done
+	-rm -f *~
+
+distclean:	clean
+	-rm -f Makefile config.* 
diff --git a/configure b/configure
@@ -1929,7 +1929,7 @@ done
 
 ac_given_srcdir=$srcdir
 
-trap 'rm -fr `echo "Makefile lib/Makefile examples/Makefile vq/Makefile cmdline/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile lib/Makefile examples/Makefile vq/Makefile cmdline/Makefile xmms/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -2018,7 +2018,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile lib/Makefile examples/Makefile vq/Makefile cmdline/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile lib/Makefile examples/Makefile vq/Makefile cmdline/Makefile xmms/Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

diff --git a/configure.in b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.7 1999/12/30 03:46:18 xiphmont Exp $
+# $Id: configure.in,v 1.8 1999/12/30 07:26:25 xiphmont Exp $
 
 AC_INIT(lib/mdct.c)
 #AC_CONFIG_HEADER(config.h)
@@ -184,4 +184,4 @@ AC_SUBST(RANLIB)
 #AC_SUBST(LIBGTKDIR)
 AC_SUBST(pthread_lib)
 
-AC_OUTPUT(Makefile lib/Makefile examples/Makefile vq/Makefile cmdline/Makefile)
+AC_OUTPUT(Makefile lib/Makefile examples/Makefile vq/Makefile cmdline/Makefile xmms/Makefile)
diff --git a/examples/chaining_example.c b/examples/chaining_example.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <[email protected]> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <[email protected]> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: illustrate simple use of chained bitstream and vorbisfile.a
- author: Monty <[email protected]>
- modifications by: Monty
- last modification date: Nov 02 1999
+ last mod: $Id: chaining_example.c,v 1.2 1999/12/30 07:26:26 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/examples/decoder_example.c b/examples/decoder_example.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <[email protected]> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <[email protected]> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: simple example decoder
- author: Monty <[email protected]>
- modifications by: Monty
- last modification date: Nov 16 1999
+ last mod: $Id: decoder_example.c,v 1.2 1999/12/30 07:26:27 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/examples/encoder_example.c b/examples/encoder_example.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <[email protected]> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <[email protected]> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: simple example encoder
- author: Monty <[email protected]>
- modifications by: Monty
- last modification date: Nov 16 1999
+ last mod: $Id: encoder_example.c,v 1.2 1999/12/30 07:26:28 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/include/codec.h b/include/codec.h
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <[email protected]> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <[email protected]> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
- function: codec headers
- author: Monty <[email protected]>
- modifications by: Monty
- last modification date: Dec 29 1999
+ function: libvorbis codec headers
+ last mod: $Id: codec.h,v 1.2 1999/12/30 07:26:29 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/include/vorbisfile.h b/include/vorbisfile.h
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <[email protected]> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <[email protected]> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: stdio-based convenience library for opening/seeking/decoding
- author: Monty <[email protected]>
- modifications by: Monty
- last modification date: Nov 04 1999
+ last mod: $Id: vorbisfile.h,v 1.2 1999/12/30 07:26:30 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/lib/Makefile.in b/lib/Makefile.in
@@ -1,6 +1,6 @@
 # vorbis makefile configured for use with gcc on any platform
 
-# $Id: Makefile.in,v 1.16 1999/12/30 03:46:19 xiphmont Exp $
+# $Id: Makefile.in,v 1.17 1999/12/30 07:26:31 xiphmont Exp $
 
 ###############################################################################
 #                                                                             #
@@ -75,5 +75,5 @@ clean:
 	-rm -f *.o *.a test* *~ *.out ogg config.* tone 
 
 distclean:	clean
-	-rf -f Makefile
+	-rm -f Makefile
 
diff --git a/lib/analysis.c b/lib/analysis.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <[email protected]> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <[email protected]> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: single-block PCM analysis
- author: Monty <[email protected]>
- modifications by: Monty
- last modification date: Nov 16 1999
+ last mod: $Id: analysis.c,v 1.18 1999/12/30 07:26:32 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/lib/bitwise.c b/lib/bitwise.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <[email protected]> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <[email protected]> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
   function: packing variable sized words into an octet stream
-  author: Monty <[email protected]>
-  modifications by: Monty
-  last modification date: Aug 04 1999
+  last mod: $Id: bitwise.c,v 1.5 1999/12/30 07:26:33 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/lib/bitwise.h b/lib/bitwise.h
@@ -5,13 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <[email protected]> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <[email protected]> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
   function: packing variable sized words into an octet stream
+  last mod: $Id: bitwise.h,v 1.3 1999/12/30 07:26:34 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/lib/block.c b/lib/block.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <[email protected]> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <[email protected]> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: PCM data vector blocking, windowing and dis/reassembly
- author: Monty <[email protected]>
- modifications by: Monty
- last modification date: Oct 22 1999
+ last mod: $Id: block.c,v 1.18 1999/12/30 07:26:35 xiphmont Exp $
 
  Handle windowing, overlap-add, etc of the PCM vectors.  This is made
  more amusing by Vorbis' current two allowed block sizes.

diff --git a/lib/envelope.c b/lib/envelope.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <[email protected]> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <[email protected]> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: PCM data envelope analysis and manipulation
- author: Monty <[email protected]>
- modifications by: Monty
- last modification date: Oct 22 1999
+ last mod: $Id: envelope.c,v 1.12 1999/12/30 07:26:36 xiphmont Exp $
 
  Preecho calculation.
 

diff --git a/lib/envelope.h b/lib/envelope.h
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <[email protected]> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <[email protected]> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: PCM data envelope analysis and manipulation
- author: Monty <[email protected]>
- modifications by: Monty
- last modification date: Oct 22 1999
+ last mod: $Id: envelope.h,v 1.7 1999/12/30 07:26:37 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/lib/framing.c b/lib/framing.c
@@ -5,21 +5,19 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <[email protected]> and the XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <[email protected]> and the XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: code raw [Vorbis] packets into framed OggSquish stream and
            decode Ogg streams back into raw packets
- author: Monty <[email protected]>
- modifications by: Monty
- last modification date: Jul 22 1999
+ last mod: $Id: framing.c,v 1.12 1999/12/30 07:26:38 xiphmont Exp $
 
  note: The CRC code is directly derived from public domain code by
- Ross Williams ([email protected]).  See framing.txt for
- details.
+ Ross Williams ([email protected]).  See docs/framing.html
+ for details.
 
  ********************************************************************/
 

diff --git a/lib/info.c b/lib/info.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <[email protected]> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <[email protected]> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: maintain the info structure, info <-> header packets
- author: Monty <[email protected]>
- modifications by: Monty
- last modification date: Nov 04 1999
+ last mod: $Id: info.c,v 1.11 1999/12/30 07:26:39 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/lib/lpc.c b/lib/lpc.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <[email protected]> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <[email protected]> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
   function: LPC low level routines
-  author: Monty <[email protected]>
-  modifications by: Monty
-  last modification date: Nov 16 1999
+  last mod: $Id: lpc.c,v 1.10 1999/12/30 07:26:40 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/lib/lpc.h b/lib/lpc.h
@@ -5,13 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <[email protected]> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <[email protected]> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
   function: LPC low level routines
+  last mod: $Id: lpc.h,v 1.5 1999/12/30 07:26:41 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/lib/lsp.c b/lib/lsp.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <[email protected]> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <[email protected]> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
   function: LSP (also called LSF) conversion routines
-  author: Monty <[email protected]>
-  modifications by: Monty
-  last modification date: Nov 16 1999
+  last mod: $Id: lsp.c,v 1.4 1999/12/30 07:26:42 xiphmont Exp $
 
   The LSP generation code is taken (with minimal modification) from
   "On the Computation of the LSP Frequencies" by Joseph Rothweiler