[xiph-cvs] cvs commit: Tremor Makefile.am Makefile.in README configure.in sharedbook.c

[Monty]

xiphmont    02/09/10 02:16:12

  Modified:    .        Makefile.am Makefile.in README configure.in
                        sharedbook.c
  Log:
  Patch AGE and REVISION in configure.in
  Patch Makefile.am to add link for vorbis -> . to build ivorbisfile_example
  correct sort32a in sharedbook.c

Revision  Changes    Path
1.2       +4 -0      Tremor/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/Tremor/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am	2 Sep 2002 22:13:55 -0000	1.1
+++ Makefile.am	10 Sep 2002 06:16:12 -0000	1.2
@@ -23,6 +23,10 @@
 ivorbisfile_example_LDFLAGS = -static 
 ivorbisfile_example_LDADD = libvorbisidec.la
 
+example:
+	ln -s . vorbis
+	$(MAKE) ivorbisfile_example
+
 debug:
         $(MAKE) all CFLAGS="@DEBUG@" LDFLAGS="-lefence"	
 

<p><p>1.3       +7 -3      Tremor/Makefile.in

Index: Makefile.in
===================================================================
RCS file: /usr/local/cvsroot/Tremor/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in	3 Sep 2002 01:48:59 -0000	1.2
+++ Makefile.in	10 Sep 2002 06:16:12 -0000	1.3
@@ -117,9 +117,9 @@
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  README Makefile.am Makefile.in aclocal.m4 config.guess \
-config.sub configure configure.in install-sh ltmain.sh missing \
-mkinstalldirs
+DIST_COMMON =  README COPYING Makefile.am Makefile.in aclocal.m4 \
+config.guess config.sub configure configure.in install-sh ltmain.sh \
+missing mkinstalldirs
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -416,6 +416,10 @@
 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
+
+example:
+	ln -s . vorbis
+	$(MAKE) ivorbisfile_example
 
 debug:
         $(MAKE) all CFLAGS="@DEBUG@" LDFLAGS="-lefence"	

<p><p>1.3       +4 -2      Tremor/README

Index: README
===================================================================
RCS file: /usr/local/cvsroot/Tremor/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README	2 Sep 2002 22:22:28 -0000	1.2
+++ README	10 Sep 2002 06:16:12 -0000	1.3
@@ -36,9 +36,11 @@
 'ivorbisfile.h' [included in the source build directory].  Lower level
 libvorbis-style headers and structures are in 'ivorbiscodec.h'
 [included in the source build directory]. A simple example program,
-ivorbisfile_example.c, can be built with 'make ivorbisfile_example'.
+ivorbisfile_example.c, can be built with 'make example'.
 
-[More documentation to come]
+                           ********
+
+Detailed Tremor API Documentation begins at doc/index.html
 
 Monty
 xiph.org

<p><p>1.2       +2 -2      Tremor/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/Tremor/configure.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configure.in	3 Sep 2002 01:48:59 -0000	1.1
+++ configure.in	10 Sep 2002 06:16:12 -0000	1.2
@@ -10,8 +10,8 @@
 dnl Library versioning
 
 V_LIB_CURRENT=1
-V_LIB_REVISION=0
-V_LIB_AGE=2
+V_LIB_REVISION=2
+V_LIB_AGE=0
 AC_SUBST(V_LIB_CURRENT)
 AC_SUBST(V_LIB_REVISION)
 AC_SUBST(V_LIB_AGE)

<p><p>1.3       +2 -1      Tremor/sharedbook.c

Index: sharedbook.c
===================================================================
RCS file: /usr/local/cvsroot/Tremor/sharedbook.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sharedbook.c	3 Sep 2002 03:15:19 -0000	1.2
+++ sharedbook.c	10 Sep 2002 06:16:12 -0000	1.3
@@ -316,7 +316,8 @@
 }
 
 static int sort32a(const void *a,const void *b){
-  return ( (**(ogg_uint32_t **)a>**(ogg_uint32_t **)b)<<1)-1;
+  return (**(ogg_uint32_t **)a>**(ogg_uint32_t **)b)-
+    (**(ogg_uint32_t **)a<**(ogg_uint32_t **)b);
 }
 
 /* decode codebook arrangement is more heavily optimized than encode */

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.