[xiph-cvs] cvs commit: vorbis/lib Makefile.am

[Jack Moffitt]

jack        00/10/09 14:20:31

  Modified:    .        Tag: branch_postbeta2 configure.in
               examples Tag: branch_postbeta2 Makefile.am
               lib      Tag: branch_postbeta2 Makefile.am
  Log:
  we're now building into two libs.  libvorbis and libvorbisfile.
  examples link statically against both, but dynamically against libogg.
  
  jack.

Revision  Changes    Path
No                   revision

No                   revision

1.20.2.6  +12 -6     vorbis/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/vorbis/configure.in,v
retrieving revision 1.20.2.5
retrieving revision 1.20.2.6
diff -u -r1.20.2.5 -r1.20.2.6
--- configure.in	2000/10/04 23:06:34	1.20.2.5
+++ configure.in	2000/10/09 21:20:29	1.20.2.6
@@ -9,12 +9,18 @@
 
 dnl Library versioning
 
-LIB_CURRENT=0
-LIB_REVISION=0
-LIB_AGE=0
-AC_SUBST(LIB_CURRENT)
-AC_SUBST(LIB_REVISION)
-AC_SUBST(LIB_AGE)
+V_LIB_CURRENT=0
+V_LIB_REVISION=0
+V_LIB_AGE=0
+VF_LIB_CURRENT=0
+VF_LIB_REVISION=0
+VF_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)
 
 dnl --------------------------------------------------  
 dnl Check for programs

No                   revision

No                   revision

1.1.2.3   +2 -0      vorbis/examples/Attic/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis/examples/Attic/Makefile.am,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Makefile.am	2000/10/05 03:15:54	1.1.2.2
+++ Makefile.am	2000/10/09 21:20:30	1.1.2.3
@@ -12,7 +12,9 @@
 decoder_example_SOURCES = decoder_example.c
 encoder_example_SOURCES = encoder_example.c
 chaining_example_SOURCES = chaining_example.c
+chaining_example_LDADD = $(top_srcdir)/lib/.libs/libvorbisfile.a $(top_srcdir)/lib/.libs/libvorbis.a
 vorbisfile_example_SOURCES = vorbisfile_example.c
+vorbisfile_example_LDADD = $(top_srcdir)/lib/.libs/libvorbisfile.a $(top_srcdir)/lib/.libs/libvorbis.a
 
 debug:
         $(MAKE) all CFLAGS="@DEBUG@"

No                   revision

No                   revision

1.1.4.2   +6 -3      vorbis/lib/Attic/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/Attic/Makefile.am,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- Makefile.am	2000/09/27 06:20:58	1.1.4.1
+++ Makefile.am	2000/10/09 21:20:30	1.1.4.2
@@ -4,15 +4,18 @@
 
 INCLUDES = -I$(top_srcdir)/include
 
-lib_LTLIBRARIES = libvorbis.la
+lib_LTLIBRARIES = libvorbis.la libvorbisfile.la
 
 libvorbis_la_SOURCES = mdct.c smallft.c block.c envelope.c window.c lsp.c lpc.c\
                         analysis.c synthesis.c psy.c info.c time0.c floor0.c\
                         res0.c mapping0.c registry.c codebook.c sharedbook.c\
-			iir.c vorbisfile.c\
+			iir.c\
                         envelope.h lpc.h lsp.h bookinternal.h misc.h psy.h\
                         masking.h sharedbook.h iir.h os.h
-libvorbis_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
+libvorbis_la_LDFLAGS = -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
+
+libvorbisfile_la_SOURCES = vorbisfile.c
+libvorbisfile_la_LDFLAGS = -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
 
 debug:
         $(MAKE) all CFLAGS="@DEBUG@"

--- >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.