From 3a3307d4b206896602feeb2292c1201f094bfb14 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 7 Oct 2004 03:12:44 +0000
Subject: [PATCH] Force all the tools to be rebuilt before make depend,
 otherwise make will try to do that from the include directory.

---
 Make.rules.in |  9 ++-------
 Makefile.in   | 15 +--------------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/Make.rules.in b/Make.rules.in
index 6e343b38f78..0657baa1a3b 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -169,11 +169,6 @@ $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(WRC) $(RC_BINARIES)
 $(MODULE).dbg.c: $(C_SRCS) $(C_SRCS16) $(WINEBUILD)
 	$(WINEBUILD) $(DEFS) -o $@ --debug -C$(SRCDIR) $(C_SRCS) $(C_SRCS16)
 
-# Rule to rebuild the tools
-
-$(MAKEDEP):
-	cd $(TOOLSDIR)/tools && $(MAKE) `basename $@`
-
 # Rules for makefile
 
 Makefile: Makefile.in $(TOPSRCDIR)/configure
@@ -202,10 +197,10 @@ winapi_check:: dummy
 
 # Rules for dependencies
 
-$(SUBDIRS:%=%/__depend__): $(MAKEDEP) dummy
+$(SUBDIRS:%=%/__depend__): dummy
 	cd `dirname $@` && $(MAKE) depend
 
-depend: $(MAKEDEP) $(IDL_SRCS:.idl=.h) $(SUBDIRS:%=%/__depend__)
+depend: $(IDL_SRCS:.idl=.h) $(SUBDIRS:%=%/__depend__)
 	$(MAKEDEP) $(INCLUDES) -C$(SRCDIR) $(C_SRCS) $(C_SRCS16) $(RC_SRCS) $(RC_SRCS16) $(MC_SRCS) $(IDL_SRCS) $(EXTRA_SRCS)
 
 .PHONY: depend $(SUBDIRS:%=%/__depend__)
diff --git a/Makefile.in b/Makefile.in
index 7c7819795c0..677d40cf345 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -121,20 +121,7 @@ fonts/__install__ loader/__install__ server/__install__: libs tools
 programs/__install__: libs tools include/__install__ dlls/__install-lib__
 tools/__install__: tools
 
-# Dependencies rules
-
-$(SUBDIRS:%=%/__depend__): idl
-
-idl: $(WIDL) dummy
-	cd include && $(MAKE) all
-
-$(WIDL): $(TOOLSDIR)/libs/libwpp.a $(TOOLSDIR)/libs/libwine_port.a
-	cd $(TOOLSDIR)/tools/widl && $(MAKE) `basename $@`
-
-$(TOOLSDIR)/libs/libwpp.a $(TOOLSDIR)/libs/libwine_port.a:
-	cd $(TOOLSDIR)/libs && $(MAKE) `basename $@`
-
-.PHONY: idl
+$(SUBDIRS:%=%/__depend__): tools include
 
 # Test rules
 
-- 
2.11.4.GIT