summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am4
-rw-r--r--Makefile.in10
-rw-r--r--README6
-rw-r--r--configure.in4
-rw-r--r--sharedbook.c3
5 files changed, 19 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index e300619..2b4481f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,6 +23,10 @@ ivorbisfile_example_SOURCES = ivorbisfile_example.c
ivorbisfile_example_LDFLAGS = -static
ivorbisfile_example_LDADD = libvorbisidec.la
+example:
+ ln -s . vorbis
+ $(MAKE) ivorbisfile_example
+
debug:
$(MAKE) all CFLAGS="@DEBUG@" LDFLAGS="-lefence"
diff --git a/Makefile.in b/Makefile.in
index 9e9fc39..1dca971 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -117,9 +117,9 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CF
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)
@@ -417,6 +417,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"
diff --git a/README b/README
index b8b140c..1321175 100644
--- a/README
+++ b/README
@@ -36,9 +36,11 @@ is similar enough that the proper header file to include is named
'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
diff --git a/configure.in b/configure.in
index ec9b62b..141a86a 100644
--- a/configure.in
+++ b/configure.in
@@ -10,8 +10,8 @@ AM_INIT_AUTOMAKE(libvorbisidec,1.0.2)
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)
diff --git a/sharedbook.c b/sharedbook.c
index b78f668..a62211e 100644
--- a/sharedbook.c
+++ b/sharedbook.c
@@ -316,7 +316,8 @@ static ogg_uint32_t bitreverse(ogg_uint32_t x){
}
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 */