X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=test%2FMakefile.am;h=96ace3f57efdfc7c1d1b8b8f8aba91b9c491bf70;hb=7686840e5c2b384eab661455a5e532a97c669e96;hp=8ae87f70365b4265293d438aa3f87a44e4b8cf71;hpb=01a95e76381eebe5a99a6feefc6a9cfff770962e;p=vlc

diff --git a/test/Makefile.am b/test/Makefile.am
index 8ae87f7036..96ace3f57e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -8,46 +8,61 @@ 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_HEADERS = libvlc/test.h
+
+TESTS = $(check_PROGRAMS)
 
-TESTS = samples $(check_PROGRAMS)
+DISTCLEANFILES = samples/test.sample samples/meta.sample
 
 # Samples server
 SAMPLES_SERVER=http://streams.videolan.org/streams-videolan/reference
 
 samples/test.sample:
-	mkdir -p `basename $@`
+	mkdir -p `dirname $@`
 	curl $(SAMPLES_SERVER)/avi/Hero-Div3.avi > $@
 
-samples: samples/test.sample
+samples/meta.sample:
+	mkdir -p `dirname $@`
+	curl $(SAMPLES_SERVER)/metadata/id3tag/Wesh-Bonneville.mp3 > $@
 
 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.la
+test_libvlc_meta_CFLAGS = $(CFLAGS_tests)
+
+
 FORCE:
 	@echo "Generated source cannot be phony. Go away." >&2
 	@exit 1