android/configure.sh: enable taglib & matroska

[vlc] / test / Makefile.am

diff --git a/test/Makefile.am b/test/Makefile.am
index 5f7fe51ae2699ef2ec40ec8ac9e9cb8eadfe3a39..9761359c4711e2c052bc59e27f6292095df16ee3 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -14,7 +14,6 @@ extra_check_verbose__0 = $(extra_check_verbose_0)
 ###############################################################################
 check_PROGRAMS = \
        test_libvlc_core \
-       test_libvlc_events \
        test_libvlc_media \
        test_libvlc_media_list \
        test_libvlc_media_player \
@@ -23,7 +22,7 @@ check_PROGRAMS = \
         $(NULL)
 
 check_SCRIPTS = \
-    modules/misc/lua/telnet.sh
+    modules/lua/telnet.sh
 
 # Disabled test:
 # meta: No suitable test file
@@ -52,7 +51,7 @@ samples/meta.sample:
        mkdir -p `dirname $@`
        curl $(SAMPLES_SERVER)/metadata/id3tag/Wesh-Bonneville.mp3 > $@
 
-CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc` -DSRCDIR=\"$(srcdir)\"
+CFLAGS_tests = $(LIBS_libvlc) -DSRCDIR=\"$(srcdir)\"
 LDFLAGS_tests = -no-install -static
 
 test_libvlc_core_SOURCES = libvlc/core.c
@@ -60,11 +59,6 @@ test_libvlc_core_LDADD = $(top_builddir)/src/libvlc.la
 test_libvlc_core_CFLAGS = $(CFLAGS_tests)
 test_libvlc_core_LDFLAGS = $(LDFLAGS_tests)
 
-test_libvlc_events_SOURCES = libvlc/events.c
-test_libvlc_events_LDADD = $(top_builddir)/src/libvlc.la
-test_libvlc_events_CFLAGS = $(CFLAGS_tests)
-test_libvlc_events_LDFLAGS = $(LDFLAGS_tests)
-
 test_libvlc_media_SOURCES = libvlc/media.c
 test_libvlc_media_LDADD = $(top_builddir)/src/libvlc.la
 test_libvlc_media_CFLAGS = $(CFLAGS_tests)