Enable back media_list_player's tests.

[vlc] / test / Makefile.am

diff --git a/test/Makefile.am b/test/Makefile.am
index 3d43bb9c78df1e4db3a28881196e85b1f082175c..5b4cc5d12790b26f0a9562656be097b15b6c2ba3 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -10,14 +10,21 @@ AUTOMAKE_OPTIONS = subdir-objects
 check_PROGRAMS = \
        test_libvlc_core \
        test_libvlc_events \
-       $(NULL)
-EXTRA_PROGRAMS = \
        test_libvlc_media_list \
        test_libvlc_media_list_player \
        test_libvlc_media_player \
+       test_src_misc_variables \
+        $(NULL)
+
+# Disabled test:
+# meta: No suitable test file
+EXTRA_PROGRAMS = \
        test_libvlc_meta \
+       test_dummy \
        $(NULL)
+
 #check_DATA = samples/test.sample samples/meta.sample
+EXTRA_DIST = samples/empty.voc
 
 check_HEADERS = libvlc/test.h
 
@@ -36,32 +43,46 @@ samples/meta.sample:
        mkdir -p `dirname $@`
        curl $(SAMPLES_SERVER)/metadata/id3tag/Wesh-Bonneville.mp3 > $@
 
-CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc`
+CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc` -DSRCDIR=\"$(srcdir)\"
+LDFLAGS_tests = -no-install -static
 
 test_libvlc_core_SOURCES = libvlc/core.c
-test_libvlc_core_LDADD = $(top_builddir)/src/libvlc-control.la
+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-control.la
+test_libvlc_events_LDADD = $(top_builddir)/src/libvlc.la
 test_libvlc_events_CFLAGS = $(CFLAGS_tests)
+test_libvlc_events_LDFLAGS = $(LDFLAGS_tests)
 
 test_libvlc_media_list_player_SOURCES = libvlc/media_list_player.c
-test_libvlc_media_list_player_LDADD = $(top_builddir)/src/libvlc-control.la
+test_libvlc_media_list_player_LDADD = $(top_builddir)/src/libvlc.la
 test_libvlc_media_list_player_CFLAGS = $(CFLAGS_tests)
+test_libvlc_media_list_player_LDFLAGS = $(LDFLAGS_tests)
 
 test_libvlc_media_list_SOURCES = libvlc/media_list.c
-test_libvlc_media_list_LDADD = $(top_builddir)/src/libvlc-control.la
+test_libvlc_media_list_LDADD = $(top_builddir)/src/libvlc.la
 test_libvlc_media_list_CFLAGS = $(CFLAGS_tests)
+test_libvlc_media_list_LDFLAGS = $(LDFLAGS_tests)
 
 test_libvlc_media_player_SOURCES = libvlc/media_player.c
-test_libvlc_media_player_LDADD = $(top_builddir)/src/libvlc-control.la
+test_libvlc_media_player_LDADD = $(top_builddir)/src/libvlc.la
 test_libvlc_media_player_CFLAGS = $(CFLAGS_tests)
+test_libvlc_media_player_LDFLAGS = $(LDFLAGS_tests)
 
 test_libvlc_meta_SOURCES = libvlc/meta.c
-test_libvlc_meta_LDADD = $(top_builddir)/src/libvlc-control.la
+test_libvlc_meta_LDADD = $(top_builddir)/src/libvlc.la
 test_libvlc_meta_CFLAGS = $(CFLAGS_tests)
+test_libvlc_meta_LDFLAGS = $(LDFLAGS_tests)
+
+test_src_misc_variables_SOURCES = src/misc/variables.c
+test_src_misc_variables_LDADD = $(top_builddir)/src/libvlc.la
+test_src_misc_variables_CFLAGS = $(CFLAGS_tests)
+test_src_misc_variables_LDFLAGS = $(LDFLAGS_tests)
 
+checkall:
+       $(MAKE) check_PROGRAMS="$(check_PROGRAMS) $(EXTRA_PROGRAMS)" check
 
 FORCE:
        @echo "Generated source cannot be phony. Go away." >&2