Mercurial > mplayer.hg

changeset 35896:0553bd41eb78

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Fix conditional compilation of tests and tools.
author diego
date Sun, 17 Mar 2013 22:20:42 +0000
parents b4047109a8bd
children 23ae72ee9c04
files Makefile
diffstat 1 files changed, 4 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Mar 17 17:42:53 2013 +0000
+++ b/Makefile	Sun Mar 17 22:20:42 2013 +0000
@@ -1022,11 +1022,9 @@
 loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g
 loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): $(LOADER_TEST_OBJS)
 
-TESTS = codecs2html codec-cfg-test libvo/aspecttest
+TESTS-$(ARCH_X86_32) += loader/qtx/list loader/qtx/qtxload
 
-ifdef ARCH_X86_32
-TESTS += loader/qtx/list loader/qtx/qtxload
-endif
+TESTS := codecs2html codec-cfg-test libvo/aspecttest $(TESTS-yes)
 
 TESTS_DEP_FILES = $(addsuffix .d,$(TESTS))
 
@@ -1035,11 +1033,9 @@
 testsclean:
 	-rm -f $(call ADD_ALL_EXESUFS,$(TESTS))
 
-TOOLS = $(addprefix TOOLS/,alaw-gen asfinfo avi-fix avisubdump compare dump_mp4 movinfo netstream subrip vivodump)
+TOOLS-$(ARCH_X86) += fastmemcpybench modify_reg
 
-ifdef ARCH_X86
-TOOLS += TOOLS/fastmemcpybench TOOLS/modify_reg
-endif
+TOOLS := $(addprefix TOOLS/,alaw-gen asfinfo avi-fix avisubdump compare dump_mp4 movinfo netstream subrip vivodump $(TOOLS-yes))
 
 ALLTOOLS = $(TOOLS) TOOLS/bmovl-test TOOLS/vfw2menc