Mercurial > mplayer.hg
changeset 33803:2a4a9659d154
build: fix negative interaction between clean and distclean targets
Due to the order in which double-colon rules get evaluated and executed, the
ffmpeg/ subdirectory clean dependency of the distclean target was run after
the distclean target in the ffmpeg/ subdirectory. Since the distclean target
removes config.mak, the clean target failed because config.mak is required.
| author | diego |
|---|---|
| date | Fri, 22 Jul 2011 10:05:08 +0000 |
| parents | 94292629886d |
| children | 254e56b1e39d |
| files | Makefile |
| diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Thu Jul 21 22:25:17 2011 +0000 +++ b/Makefile Fri Jul 22 10:05:08 2011 +0000 @@ -917,14 +917,13 @@ 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))) -clean distclean:: +clean: $(MAKE) -C ffmpeg $@ - -clean:: -rm -f $(call ADD_ALL_DIRS,/*.o /*.a /*.ho /*~) -rm -f $(call ADD_ALL_EXESUFS,mplayer mencoder) -distclean:: clean testsclean toolsclean driversclean dhahelperclean +distclean: clean testsclean toolsclean driversclean dhahelperclean + $(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