vlc | branch: master | Diego Biurrun <[email protected]> | Tue Sep 4 11:47:32 2012 +0300| [c685975185e8ad0e4845ea0dbacc0adf77eb7a20] | committer: Rémi Denis-Courmont
src: remove one level of makefile recursion Signed-off-by: Rémi Denis-Courmont <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c685975185e8ad0e4845ea0dbacc0adf77eb7a20 --- src/Makefile.am | 33 ++++++++++++++++++++++++++++++++- src/test/Makefile.am | 32 -------------------------------- 2 files changed, 32 insertions(+), 33 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index afb35ad..35b83d8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,6 @@ ############################################################################### AUTOMAKE_OPTIONS = subdir-objects -SUBDIRS = . test NULL = EXTRA_DIST = \ @@ -478,6 +477,38 @@ SOURCES_libvlc = \ $(SOURCES_libvlc_common) \ $(NULL) +# Unit/regression tests +# +check_PROGRAMS = \ + test_block \ + test_dictionary \ + test_i18n_atof \ + test_md5 \ + test_timer \ + test_url \ + test_utf8 \ + test_xmlent \ + test_headers + +TESTS = $(check_PROGRAMS) + +test_block_SOURCES = test/block_test.c +test_block_LDADD = $(LDADD) $(LIBS_libvlccore) +test_block_DEPENDENCIES = + +test_dictionary_SOURCES = test/dictionary.c +test_i18n_atof_SOURCES = test/i18n_atof.c +test_md5_SOURCES = test/md5.c +test_timer_SOURCES = test/timer.c +test_url_SOURCES = test/url.c +test_utf8_SOURCES = test/utf8.c +test_xmlent_SOURCES = test/xmlent.c +test_headers_SOURCES = test/headers.c + +AM_LDFLAGS = -no-install +LDADD = libvlccore.la \ + ../compat/libcompat.la + ############################################################################### # GIT revision ############################################################################### diff --git a/src/test/Makefile.am b/src/test/Makefile.am deleted file mode 100644 index 25e5d50..0000000 --- a/src/test/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -# Unit/regression tests -# -check_PROGRAMS = \ - test_block \ - test_dictionary \ - test_i18n_atof \ - test_md5 \ - test_timer \ - test_url \ - test_utf8 \ - test_xmlent \ - test_headers - -TESTS = $(check_PROGRAMS) - -AM_CFLAGS = $(CFLAGS_libvlccore) -AM_LDFLAGS = -no-install -LDADD = ../libvlccore.la \ - ../../compat/libcompat.la - -test_block_SOURCES = block_test.c ../misc/block.c -test_block_LDADD = $(LDADD) $(LIBS_libvlccore) -test_block_DEPENDENCIES = - -test_dictionary_SOURCES = dictionary.c -test_i18n_atof_SOURCES = i18n_atof.c -test_md5_SOURCES = md5.c -test_timer_SOURCES = timer.c -test_url_SOURCES = url.c -test_utf8_SOURCES = utf8.c -test_xmlent_SOURCES = xmlent.c -test_headers_SOURCES = headers.c _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
