X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=test%2FMakefile.am;h=96ace3f57efdfc7c1d1b8b8f8aba91b9c491bf70;hb=98e9da7b1a9f9d4475189985ad21b1aad0c1d550;hp=22db1f4501358027416b2b93a0e2e58b220cd02b;hpb=b11361df8b20c8d27f2f0939bcf83f7a342212ff;p=vlc

diff --git a/test/Makefile.am b/test/Makefile.am
index 22db1f4501..96ace3f57e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -8,14 +8,16 @@ 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
 
@@ -37,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)