Add cmake as optional build system to Travis-CI configuration

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

diff --git a/test/Makefile.am b/test/Makefile.am
index af7fb22..b68ebdb 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2,19 +2,18 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
+check_PROGRAMS = test
 
-noinst_PROGRAMS = test
+check: $(check_PROGRAMS)
+       ./test$(EXEEXT)
+
+AM_CPPFLAGS = -I$(top_srcdir)/include @OGG_CFLAGS@
 
 test_SOURCES = util.c util.h write_read.c write_read.h test.c
-test_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la @OGG_LIBS@
+test_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la @OGG_LIBS@ @VORBIS_LIBS@
 
 debug:
-       $(MAKE) all CFLAGS="@DEBUG@"
+       $(MAKE) check CFLAGS="@DEBUG@"
 
 profile:
-       $(MAKE) all CFLAGS="@PROFILE@"
-
-check: test
-       ./test
-       
+       $(MAKE) check CFLAGS="@PROFILE@"