[xiph-cvs] cvs commit: vorbis/lib/modes Makefile.am
Jack Moffitt
jack at xiph.org
Sat Nov 4 00:56:05 PST 2000
jack 00/11/04 00:56:05
Modified: . Tag: branch_beta3 configure.in libvorbis.spec
examples Tag: branch_beta3 Makefile.am
lib Tag: branch_beta3 Makefile.am
Added: lib/books Tag: branch_beta3 Makefile.am
lib/modes Tag: branch_beta3 Makefile.am
Removed: include/vorbis Tag: branch_beta3 mode_A.h mode_B.h mode_C.h
mode_D.h mode_E.h modes.h
Log:
added vorbis/lib/books and vorbis/lib/modes to the build system
removed old mode files from include dir
updated spec file for new libvorbisenc
a little tuning of the build system
Revision Changes Path
No revision
No revision
1.24.2.9 +7 -1 vorbis/configure.in
Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/vorbis/configure.in,v
retrieving revision 1.24.2.8
retrieving revision 1.24.2.9
diff -u -r1.24.2.8 -r1.24.2.9
--- configure.in 2000/11/03 10:05:42 1.24.2.8
+++ configure.in 2000/11/04 08:56:02 1.24.2.9
@@ -15,12 +15,18 @@
VF_LIB_CURRENT=0
VF_LIB_REVISION=0
VF_LIB_AGE=0
+VE_LIB_CURRENT=0
+VE_LIB_REVISION=0
+VE_LIB_AGE=0
AC_SUBST(V_LIB_CURRENT)
AC_SUBST(V_LIB_REVISION)
AC_SUBST(V_LIB_AGE)
AC_SUBST(VF_LIB_CURRENT)
AC_SUBST(VF_LIB_REVISION)
AC_SUBST(VF_LIB_AGE)
+AC_SUBST(VE_LIB_CURRENT)
+AC_SUBST(VE_LIB_REVISION)
+AC_SUBST(VE_LIB_AGE)
dnl --------------------------------------------------
dnl Check for programs
@@ -160,4 +166,4 @@
AC_SUBST(PROFILE)
AC_SUBST(pthread_lib)
-AC_OUTPUT(Makefile lib/Makefile doc/Makefile doc/vorbisfile/Makefile include/Makefile include/vorbis/Makefile examples/Makefile)
+AC_OUTPUT(Makefile lib/Makefile lib/modes/Makefile lib/books/Makefile doc/Makefile doc/vorbisfile/Makefile include/Makefile include/vorbis/Makefile examples/Makefile)
1.2.2.6 +4 -11 vorbis/libvorbis.spec
Index: libvorbis.spec
===================================================================
RCS file: /usr/local/cvsroot/vorbis/libvorbis.spec,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -r1.2.2.5 -r1.2.2.6
--- libvorbis.spec 2000/10/30 09:21:44 1.2.2.5
+++ libvorbis.spec 2000/11/04 08:56:03 1.2.2.6
@@ -49,6 +49,7 @@
%doc README
/usr/lib/libvorbis.so.*
/usr/lib/libvorbisfile.so.*
+/usr/lib/libvorbisenc.so.*
%files devel
%doc doc/*.html
@@ -57,22 +58,14 @@
%doc doc/vorbisfile/*.html
%doc doc/vorbisfile/*.css
/usr/include/vorbis/codec.h
-/usr/include/vorbis/backends.h
-/usr/include/vorbis/codebook.h
-/usr/include/vorbis/mode_A.h
-/usr/include/vorbis/mode_B.h
-/usr/include/vorbis/mode_C.h
-/usr/include/vorbis/mode_D.h
-/usr/include/vorbis/mode_E.h
-/usr/include/vorbis/modes.h
/usr/include/vorbis/vorbisfile.h
-/usr/include/vorbis/book/lsp*.vqh
-/usr/include/vorbis/book/res0_*.vqh
-/usr/include/vorbis/book/resaux0_*.vqh
+/usr/include/vorbis/vorbisenc.h
/usr/lib/libvorbis.a
/usr/lib/libvorbis.so
/usr/lib/libvorbisfile.a
/usr/lib/libvorbisfile.so
+/usr/lib/libvorbisenc.a
+/usr/lib/libvorbisenc.so
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
No revision
No revision
1.3.2.4 +6 -6 vorbis/examples/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis/examples/Makefile.am,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- Makefile.am 2000/11/03 10:05:43 1.3.2.3
+++ Makefile.am 2000/11/04 08:56:03 1.3.2.4
@@ -2,22 +2,22 @@
AUTOMAKE_OPTIONS = foreign
-INCLUDES = -I../include
+INCLUDES = -I$(top_srcdir)/include
noinst_PROGRAMS = decoder_example encoder_example chaining_example\
vorbisfile_example seeking_example
-LDADD = $(top_srcdir)/lib/.libs/libvorbis.a $(OGG_LIBS)
+LDADD = ../lib/libvorbis.la $(OGG_LIBS)
decoder_example_SOURCES = decoder_example.c
encoder_example_SOURCES = encoder_example.c
-encoder_example_LDADD = $(top_srcdir)/lib/.libs/libvorbisenc.a $(top_srcdir)/lib/.libs/libvorbis.a $(OGG_LIBS)
+encoder_example_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la $(OGG_LIBS)
chaining_example_SOURCES = chaining_example.c
-chaining_example_LDADD = $(top_srcdir)/lib/.libs/libvorbisfile.a $(top_srcdir)/lib/.libs/libvorbis.a $(OGG_LIBS)
+chaining_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la $(OGG_LIBS)
vorbisfile_example_SOURCES = vorbisfile_example.c
-vorbisfile_example_LDADD = $(top_srcdir)/lib/.libs/libvorbisfile.a $(top_srcdir)/lib/.libs/libvorbis.a $(OGG_LIBS)
+vorbisfile_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la $(OGG_LIBS)
seeking_example_SOURCES = seeking_example.c
-seeking_example_LDADD = $(top_srcdir)/lib/.libs/libvorbisfile.a $(top_srcdir)/lib/.libs/libvorbis.a $(OGG_LIBS)
+seeking_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la $(OGG_LIBS)
debug:
$(MAKE) all CFLAGS="@DEBUG@"
No revision
No revision
1.2.2.4 +7 -41 vorbis/lib/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/Makefile.am,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- Makefile.am 2000/11/03 10:05:46 1.2.2.3
+++ Makefile.am 2000/11/04 08:56:04 1.2.2.4
@@ -2,8 +2,10 @@
AUTOMAKE_OPTIONS = foreign
-INCLUDES = -I../include
+SUBDIRS = modes books
+INCLUDES = -I$(top_srcdir)/include
+
lib_LTLIBRARIES = libvorbis.la libvorbisfile.la libvorbisenc.la
libvorbis_la_SOURCES = mdct.c smallft.c block.c envelope.c window.c lsp.c lpc.c\
@@ -11,7 +13,7 @@
res0.c mapping0.c registry.c codebook.c sharedbook.c\
iir.c lookup.c\
envelope.h lpc.h lsp.h codebook.h misc.h psy.h\
- masking.h sharedbook.h iir.h os.h mdct.h smallft.h\
+ masking.h iir.h os.h mdct.h smallft.h\
registry.h scales.h window.h lookup.h lookup_data.h\
codec_internal.h backends.h
libvorbis_la_LDFLAGS = -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
@@ -19,46 +21,10 @@
libvorbisfile_la_SOURCES = vorbisfile.c
libvorbisfile_la_LDFLAGS = -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
-libvorbisenc_la_SOURCES = vorbisenc.c\
- os.h misc.h mode_A.h mode_B.h mode_C.h mode_D.h\
- mode_E.h modes.h\
- res0_1024a_192_4.vqh res0_128a_192_3.vqh\
- lsp12_0.vqh res0_1024a_192_5.vqh\
- res0_128a_192_4.vqh lsp30_0.vqh res0_1024a_256_1.vqh\
- res0_128a_192_5.vqh res0_1024a_128_1.vqh\
- res0_1024a_256_2.vqh res0_128a_256_1.vq\
- res0_1024a_128_2.vqh res0_1024a_256_3.vqh\
- res0_128a_256_2.vqh res0_1024a_128_3.vqh\
- res0_1024a_256_4.vqh res0_128a_256_3.vqh\
- res0_1024a_128_4.vqh res0_1024a_256_5.vqh\
- res0_128a_256_4.vqh res0_1024a_128_5.vqh\
- res0_1024a_350_1.vqh res0_128a_256_5.vqh\
- res0_1024a_128_6.vqh res0_1024a_350_2.vqh\
- res0_128a_350_1.vqh res0_1024a_128_7.vqh\
- res0_1024a_350_3.vqh res0_128a_350_2.vqh\
- res0_1024a_128_8.vqh res0_1024a_350_4.vqh\
- res0_128a_350_3.vqh res0_1024a_128_9.vqh\
- res0_1024a_350_5.vqh res0_128a_350_4.vqh\
- res0_1024a_160_1.vqh res0_128a_128_1.vqh\
- res0_128a_350_5.vqh res0_1024a_160_2.vqh\
- res0_128a_128_2.vqh resaux0_1024a_128.vqh\
- res0_1024a_160_3.vqh res0_128a_128_3.vqh\
- resaux0_1024a_160.vqh res0_1024a_160_4.vqh\
- res0_128a_128_4.vqh resaux0_1024a_192.vqh\
- res0_1024a_160_5.vqh res0_128a_128_5.vqh\
- resaux0_1024a_256.vqh res0_1024a_160_6.vqh\
- res0_128a_160_1.vqh resaux0_1024a_350.vqh\
- res0_1024a_160_7.vqh res0_128a_160_2.vqh\
- resaux0_128a_128.vqh res0_1024a_160_8.vqh\
- res0_128a_160_3.vqh resaux0_128a_160.vqh\
- res0_1024a_160_9.vqh res0_128a_160_4.vqh\
- resaux0_128a_192.vqh res0_1024a_192_1.vqh\
- res0_128a_160_5.vqh resaux0_128a_256.vqh\
- res0_1024a_192_2.vqh res0_128a_192_1.vqh\
- resaux0_128a_350.vqh res0_1024a_192_3.vqh\
- res0_128a_192_2.vqh
+libvorbisenc_la_SOURCES = vorbisenc.c
+libvorbisenc_la_LDFLAGS = -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
-libvorbisenc_la_LDFLAGS = -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
+EXTRA_DIST = barkmel.c tone.c psytune.c lookups.pl
debug:
$(MAKE) all CFLAGS="@DEBUG@"
No revision
No revision
1.1.2.1 +27 -0 vorbis/lib/books/Attic/Makefile.am
No revision
No revision
1.1.2.1 +5 -0 vorbis/lib/modes/Attic/Makefile.am
--- >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.
More information about the commits
mailing list