Mercurial > mplayer.hg
comparison Makefile @ 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 | 5ebf5dc12543 |
children | bc567921d5ff |
comparison
equal
deleted
inserted
replaced
33802:94292629886d | 33803:2a4a9659d154 |
---|---|
915 rm -f $(prefix)/share/pixmaps/mplayer.png | 915 rm -f $(prefix)/share/pixmaps/mplayer.png |
916 rm -f $(prefix)/share/applications/mplayer.desktop | 916 rm -f $(prefix)/share/applications/mplayer.desktop |
917 rm -f $(MANDIR)/man1/mplayer.1 $(MANDIR)/man1/mencoder.1 | 917 rm -f $(MANDIR)/man1/mplayer.1 $(MANDIR)/man1/mencoder.1 |
918 rm -f $(foreach lang,$(MAN_LANGS),$(foreach man,mplayer.1 mencoder.1,$(MANDIR)/$(lang)/man1/$(man))) | 918 rm -f $(foreach lang,$(MAN_LANGS),$(foreach man,mplayer.1 mencoder.1,$(MANDIR)/$(lang)/man1/$(man))) |
919 | 919 |
920 clean distclean:: | 920 clean: |
921 $(MAKE) -C ffmpeg $@ | 921 $(MAKE) -C ffmpeg $@ |
922 | |
923 clean:: | |
924 -rm -f $(call ADD_ALL_DIRS,/*.o /*.a /*.ho /*~) | 922 -rm -f $(call ADD_ALL_DIRS,/*.o /*.a /*.ho /*~) |
925 -rm -f $(call ADD_ALL_EXESUFS,mplayer mencoder) | 923 -rm -f $(call ADD_ALL_EXESUFS,mplayer mencoder) |
926 | 924 |
927 distclean:: clean testsclean toolsclean driversclean dhahelperclean | 925 distclean: clean testsclean toolsclean driversclean dhahelperclean |
926 $(MAKE) -C ffmpeg $@ | |
928 -rm -rf DOCS/tech/doxygen | 927 -rm -rf DOCS/tech/doxygen |
929 -rm -f $(call ADD_ALL_DIRS,/*.d) | 928 -rm -f $(call ADD_ALL_DIRS,/*.d) |
930 -rm -f config.* codecs.conf.h help_mp.h version.h TAGS tags | 929 -rm -f config.* codecs.conf.h help_mp.h version.h TAGS tags |
931 -rm -f $(VIDIX_PCI_FILES) | 930 -rm -f $(VIDIX_PCI_FILES) |
932 -rm -f $(call ADD_ALL_EXESUFS,codec-cfg cpuinfo) | 931 -rm -f $(call ADD_ALL_EXESUFS,codec-cfg cpuinfo) |