Skip to content

Commit

Permalink
src: remove one level of makefile recursion
Browse files Browse the repository at this point in the history
Signed-off-by: Rémi Denis-Courmont <[email protected]>
  • Loading branch information
DonDiego authored and Rémi Denis-Courmont committed Sep 4, 2012
1 parent 9c7198e commit c685975
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 33 deletions.
33 changes: 32 additions & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
###############################################################################

AUTOMAKE_OPTIONS = subdir-objects
SUBDIRS = . test

NULL =
EXTRA_DIST = \
Expand Down Expand Up @@ -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
###############################################################################
Expand Down
32 changes: 0 additions & 32 deletions src/test/Makefile.am

This file was deleted.

0 comments on commit c685975

Please sign in to comment.