X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=test%2FMakefile.am;h=96ace3f57efdfc7c1d1b8b8f8aba91b9c491bf70;hb=21f23760023c2242adeef84a0cf1b3565719f811;hp=847be09c1548bb03b0b4024d756094f12f190b9d;hpb=b66dfd1b9f7587822fd5c8ad7b6d153d72b889c5;p=vlc

diff --git a/test/Makefile.am b/test/Makefile.am
index 847be09c15..96ace3f57e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -8,14 +8,18 @@ AUTOMAKE_OPTIONS = subdir-objects
 # Unit/regression test
 ###############################################################################
 check_PROGRAMS = \
-    test_libvlc_core \
+	test_libvlc_core \
 	test_libvlc_events \
+	$(NULL)
+EXTRA_PROGRAMS = \
 	test_libvlc_media_list \
 	test_libvlc_media_list_player \
 	test_libvlc_media_player \
 	test_libvlc_meta \
 	$(NULL)
-check_DATA = samples/test.sample samples/meta.sample
+#check_DATA = samples/test.sample samples/meta.sample
+
+check_HEADERS = libvlc/test.h
 
 TESTS = $(check_PROGRAMS)
 
@@ -35,27 +39,27 @@ samples/meta.sample:
 CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc`
 
 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_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_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_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_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_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)