Module: wine Branch: master Commit: 9b02b5cddb16a4692c06d2e56b5755133540d2b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b02b5cddb16a4692c06d2e56b...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Feb 24 12:26:11 2010 +0100
makefiles: Remove makedep only after everything else has been cleaned.
---
Makefile.in | 3 ++- tools/Makefile.in | 3 +-- tools/make_makefiles | 1 + 3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Makefile.in b/Makefile.in index 2cd8bf1..187f563 100644 --- a/Makefile.in +++ b/Makefile.in @@ -107,7 +107,7 @@ $(ALL_DIRS:%=%/__clean__): dummy @cd `dirname $@` && $(MAKE) clean
clean:: $(ALL_DIRS:%=%/__clean__) - $(RM) $(ALL_DIRS:%=%/Makefile) + $(RM) $(ALL_DIRS:%=%/Makefile) tools/makedep$(EXEEXT)
distclean:: clean $(RM) config.* configure.lineno TAGS tags include/config.h include/stamp-h $(ALL_CONFIGS) @@ -229,6 +229,7 @@ RECURSE_TARGETS = \ __instal-dev__ \ __install-lib__ \ __uninstall__ \ + __testclean__ \ __crosstest__
$(MAKEDEP): include/config.h tools/Makefile diff --git a/tools/Makefile.in b/tools/Makefile.in index 2d5190b..2f6eaca 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -12,7 +12,6 @@ PROGRAMS = \ fnt2bdf$(EXEEXT) \ fnt2fon$(EXEEXT) \ make_ctests$(EXEEXT) \ - makedep$(EXEEXT) \ relpath$(EXEEXT) \ sfnt2fnt$(EXEEXT) \ wine.inf \ @@ -40,7 +39,7 @@ INSTALLDIRS = \
UPDATE_DESKTOP_DATABASE = update-desktop-database
-all: $(PROGRAMS) $(MANPAGES) +all: makedep$(EXEEXT) $(PROGRAMS) $(MANPAGES)
@MAKE_RULES@
diff --git a/tools/make_makefiles b/tools/make_makefiles index 04a351c..a3efc3b 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -97,6 +97,7 @@ my @ignores = ( "programs/winetest/*_test.exe", "programs/winetest/*_test.rc", "programs/winetest/build.rc", + "tools/makedep", );
# Source files and their resulting target to ignore