diff options
| author | Jack Moffitt <jack@xiph.org> | 2000-10-09 21:20:30 +0000 |
|---|---|---|
| committer | Jack Moffitt <jack@xiph.org> | 2000-10-09 21:20:30 +0000 |
| commit | 1506eeb39d103c0f31a81ecee5eac92f9b8ee9e4 (patch) | |
| tree | eb5471ee4db9eb2aa13977c025cde2520b6ca63c | |
| parent | c9a54d3942df50b1306563a58cb29b81d96b201f (diff) | |
| download | libvorbis-git-1506eeb39d103c0f31a81ecee5eac92f9b8ee9e4.tar.gz | |
we're now building into two libs. libvorbis and libvorbisfile.
examples link statically against both, but dynamically against libogg.
jack.
svn path=/branches/branch_postbeta2/vorbis/; revision=719
| -rw-r--r-- | configure.in | 18 | ||||
| -rw-r--r-- | examples/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/Makefile.am | 9 |
3 files changed, 20 insertions, 9 deletions
diff --git a/configure.in b/configure.in index a8eb249e..fd37d2c3 100644 --- a/configure.in +++ b/configure.in @@ -9,12 +9,18 @@ AM_INIT_AUTOMAKE(libvorbis,1.0.0) 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 diff --git a/examples/Makefile.am b/examples/Makefile.am index ff86f678..ee645eb9 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -12,7 +12,9 @@ LDADD = $(top_srcdir)/lib/.libs/libvorbis.a 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@" diff --git a/lib/Makefile.am b/lib/Makefile.am index 766f88a7..50fd60a1 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -4,15 +4,18 @@ AUTOMAKE_OPTIONS = foreign 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@" |