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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6c90aeaef543106953a4426930a33c3012f49021
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6c90aeaef543106953a4426930...

Author: Alexandre Julliard 
Date:   Thu Mar 25 21:47:29 2010 +0100

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

---

Makefile.in |    7 -------
 aclocal.m4  |   28 ++++++++++++++++++----------
 configure   |   28 ++++++++++++++++++----------
 3 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 70ab5db..97f90ac 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -61,13 +61,6 @@ include/stamp-h: include/config.h.in config.status
 $(ALL_CONFIGS):
    @./config.status $@

-# Rules for building
-
-$(ALL_DIRS): dummy
-	@cd $@ && $(MAKE)
-
-.PHONY: $(ALL_DIRS)
-
 # Rules for dependencies

depend: $(ALL_DIRS:%=%/__depend__) dummy
diff --git a/aclocal.m4 b/aclocal.m4
index 4ebb11b..a4766d4 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -171,8 +171,9 @@ $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status Make.rule
    @./config.status --file $ac_dir/Makefile && cd $ac_dir && $(MAKE) depend"

AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"all: $ac_dir
-$ac_dir: $ac_dir/Makefile
+"all .PHONY: $ac_dir
+$ac_dir: $ac_dir/Makefile dummy
+	@cd $ac_dir && $(MAKE)
 install:: $ac_dir
    @cd $ac_dir && $(MAKE) install
 install-lib:: $ac_dir
@@ -192,6 +193,8 @@ wine_fn_config_lib ()
 "all __builddeps__: $ac_dir
 __buildcrossdeps__: $ac_dir/lib$ac_name.cross.a
 $ac_dir $ac_dir/lib$ac_name.cross.a: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include
+$ac_dir: dummy
+	@cd $ac_dir && $(MAKE)
 $ac_dir/lib$ac_name.cross.a: dummy
    @cd $ac_dir && $(MAKE) lib$ac_name.cross.a
 $ac_dir/__clean__: $ac_dir/Makefile
@@ -222,8 +225,9 @@ dlls/$ac_dir/Makefile dlls/$ac_dir/__depend__: dlls/$ac_dir/Makefile.in config.s
               dnl enable_win16 is special in that it disables import libs too
               [test "$ac_enable" != enable_win16 || return 0],
               [wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"all: dlls/$ac_dir
-dlls/$ac_dir: dlls/$ac_dir/Makefile __builddeps__ 
+"all .PHONY: dlls/$ac_dir
+dlls/$ac_dir: dlls/$ac_dir/Makefile __builddeps__ dummy
+	@cd dlls/$ac_dir && $(MAKE)
 install:: dlls/$ac_dir/Makefile __builddeps__ 
    @cd dlls/$ac_dir && $(MAKE) install
 install-lib:: dlls/$ac_dir/Makefile __builddeps__ 
@@ -280,8 +284,10 @@ programs/$ac_dir/Makefile programs/$ac_dir/__depend__: programs/$ac_dir/Makefile
    @./config.status --file programs/$ac_dir/Makefile && cd programs/$ac_dir && $(MAKE) depend"

AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"all: programs/$ac_dir
-programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__"
+"all .PHONY: programs/$ac_dir
+programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy
+	@cd programs/$ac_dir && $(MAKE)"
+
     if test -n "$ac_install"
     then
         wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
@@ -311,8 +317,9 @@ $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status Maketest.
    @./config.status --file $ac_dir/Makefile && cd $ac_dir && $(MAKE) depend"

AS_VAR_IF([enable_tests],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"all programs/winetest: $ac_dir
-$ac_dir: $ac_dir/Makefile __builddeps__
+"all programs/winetest .PHONY: $ac_dir
+$ac_dir: $ac_dir/Makefile __builddeps__ dummy
+	@cd $ac_dir && $(MAKE)
 crosstest .PHONY: $ac_dir/__crosstest__
 $ac_dir/__crosstest__: $ac_dir/Makefile __buildcrossdeps__ dummy
    @cd $ac_dir && $(MAKE) crosstest
@@ -354,8 +361,9 @@ install-dev:: $ac_dir
       wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "uninstall:: $ac_dir/Makefile
    @cd $ac_dir && $(MAKE) uninstall
-all __tooldeps__: $ac_dir
-$ac_dir: $ac_dir/Makefile libs/port"])
+all __tooldeps__ .PHONY: $ac_dir
+$ac_dir: $ac_dir/Makefile libs/port dummy
+	@cd $ac_dir && $(MAKE)"])
 }])

dnl **** Define helper function to append a file to a makefile file list ****
diff --git a/configure b/configure
index 6308ae9..2be8132 100755
--- a/configure
+++ b/configure
@@ -13887,8 +13887,9 @@ $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status Make.rule

else
   wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"all: $ac_dir
-$ac_dir: $ac_dir/Makefile
+"all .PHONY: $ac_dir
+$ac_dir: $ac_dir/Makefile dummy
+	@cd $ac_dir && $(MAKE)
 install:: $ac_dir
    @cd $ac_dir && $(MAKE) install
 install-lib:: $ac_dir
@@ -13909,6 +13910,8 @@ wine_fn_config_lib ()
 "all __builddeps__: $ac_dir
 __buildcrossdeps__: $ac_dir/lib$ac_name.cross.a
 $ac_dir $ac_dir/lib$ac_name.cross.a: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include
+$ac_dir: dummy
+	@cd $ac_dir && $(MAKE)
 $ac_dir/lib$ac_name.cross.a: dummy
    @cd $ac_dir && $(MAKE) lib$ac_name.cross.a
 $ac_dir/__clean__: $ac_dir/Makefile
@@ -13940,8 +13943,9 @@ dlls/$ac_dir/Makefile dlls/$ac_dir/__depend__: dlls/$ac_dir/Makefile.in config.s
                 test "$ac_enable" != enable_win16 || return 0
 else
   wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"all: dlls/$ac_dir
-dlls/$ac_dir: dlls/$ac_dir/Makefile __builddeps__
+"all .PHONY: dlls/$ac_dir
+dlls/$ac_dir: dlls/$ac_dir/Makefile __builddeps__ dummy
+	@cd dlls/$ac_dir && $(MAKE)
 install:: dlls/$ac_dir/Makefile __builddeps__
    @cd dlls/$ac_dir && $(MAKE) install
 install-lib:: dlls/$ac_dir/Makefile __builddeps__
@@ -14003,8 +14007,10 @@ programs/$ac_dir/Makefile programs/$ac_dir/__depend__: programs/$ac_dir/Makefile

else
   wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"all: programs/$ac_dir
-programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__"
+"all .PHONY: programs/$ac_dir
+programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy
+	@cd programs/$ac_dir && $(MAKE)"
+
     if test -n "$ac_install"
     then
         wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
@@ -14038,8 +14044,9 @@ $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status Maketest.

else
   wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"all programs/winetest: $ac_dir
-$ac_dir: $ac_dir/Makefile __builddeps__
+"all programs/winetest .PHONY: $ac_dir
+$ac_dir: $ac_dir/Makefile __builddeps__ dummy
+	@cd $ac_dir && $(MAKE)
 crosstest .PHONY: $ac_dir/__crosstest__
 $ac_dir/__crosstest__: $ac_dir/Makefile __buildcrossdeps__ dummy
    @cd $ac_dir && $(MAKE) crosstest
@@ -14083,8 +14090,9 @@ install-dev:: $ac_dir
       wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "uninstall:: $ac_dir/Makefile
    @cd $ac_dir && $(MAKE) uninstall
-all __tooldeps__: $ac_dir
-$ac_dir: $ac_dir/Makefile libs/port"
+all __tooldeps__ .PHONY: $ac_dir
+$ac_dir: $ac_dir/Makefile libs/port dummy
+	@cd $ac_dir && $(MAKE)"
 fi
 }
 ac_config_links="$ac_config_links dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd"