[xiph-commits] r14727 - in trunk/vorbis: lib test

[erikd at svn.xiph.org]

Author: erikd
Date: 2008-04-14 04:25:39 -0700 (Mon, 14 Apr 2008)
New Revision: 14727

Modified:
   trunk/vorbis/lib/Makefile.am
   trunk/vorbis/test/Makefile.am
Log:
Minor fixes to allow cross compiling from Linux to windows and running the tests under Wine.

Modified: trunk/vorbis/lib/Makefile.am
===================================================================
--- trunk/vorbis/lib/Makefile.am	2008-04-14 08:40:46 UTC (rev 14726)
+++ trunk/vorbis/lib/Makefile.am	2008-04-14 11:25:39 UTC (rev 14727)
@@ -42,12 +42,14 @@
 #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
 test_sharedbook_LDADD = @VORBIS_LIBS@

Modified: trunk/vorbis/test/Makefile.am
===================================================================
--- trunk/vorbis/test/Makefile.am	2008-04-14 08:40:46 UTC (rev 14726)
+++ trunk/vorbis/test/Makefile.am	2008-04-14 11:25:39 UTC (rev 14727)
@@ -4,10 +4,11 @@
 
 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@