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

diff --git a/Makefile.in b/Makefile.in
index 97f90acba43b76ce641c277f0c94f3217c127081..31896bb51c017efb2530adfb3136417e713d80ec 100644 (file)
--- 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 bce0377cb0ed13a33eaf09181aea7db732565363..dcc03597b0710d857edfd8aa1a44942cbf30ae26 100644 (file)
--- 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 72c3f7218bbf5f8fe5c6d6d31853939f8f64952b..e2524a019079ba0423b770cba56241d33fa9e09e 100755 (executable)
--- 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"
 }