Silence some CMake build MSVC useless warnings

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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 638be6c..e22895e 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,28 +1,30 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
 SUBDIRS = modes books
 
-INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
+AM_CPPFLAGS = -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\
+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 \
+                       floor1.c floor0.c\
                        res0.c mapping0.c registry.c codebook.c sharedbook.c\
-                       iir.c lookup.c bitbuffer.c\
+                       lookup.c bitrate.c\
                        envelope.h lpc.h lsp.h codebook.h misc.h psy.h\
-                       masking.h iir.h os.h mdct.h smallft.h\
+                       masking.h os.h mdct.h smallft.h highlevel.h\
                        registry.h scales.h window.h lookup.h lookup_data.h\
-                       codec_internal.h backends.h bitbuffer.h
-libvorbis_la_LDFLAGS = -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
+                       codec_internal.h backends.h bitrate.h 
+libvorbis_la_LDFLAGS = -no-undefined -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
+libvorbis_la_LIBADD = @VORBIS_LIBS@ @OGG_LIBS@
 
 libvorbisfile_la_SOURCES = vorbisfile.c
-libvorbisfile_la_LDFLAGS = -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
+libvorbisfile_la_LDFLAGS = -no-undefined -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
+libvorbisfile_la_LIBADD = libvorbis.la @OGG_LIBS@
 
-libvorbisenc_la_SOURCES = vorbisenc.c
-libvorbisenc_la_LDFLAGS = -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
+libvorbisenc_la_SOURCES = vorbisenc.c 
+libvorbisenc_la_LDFLAGS = -no-undefined -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
+libvorbisenc_la_LIBADD = libvorbis.la @OGG_LIBS@
 
 EXTRA_PROGRAMS = barkmel tone psytune
 CLEANFILES = $(EXTRA_PROGRAMS)
@@ -33,7 +35,26 @@ psytune_SOURCES = psytune.c
 psytune_LDFLAGS = -static
 psytune_LDADD = libvorbis.la
 
-EXTRA_DIST = lookups.pl
+EXTRA_DIST = lookups.pl CMakeLists.txt
+
+# build and run the self tests on 'make check'
+
+#vorbis_selftests = test_codebook test_sharedbook
+vorbis_selftests = test_sharedbook
+
+noinst_PROGRAMS = $(vorbis_selftests)
+
+check: $(noinst_PROGRAMS)
+       ./test_sharedbook$(EXEEXT)
+
+#test_codebook_SOURCES = codebook.c
+#test_codebook_CFLAGS = -D_V_SELFTEST
+
+test_sharedbook_SOURCES = sharedbook.c
+test_sharedbook_CFLAGS = -D_V_SELFTEST
+test_sharedbook_LDADD = @VORBIS_LIBS@
+
+# recurse for alternate targets
 
 debug:
        $(MAKE) all CFLAGS="@DEBUG@"