Minor fixes to allow cross compiling from Linux to windows and running the tests...

svn path=/trunk/vorbis/; revision=14727

diff --git a/lib/Makefile.am b/lib/Makefile.am
index b666817..aa29508 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -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

diff --git a/test/Makefile.am b/test/Makefile.am
index f8c422b..128bf21 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -4,10 +4,11 @@ AUTOMAKE_OPTIONS = foreign
 
 INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
 
-TESTS = test
-
 noinst_PROGRAMS = test
 
+check: $(noinst_PROGRAMS)
+       ./test$(EXEEXT)
+
 test_SOURCES = util.c util.h write_read.c write_read.h test.c
 test_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la @OGG_LIBS@