[MPlayer-cvslog] r33891 - trunk/Makefile

[diego]

Author: diego
Date: Fri Jul 22 12:05:08 2011
New Revision: 33891

Log:
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.

Modified:
   trunk/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Fri Jul 22 00:25:17 2011	(r33890)
+++ trunk/Makefile	Fri Jul 22 12:05:08 2011	(r33891)
@@ -917,14 +917,13 @@ 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)))
 
-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