X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=test%2FMakefile.am;h=1393df2dbd7f01934cc70de15a3b3fb459d07dca;hb=d0b93ce78dbd5ff228690a6ab5ce0affdcebbb0d;hp=7d6203edac4ed5314754c5a3f4d1d82a34b10a95;hpb=2201d192cbd50cac7f5183181431ae166b4202e4;p=vlc

diff --git a/test/Makefile.am b/test/Makefile.am
index 7d6203edac..1393df2dbd 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -14,20 +14,26 @@ extra_check_verbose__0 = $(extra_check_verbose_0)
 ###############################################################################
 check_PROGRAMS = \
 	test_libvlc_core \
-	test_libvlc_events \
+	test_libvlc_equalizer \
+	test_libvlc_media \
 	test_libvlc_media_list \
 	test_libvlc_media_player \
+	test_src_config_chain \
 	test_src_misc_variables \
         $(NULL)
 
+check_SCRIPTS = \
+    modules/lua/telnet.sh
+
 # Disabled test:
 # meta: No suitable test file
 EXTRA_PROGRAMS = \
 	test_libvlc_meta \
+	test_libvlc_media_list_player \
 	$(NULL)
 
 #check_DATA = samples/test.sample samples/meta.sample
-EXTRA_DIST = samples/empty.voc
+EXTRA_DIST = samples/empty.voc samples/image.jpg $(check_SCRIPTS)
 
 check_HEADERS = libvlc/test.h libvlc/libvlc_additions.h
 
@@ -46,43 +52,29 @@ samples/meta.sample:
 	mkdir -p `dirname $@`
 	curl $(SAMPLES_SERVER)/metadata/id3tag/Wesh-Bonneville.mp3 > $@
 
-CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc` -DSRCDIR=\"$(srcdir)\"
-LDFLAGS_tests = -no-install -static
+AM_CFLAGS = -DSRCDIR=\"$(srcdir)\"
+AM_LDFLAGS = -no-install -static
+LIBVLCCORE = ../src/libvlccore.la
+LIBVLC = ../lib/libvlc.la
 
 test_libvlc_core_SOURCES = libvlc/core.c
-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_core_LDADD = $(LIBVLC)
+test_libvlc_equalizer_SOURCES = libvlc/equalizer.c
+test_libvlc_equalizer_LDADD = $(LIBVLC)
+test_libvlc_media_SOURCES = libvlc/media.c
+test_libvlc_media_LDADD = $(LIBVLC)
 test_libvlc_media_list_player_SOURCES = libvlc/media_list_player.c
-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_player_LDADD = $(LIBVLC)
 test_libvlc_media_list_SOURCES = libvlc/media_list.c
-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_list_LDADD = $(LIBVLC)
 test_libvlc_media_player_SOURCES = libvlc/media_player.c
-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_media_player_LDADD = $(LIBVLC)
 test_libvlc_meta_SOURCES = libvlc/meta.c
-test_libvlc_meta_LDADD = $(top_builddir)/src/libvlc.la
-test_libvlc_meta_CFLAGS = $(CFLAGS_tests)
-test_libvlc_meta_LDFLAGS = $(LDFLAGS_tests)
-
+test_libvlc_meta_LDADD = $(LIBVLC)
 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)
+test_src_misc_variables_LDADD = $(LIBVLCCORE) $(LIBVLC)
+test_src_config_chain_SOURCES = src/config/chain.c
+test_src_config_chain_LDADD = $(LIBVLCCORE)
 
 checkall:
 	$(MAKE) check_PROGRAMS="$(check_PROGRAMS) $(EXTRA_PROGRAMS)" check