Bringing rc2 (minus the modes it needs) onto mainline. Monty svn path=/trunk/vorbis/; revision=1815

d59cea57 · Monty · f9e9af66 · d59cea57 · d59cea57 · d59cea57
Commit d59cea57 authored Aug 13, 2001 by Monty
159 changed files
--- a/configure.in
+++ b/configure.in
@@ -171,7 +171,6 @@ AC_FUNC_MEMCMP
 AC_CHECK_FUNCS(sqrtf)
 AC_CHECK_FUNCS(logf)
 AC_CHECK_FUNCS(expf)
-AC_CHECK_FUNCS(powf)
 AC_CHECK_FUNCS(acosf)
 AC_CHECK_FUNCS(atanf)
 AC_CHECK_FUNCS(frexpf)

--- a/doc/stereo.html
+++ b/doc/stereo.html
@@ -437,6 +437,10 @@ by the user:<p>
 <dt>aggressive eight phase stereo
 <dd>a mixed mode combining lossless stereo for frequencies to approximately 2 kHz (and for all strong pure tones) and eight phase stereo above<p>

+<dt>eight/four phase stero <dd>A mixed mode combining lossless stereo
+for bass, eight phase stereo for noisy content and lossless stereo for
+tones to approximately 4kHz and four phase stereo above 4kHz.<p>
+
 <dt>eight phase/point stero <dd>A mixed mode combining lossless stereo
 for bass, eight phase stereo for noisy content and lossless stereo for
 tones to approximately 4kHz and point stereo above 4kHz.<p>

--- a/examples/chaining_example.c
+++ b/examples/chaining_example.c
@@ -11,7 +11,7 @@
 ********************************************************************

 function: illustrate simple use of chained bitstream and vorbisfile.a
- last mod: $Id: chaining_example.c,v 1.9 2001/02/26 03:50:38 xiphmont Exp $
+ last mod: $Id: chaining_example.c,v 1.10 2001/08/13 01:36:55 xiphmont Exp $

 ********************************************************************/

@@ -46,6 +46,8 @@ int main(){
    printf("\t\t%ldHz %d channels bitrate %ldkbps serial number=%ld\n",
 	   vi->rate,vi->channels,ov_bitrate(&ov,i)/1000,
 	   ov_serialnumber(&ov,i));
+    printf("\t\theader length: %ld bytes\n",(long)
+	   (ov.dataoffsets[i]-ov.offsets[i]));
    printf("\t\tcompressed length: %ld bytes ",(long)(ov_raw_total(&ov,i)));
    printf(" play time: %lds\n",(long)ov_time_total(&ov,i));
  }

--- a/include/vorbis/vorbisenc.h
+++ b/include/vorbis/vorbisenc.h
@@ -11,7 +11,7 @@
 ********************************************************************

 function: vorbis encode-engine setup
- last mod: $Id: vorbisenc.h,v 1.4 2001/02/26 03:50:39 xiphmont Exp $
+ last mod: $Id: vorbisenc.h,v 1.5 2001/08/13 01:36:56 xiphmont Exp $

 ********************************************************************/

@@ -33,6 +33,13 @@ extern int vorbis_encode_init(vorbis_info *vi,
 			      long nominal_bitrate,
 			      long min_bitrate);

+extern int vorbis_encode_init_vbr(vorbis_info *vi,
+				  long channels,
+				  long rate,
+				  
+				  float /* quality level from 0. (lo) to 1. (hi) */
+				  );
+
 extern int vorbis_encode_ctl(vorbis_info *vi,int number,void *arg);



--- a/lib/analysis.c
+++ b/lib/analysis.c
@@ -7,11 +7,11 @@
 *                                                                  *
 * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
 * by the XIPHOPHORUS Company http://www.xiph.org/                  *
-
+ *                                                                  *
 ********************************************************************

 function: single-block PCM analysis mode dispatch
- last mod: $Id: analysis.c,v 1.45 2001/08/07 13:04:41 msmith Exp $
+ last mod: $Id: analysis.c,v 1.46 2001/08/13 01:36:56 xiphmont Exp $

 ********************************************************************/

@@ -20,10 +20,13 @@
 #include <math.h>
 #include <ogg/ogg.h>
 #include "vorbis/codec.h"
+#include "codec_internal.h"
 #include "registry.h"
 #include "scales.h"
 #include "os.h"

+int analysis_noisy=1;
+
 /* decides between modes, dispatches to the appropriate mapping. */
 int vorbis_analysis(vorbis_block *vb,ogg_packet *op){
  vorbis_dsp_state     *vd=vb->vd;
@@ -108,7 +111,7 @@ void _analysis_output_always(char *base,int i,float *v,int n,int bark,int dB){

 void _analysis_output(char *base,int i,float *v,int n,int bark,int dB){
 #ifdef ANALYSIS
-  _analysis_output_always(base,i,v,n,bark,dB);
+  if(analysis_noisy)_analysis_output_always(base,i,v,n,bark,dB);
 #endif
 }

--- a/lib/backends.h
+++ b/lib/backends.h
@@ -12,7 +12,7 @@

 function: libvorbis backend and mapping structures; needed for 
           static mode headers
- last mod: $Id: backends.h,v 1.9 2001/06/15 23:31:00 xiphmont Exp $
+ last mod: $Id: backends.h,v 1.10 2001/08/13 01:36:56 xiphmont Exp $

 ********************************************************************/

@@ -61,9 +61,9 @@ typedef struct{
  void (*free_info) (vorbis_info_floor *);
  void (*free_look) (vorbis_look_floor *);
  int  (*forward)   (struct vorbis_block *,vorbis_look_floor *,
+		     float *, const float *, /* in */
 		     const float *, const float *, /* in */
-		     const float *, const float *, /* in */
-		     float *, float *);            /* out */
+		     float *);                     /* out */
  void *(*inverse1)  (struct vorbis_block *,vorbis_look_floor *);
  int   (*inverse2)  (struct vorbis_block *,vorbis_look_floor *,
 		     void *buffer,float *);
@@ -114,6 +114,8 @@ typedef struct{
  int   unusedminsize;
  int   unusedmin_n;

+  int   n;
+
 } vorbis_info_floor1;

 /* Residue backend generic *****************************************/
@@ -125,8 +127,10 @@ typedef struct{
  vorbis_info_residue *(*copy_info)(vorbis_info_residue *);
  void (*free_info)    (vorbis_info_residue *);
  void (*free_look)    (vorbis_look_residue *);
-  int  (*forward)      (struct vorbis_block *,vorbis_look_residue *,
+  long **(*class)      (struct vorbis_block *,vorbis_look_residue *,
 			float **,int *,int);
+  int  (*forward)      (struct vorbis_block *,vorbis_look_residue *,
+			float **,float **,int *,int,int,long **);
  int  (*inverse)      (struct vorbis_block *,vorbis_look_residue *,
 			float **,int *,int);
 } vorbis_func_residue;
@@ -148,7 +152,7 @@ typedef struct vorbis_info_residue0{
  float  ampmax[64];       /* book amp threshholds*/
  int    subgrp[64];       /* book heuristic subgroup size */
  int    blimit[64];       /* subgroup position limits */
-
+  int    passlimit[32];     /* iteration limit per couple/quant pass */
 } vorbis_info_residue0;

 /* Mapping backend generic *****************************************/
@@ -172,7 +176,9 @@ typedef struct vorbis_info_mapping0{
  int   timesubmap[16];    /* [mux] */
  int   floorsubmap[16];   /* [mux] submap to floors */
  int   residuesubmap[16]; /* [mux] submap to residue */
-  int   psysubmap[16];     /* [mux]; encode only */
+
+  int   psy[2]; /* by blocktype; impulse/padding for short,
+                   transition/normal for long */

  int   coupling_steps;
  int   coupling_mag[256];

--- a/lib/barkmel.c
+++ b/lib/barkmel.c
@@ -11,7 +11,7 @@
 ********************************************************************

 function: bark scale utility
- last mod: $Id: barkmel.c,v 1.7 2001/06/15 21:15:39 xiphmont Exp $
+ last mod: $Id: barkmel.c,v 1.8 2001/08/13 01:36:56 xiphmont Exp $

 ********************************************************************/

@@ -54,7 +54,7 @@ int main(){
  {
    float i;
    int j;
-    for(i=0.,j=0;i<28;i+=1.,j++){
+    for(i=0.,j=0;i<28;i+=1,j++){
      fprintf(stderr,"(%d) bark=%f %gHz (%d of 128)\n",
 	      j,i,fromBARK(i),(int)(fromBARK(i)/22050.*128.));
    }

--- a/lib/block.c
+++ b/lib/block.c
@@ -11,7 +11,7 @@
 ********************************************************************

 function: PCM data vector blocking, windowing and dis/reassembly
- last mod: $Id: block.c,v 1.48 2001/05/27 06:43:59 xiphmont Exp $
+ last mod: $Id: block.c,v 1.49 2001/08/13 01:36:56 xiphmont Exp $

 Handle windowing, overlap-add, etc of the PCM vectors.  This is made
 more amusing by Vorbis' current two allowed block sizes.
@@ -174,7 +174,6 @@ static int _vds_shared_init(vorbis_dsp_state *v,vorbis_info *vi,int encp){

  v->vi=vi;
  b->modebits=ilog2(ci->modes);
-  b->ampmax=-9999;

  b->transform[0]=_ogg_calloc(VI_TRANSFORMB,sizeof(vorbis_look_transform *));
  b->transform[1]=_ogg_calloc(VI_TRANSFORMB,sizeof(vorbis_look_transform *));
@@ -263,11 +262,11 @@ int vorbis_analysis_init(vorbis_dsp_state *v,vorbis_info *vi){

  _vds_shared_init(v,vi,1);
  b=v->backend_state;
+  b->psy_g_look=_vp_global_look(vi);

  /* Initialize the envelope state storage */
  b->ve=_ogg_calloc(1,sizeof(envelope_lookup));
  _ve_envelope_init(b->ve,vi);
-
  return(0);
 }

@@ -307,6 +306,7 @@ void vorbis_dsp_clear(vorbis_dsp_state *v){
 	_ogg_free(b->transform[1][0]);
 	_ogg_free(b->transform[1]);
      }
+      if(b->psy_g_look)_vp_global_free(b->psy_g_look);
      
    }
    
@@ -406,6 +406,7 @@ static void _preextrapolate_helper(vorbis_dsp_state *v){
 int vorbis_analysis_wrote(vorbis_dsp_state *v, int vals){
  vorbis_info *vi=v->vi;
  codec_setup_info *ci=vi->codec_setup;
+  /*backend_lookup_state *b=v->backend_state;*/

  if(vals<=0){
    int order=32;
@@ -472,6 +473,8 @@ int vorbis_analysis_blockout(vorbis_dsp_state *v,vorbis_block *vb){
  vorbis_info *vi=v->vi;
  codec_setup_info *ci=vi->codec_setup;
  backend_lookup_state *b=v->backend_state;
+  vorbis_look_psy_global *g=b->psy_g_look;
+  vorbis_info_psy_global *gi=ci->psy_g_param;
  long beginW=v->centerW-ci->blocksizes[v->W]/2,centerNext;

  /* check to see if we're started... */
@@ -542,9 +545,10 @@ int vorbis_analysis_blockout(vorbis_dsp_state *v,vorbis_block *vb){
    vorbis_block_internal *vbi=(vorbis_block_internal *)vb->internal;

    /* this tracks 'strongest peak' for later psychoacoustics */
-    if(vbi->ampmax>b->ampmax)b->ampmax=vbi->ampmax;
-    b->ampmax=_vp_ampmax_decay(b->ampmax,v);
-    vbi->ampmax=b->ampmax;
+    /* moved to the global psy state; clean this mess up */
+    if(vbi->ampmax>g->ampmax)g->ampmax=vbi->ampmax;
+    g->ampmax=_vp_ampmax_decay(g->ampmax,v);
+    vbi->ampmax=g->ampmax;

    vb->pcm=_vorbis_block_alloc(vb,sizeof(float *)*vi->channels);
    vbi->pcmdelay=_vorbis_block_alloc(vb,sizeof(float *)*vi->channels);
@@ -576,7 +580,7 @@ int vorbis_analysis_blockout(vorbis_dsp_state *v,vorbis_block *vb){

  /* advance storage vectors and clean up */
  {
-    int new_centerNext=ci->blocksizes[1]/2+ci->delaycache;
+    int new_centerNext=ci->blocksizes[1]/2+gi->delaycache;
    int movementW=centerNext-new_centerNext;

    if(movementW>0){
@@ -614,7 +618,6 @@ int vorbis_analysis_blockout(vorbis_dsp_state *v,vorbis_block *vb){
 }

 int vorbis_synthesis_init(vorbis_dsp_state *v,vorbis_info *vi){
-  codec_setup_info *ci=vi->codec_setup;
  _vds_shared_init(v,vi,0);

  v->pcm_returned=-1;

--- a/lib/books/Makefile
+++ b/lib/books/Makefile
+# Generated automatically from Makefile.in by configure.
+# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+SHELL = /bin/sh
+
+srcdir = .
+top_srcdir = ../..
+prefix = /usr/local
+exec_prefix = ${prefix}
+
+bindir = ${exec_prefix}/bin
+sbindir = ${exec_prefix}/sbin
+libexecdir = ${exec_prefix}/libexec
+datadir = ${prefix}/share
+sysconfdir = ${prefix}/etc
+sharedstatedir = ${prefix}/com
+localstatedir = ${prefix}/var
+libdir = ${exec_prefix}/lib
+infodir = ${prefix}/info
+mandir = ${prefix}/man
+includedir = ${prefix}/include
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/libvorbis
+pkglibdir = $(libdir)/libvorbis
+pkgincludedir = $(includedir)/libvorbis
+
+top_builddir = ../..
+
+ACLOCAL = aclocal
+AUTOCONF = autoconf
+AUTOMAKE = automake
+AUTOHEADER = autoheader
+
+INSTALL = /usr/bin/install -c
+INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_SCRIPT = ${INSTALL_PROGRAM}
+transform = s,x,x,
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = powerpc-unknown-linux-gnu
+host_triplet = powerpc-unknown-linux-gnu
+AS = @AS@
+CC = gcc
+CPP = gcc -E
+DEBUG = -g -Wall -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char
+DLLTOOL = @DLLTOOL@
+ECHO = echo
+EXEEXT = 
+LIBTOOL = $(SHELL) $(top_builddir)/libtool
+LN_S = ln -s
+MAKEINFO = makeinfo
+OBJDUMP = @OBJDUMP@
+OBJEXT = o
+OGG_CFLAGS = -I/include
+OGG_LIBS = -L/lib -logg
+PACKAGE = libvorbis
+PROFILE = -pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char
+RANLIB = ranlib
+STRIP = strip
+VERSION = 1.0beta4
+VE_LIB_AGE = 0
+VE_LIB_CURRENT = 0
+VE_LIB_REVISION = 1
+VF_LIB_AGE = 0
+VF_LIB_CURRENT = 0
+VF_LIB_REVISION = 1
+V_LIB_AGE = 0
+V_LIB_CURRENT = 0
+V_LIB_REVISION = 1
+pthread_lib = -lpthread
+
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = lsp12_0.vqh lsp12_1.vqh lsp30_0.vqh lsp30_1.vqh lsp9_0.vqh 	lsp9_1.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_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_1024_6.vqh res0_192_1024_7.vqh 	res0_192_1024_8.vqh res0_192_1024_9.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_1024_6.vqh 	res0_256_1024_7.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_1024_8.vqh res0_96_1024_9.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 	res0_350_1024_7.vqh
+
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_CLEAN_FILES = 
+DIST_COMMON =  Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/books/Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = lib/books
+
+distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign lib/books/Makefile
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile
+all-redirect: all-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-generic clean-am
+	-rm -f libtool
+
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-generic distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: tags distdir info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
--- a/lib/books/Makefile.in
+++ b/lib/books/Makefile.in
+# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ../..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+AS = @AS@
+CC = @CC@
+CPP = @CPP@
+DEBUG = @DEBUG@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+EXEEXT = @EXEEXT@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+MAKEINFO = @MAKEINFO@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+PACKAGE = @PACKAGE@
+PROFILE = @PROFILE@
+RANLIB = @RANLIB@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VE_LIB_AGE = @VE_LIB_AGE@
+VE_LIB_CURRENT = @VE_LIB_CURRENT@
+VE_LIB_REVISION = @VE_LIB_REVISION@
+VF_LIB_AGE = @VF_LIB_AGE@
+VF_LIB_CURRENT = @VF_LIB_CURRENT@
+VF_LIB_REVISION = @VF_LIB_REVISION@
+V_LIB_AGE = @V_LIB_AGE@
+V_LIB_CURRENT = @V_LIB_CURRENT@
+V_LIB_REVISION = @V_LIB_REVISION@
+pthread_lib = @pthread_lib@
+
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = lsp12_0.vqh lsp12_1.vqh lsp30_0.vqh lsp30_1.vqh lsp9_0.vqh 	lsp9_1.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_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_1024_6.vqh res0_192_1024_7.vqh 	res0_192_1024_8.vqh res0_192_1024_9.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_1024_6.vqh 	res0_256_1024_7.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_1024_8.vqh res0_96_1024_9.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 	res0_350_1024_7.vqh
+
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_CLEAN_FILES = 
+DIST_COMMON =  Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/books/Makefile
+