Mercurial > mplayer.hg

diff Makefile @ 33989:5b3605aee33b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ignore "make clean" errors in ffmpeg/. This at least avoids mplayer binaries being left over when it fails due to e.g. missing config.mak.
author reimar
date Wed, 07 Sep 2011 19:17:00 +0000
parents 8a480da297e5
children 5bd7e92fb132
line wrap: on
line diff
--- a/Makefile	Wed Sep 07 16:15:58 2011 +0000
+++ b/Makefile	Wed Sep 07 19:17:00 2011 +0000
@@ -918,12 +918,12 @@
 	rm -f $(foreach lang,$(MAN_LANGS),$(foreach man,mplayer.1 mencoder.1,$(MANDIR)/$(lang)/man1/$(man)))
 
 clean:
-	$(MAKE) -C ffmpeg $@
+	-$(MAKE) -C ffmpeg $@
 	-rm -f $(call ADD_ALL_DIRS,/*.o /*.a /*.ho /*~)
 	-rm -f $(call ADD_ALL_EXESUFS,mplayer mencoder)
 
 distclean: clean testsclean toolsclean driversclean dhahelperclean
-	$(MAKE) -C ffmpeg $@
+	-$(MAKE) -C ffmpeg $@
 	-rm -rf DOCS/tech/doxygen
 	-rm -f $(call ADD_ALL_DIRS,/*.d)
 	-rm -f config.* codecs.conf.h help_mp.h version.h TAGS tags