Mercurial > mplayer.hg

diff Makefile @ 35917:a428cba73765

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Add proper conditional compilation for all tools. Also add an SDL image library check to configure, which is required for the bmovl test tool.
author diego
date Tue, 19 Mar 2013 10:42:33 +0000
parents 209180129a45
children 902fef954aba
line wrap: on
line diff
--- a/Makefile	Tue Mar 19 10:42:30 2013 +0000
+++ b/Makefile	Tue Mar 19 10:42:33 2013 +0000
@@ -1031,19 +1031,18 @@
 testsclean:
 	-rm -f $(call ADD_ALL_EXESUFS,$(TESTS))
 
-TOOLS-$(ARCH_X86) += fastmemcpybench modify_reg
+TOOLS-$(ARCH_X86)       += fastmemcpybench modify_reg
+TOOLS-$(HAVE_WINDOWS_H) += vfw2menc
+TOOLS-$(SDL_IMAGE)      += bmovl-test
 
 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
-
-TOOLS_DEP_FILES = $(addsuffix .d,$(ALLTOOLS))
+TOOLS_DEP_FILES = $(addsuffix .d,$(TOOLS))
 
 tools: $(addsuffix $(EXESUF),$(TOOLS))
-alltools: $(addsuffix $(EXESUF),$(ALLTOOLS))
 
 toolsclean:
-	-rm -f $(call ADD_ALL_EXESUFS,$(ALLTOOLS))
+	-rm -f $(call ADD_ALL_EXESUFS,$(TOOLS) $(TOOLS-no))
 	-rm -f TOOLS/realcodecs/*.so.6.0
 
 TOOLS/bmovl-test$(EXESUF): LIBS = -lSDL_image