Add some unneccessary but potentially useful bulletproofing to allow use of versized...

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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index b666817..50f7ea4 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -16,15 +16,15 @@ libvorbis_la_SOURCES = mdct.c smallft.c block.c envelope.c window.c lsp.c \
                        registry.h scales.h window.h lookup.h lookup_data.h\
                        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 = @OGG_LIBS@ @VORBIS_LIBS@
+libvorbis_la_LIBADD = @VORBIS_LIBS@ @OGG_LIBS@
 
 libvorbisfile_la_SOURCES = vorbisfile.c
 libvorbisfile_la_LDFLAGS = -no-undefined -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
-libvorbisfile_la_LIBADD = libvorbis.la
+libvorbisfile_la_LIBADD = libvorbis.la @OGG_LIBS@
 
 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
+libvorbisenc_la_LIBADD = libvorbis.la @OGG_LIBS@
 
 EXTRA_PROGRAMS = barkmel tone psytune
 CLEANFILES = $(EXTRA_PROGRAMS)
@@ -42,11 +42,13 @@ EXTRA_DIST = lookups.pl
 #vorbis_selftests = test_codebook test_sharedbook
 vorbis_selftests = test_sharedbook
 
-TESTS = $(vorbis_selftests)
 noinst_PROGRAMS = $(vorbis_selftests)
 
-test_codebook_SOURCES = codebook.c
-test_codebook_CFLAGS = -D_V_SELFTEST
+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