Merge svn changes up to r28549

1 files changed, 25 insertions, 34 deletions

diff --git a/Makefile b/Makefile
index bf2365c75b..f6b4c04e55 100644
--- a/Makefile
+++ b/Makefile
@@ -935,16 +935,18 @@ uninstall:
 	rm -f $(MANDIR)/man1/mplayer.1 $(MANDIR)/man1/mencoder.1
 	rm -f $(foreach lang,$(MAN_LANGS),$(foreach man,mplayer.1 mencoder.1,$(MANDIR)/$(lang)/man1/$(man)))
 
+ADD_ALL_EXESUFS = $(foreach exesuf,$(EXESUFS_ALL),$(1) $(1)$(exesuf))
+
 clean:
-	rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.a /*.ho /*~, $(addsuffix $(suffix),$(dir))))
-	rm -f mplayer$(EXESUF) mencoder$(EXESUF)
+	-rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.a /*.ho /*~, $(addsuffix $(suffix),$(dir))))
+	-rm -f $(foreach file,mplayer mencoder,$(call ADD_ALL_EXESUFS,$(file)))
 
 distclean: clean testsclean toolsclean driversclean dhahelperclean dhahelperwinclean
-	rm -rf DOCS/tech/doxygen
-	rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.d, $(addsuffix $(suffix),$(dir))))
-	rm -f configure.log config.mak config.h codecs.conf.h help_mp.h \
-           version.h $(VIDIX_PCI_FILES) \
-           codec-cfg$(EXESUF) cpuinfo$(EXESUF) TAGS tags
+	-rm -rf DOCS/tech/doxygen
+	-rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.d, $(addsuffix $(suffix),$(dir))))
+	-rm -f configure.log config.mak config.h codecs.conf.h help_mp.h \
+           version.h $(VIDIX_PCI_FILES) TAGS tags
+	-rm -f $(foreach file,codec-cfg cpuinfo,$(call ADD_ALL_EXESUFS,$(file)))
 
 doxygen:
 	doxygen DOCS/tech/Doxyfile
@@ -978,43 +980,32 @@ loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): $(LOADER_TEST_OBJS)
 
 mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF): $(filter mp3lib/%,$(SRCS_COMMON:.c=.o)) libvo/aclib.o cpudetect.o $(TEST_OBJS)
 
-TESTS = codecs2html$(EXESUF) codec-cfg-test$(EXESUF) \
-        liba52/test$(EXESUF) libvo/aspecttest$(EXESUF) \
-        mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF)
+TESTS = codecs2html codec-cfg-test liba52/test libvo/aspecttest \
+        mp3lib/test mp3lib/test2
 
 ifdef ARCH_X86
-TESTS += loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF)
+TESTS += loader/qtx/list loader/qtx/qtxload
 endif
 
-tests: $(TESTS)
+tests: $(addsuffix $(EXESUF),$(TESTS))
 
 testsclean:
-	rm -f $(TESTS)
-
-TOOLS = TOOLS/alaw-gen$(EXESUF) \
-        TOOLS/asfinfo$(EXESUF) \
-        TOOLS/avi-fix$(EXESUF) \
-        TOOLS/avisubdump$(EXESUF) \
-        TOOLS/compare$(EXESUF) \
-        TOOLS/dump_mp4$(EXESUF) \
-        TOOLS/movinfo$(EXESUF) \
-        TOOLS/netstream$(EXESUF) \
-        TOOLS/subrip$(EXESUF) \
-        TOOLS/vivodump$(EXESUF) \
+	-rm -f $(foreach file,$(TESTS),$(call ADD_ALL_EXESUFS,$(file)))
+
+TOOLS = $(addprefix TOOLS/,alaw-gen asfinfo avi-fix avisubdump compare dump_mp4 movinfo netstream subrip vivodump)
 
 ifdef ARCH_X86
-TOOLS += TOOLS/modify_reg$(EXESUF)
+TOOLS += TOOLS/modify_reg
 endif
 
-ALLTOOLS = $(TOOLS) \
-           TOOLS/bmovl-test$(EXESUF) \
-           TOOLS/vfw2menc$(EXESUF) \
+ALLTOOLS = $(TOOLS) TOOLS/bmovl-test TOOLS/vfw2menc
 
-tools: $(TOOLS)
-alltools: $(ALLTOOLS)
+tools: $(addsuffix $(EXESUF),$(TOOLS))
+alltools: $(addsuffix $(EXESUF),$(ALLTOOLS))
 
 toolsclean:
-	rm -f $(ALLTOOLS) TOOLS/fastmem*-* TOOLS/realcodecs/*.so.6.0
+	-rm -f $(foreach file,$(ALLTOOLS),$(call ADD_ALL_EXESUFSx,$(file)))
+	-rm -f TOOLS/fastmem*-* TOOLS/realcodecs/*.so.6.0
 
 TOOLS/bmovl-test$(EXESUF): -lSDL_image
 
@@ -1082,7 +1073,7 @@ install-drivers: $(DRIVER_OBJS)
 	-ln -s /dev/radeon_vid /dev/rage128_vid
 
 driversclean:
-	rm -f $(DRIVER_OBJS) drivers/*~
+	-rm -f $(DRIVER_OBJS) drivers/*~
 
 dhahelper: vidix/dhahelper/dhahelper.o vidix/dhahelper/test
 
@@ -1096,7 +1087,7 @@ install-dhahelper: vidix/dhahelper/dhahelper.o
 	-mknod /dev/dhahelper c 180 0
 
 dhahelperclean:
-	rm -f vidix/dhahelper/*.o vidix/dhahelper/*~ vidix/dhahelper/test
+	-rm -f vidix/dhahelper/*.o vidix/dhahelper/*~ vidix/dhahelper/test
 
 dhahelperwin: vidix/dhahelperwin/dhasetup.exe vidix/dhahelperwin/dhahelper.sys
 
@@ -1128,7 +1119,7 @@ install-dhahelperwin:
 	vidix/dhahelperwin/dhasetup.exe install
 
 dhahelperwinclean:
-	rm -f $(addprefix vidix/dhahelperwin/,*.o *~ dhahelper.sys dhasetup.exe base.tmp temp.exp)
+	-rm -f $(addprefix vidix/dhahelperwin/,*.o *~ dhahelper.sys dhasetup.exe base.tmp temp.exp)