Alexandre Julliard : makefiles: Output the top-level depend rules explicitly for each module.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 18e5313cd9ac382c02a0c736763f46ff584a2773
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=18e5313cd9ac382c02a0c73676...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Thu Mar 25 22:00:00 2010 +0100

makefiles: Output the top-level depend rules explicitly for each module.

---

 Makefile.in |    6 ------
 aclocal.m4  |    5 ++++-
 configure   |    5 ++++-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 97f90ac..31896bb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -61,11 +61,6 @@ include/stamp-h: include/config.h.in config.status
 $(ALL_CONFIGS):
 	@./config.status $@
 
-# Rules for dependencies
-
-depend: $(ALL_DIRS:%=%/__depend__) dummy
-.PHONY: $(ALL_DIRS:%=%/__depend__)
-
 # Rules for cleaning
 
 $(ALL_DIRS:%=%/__clean__): dummy
@@ -94,7 +89,6 @@ libs/wine: libs/port
 tools/wmc tools/wrc: tools
 tools tools/wmc tools/wrc: libs/wine
 tools/widl tools/wmc tools/wrc: libs/wpp
-tools/__depend__: $(MAKEDEP)
 
 $(MAKEDEP): include/config.h tools/Makefile
 	@cd $(TOOLSDIR)/tools && $(MAKE) makedep$(TOOLSEXT)
diff --git a/aclocal.m4 b/aclocal.m4
index bce0377..dcc0359 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -165,7 +165,10 @@ wine_fn_all_dir_rules ()
     wine_fn_append_file ALL_DIRS $[1]
     wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "$[1]/__clean__: $[1]/Makefile
-$[1]/Makefile $[1]/__depend__: $[1]/Makefile.in config.status $[2]
+$[1]/Makefile: $[1]/Makefile.in config.status $[2]
+	@./config.status --file $[1]/Makefile && cd $[1] && \$(MAKE) depend
+depend .PHONY: $[1]/__depend__
+$[1]/__depend__: \$(MAKEDEP) dummy
 	@./config.status --file $[1]/Makefile && cd $[1] && \$(MAKE) depend"
 }
 
diff --git a/configure b/configure
index 72c3f72..e2524a0 100755
--- a/configure
+++ b/configure
@@ -13877,7 +13877,10 @@ wine_fn_all_dir_rules ()
     wine_fn_append_file ALL_DIRS $1
     wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "$1/__clean__: $1/Makefile
-$1/Makefile $1/__depend__: $1/Makefile.in config.status $2
+$1/Makefile: $1/Makefile.in config.status $2
+	@./config.status --file $1/Makefile && cd $1 && \$(MAKE) depend
+depend .PHONY: $1/__depend__
+$1/__depend__: \$(MAKEDEP) dummy
 	@./config.status --file $1/Makefile && cd $1 && \$(MAKE) depend"
 }