# HG changeset patch
# User diego
# Date 1363558842 0
# Node ID 0553bd41eb78a9d7c141ece529927102ba209cb8
# Parent  b4047109a8bd544db5863a6bd292d844c48020ab
build: Fix conditional compilation of tests and tools.

diff -r b4047109a8bd -r 0553bd41eb78 Makefile
--- 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