beta 3 commit. Unless I missed something (give it 50/50 odds ;-)

[platform/upstream/libvorbis.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index bd77824..c84b7c4 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,27 +4,38 @@ AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = modes books
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
 
 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\
                        analysis.c synthesis.c psy.c info.c time0.c floor0.c\
                        res0.c mapping0.c registry.c codebook.c sharedbook.c\
-                       iir.c lookup.c\
+                       iir.c lookup.c bitbuffer.c\
                        envelope.h lpc.h lsp.h codebook.h misc.h psy.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
+                       codec_internal.h backends.h bitbuffer.h
 libvorbis_la_LDFLAGS = -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
 
 libvorbisfile_la_SOURCES = vorbisfile.c
+libvorbisfile_la_LIBADD = libvorbis.la
 libvorbisfile_la_LDFLAGS = -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
 
 libvorbisenc_la_SOURCES = vorbisenc.c
+libvorbisenc_la_LIBADD = libvorbis.la
 libvorbisenc_la_LDFLAGS = -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
 
-EXTRA_DIST = barkmel.c tone.c psytune.c lookups.pl
+EXTRA_PROGRAMS = barkmel tone psytune
+CLEANFILES = $(EXTRA_PROGRAMS)
+
+barkmel_SOURCES = barkmel.c
+tone_SOURCES = tone.c
+psytune_SOURCES = psytune.c
+psytune_LDFLAGS = -static
+psytune_LDADD = libvorbis.la
+
+EXTRA_DIST = lookups.pl
 
 debug:
        $(MAKE) all CFLAGS="@DEBUG@"