configure: Automatically append the makedep dependency to all makefile rules.
diff --git a/configure b/configure
index 4937577..0035834 100755
--- a/configure
+++ b/configure
@@ -14125,6 +14125,12 @@
wine_fn_all_dir_rules ()
{
+ ac_makedep=""
+ if test "$1" != tools
+ then
+ ac_makedep=" \$(MAKEDEP)"
+ fi
+
wine_fn_append_file ALL_DIRS $1
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"__clean__: $1/__clean__
@@ -14132,11 +14138,11 @@
$1/__clean__: $1/Makefile
@cd $1 && \$(MAKE) clean
\$(RM) $1/Makefile
-$1/Makefile: $1/Makefile.in Make.vars.in config.status $2
+$1/Makefile: $1/Makefile.in Make.vars.in config.status $2$ac_makedep
@./config.status --file $1/Makefile:Make.vars.in:$1/Makefile.in && cd $1 && \$(MAKE) depend
depend: $1/__depend__
.PHONY: $1/__depend__
-$1/__depend__: $2 dummy
+$1/__depend__: $2 \$(MAKEDEP) dummy
@./config.status --file $1/Makefile:Make.vars.in:$1/Makefile.in && cd $1 && \$(MAKE) depend"
}
@@ -14148,7 +14154,7 @@
return 0
fi
- wine_fn_all_dir_rules $ac_dir "Make.rules \$(MAKEDEP)"
+ wine_fn_all_dir_rules $ac_dir Make.rules
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"all: $ac_dir
.PHONY: $ac_dir
@@ -14168,7 +14174,7 @@
{
ac_name=$1
ac_dir=dlls/$ac_name
- wine_fn_all_dir_rules $ac_dir "dlls/Makeimplib.rules \$(MAKEDEP)"
+ wine_fn_all_dir_rules $ac_dir dlls/Makeimplib.rules
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"all __builddeps__: $ac_dir
$ac_dir: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include dummy
@@ -14193,7 +14199,7 @@
*16) ac_implibflags=" -m16" ;;
esac
- wine_fn_all_dir_rules dlls/$ac_dir "dlls/Makedll.rules \$(MAKEDEP)"
+ wine_fn_all_dir_rules dlls/$ac_dir dlls/Makedll.rules
if eval test \"x\$"$ac_enable"\" = x"no"; then :
test "$ac_enable" != enable_win16 || return 0
@@ -14272,7 +14278,7 @@
ac_dir=$1
ac_enable=$2
ac_install=$3
- wine_fn_all_dir_rules programs/$ac_dir "programs/Makeprog.rules \$(MAKEDEP)"
+ wine_fn_all_dir_rules programs/$ac_dir programs/Makeprog.rules
if eval test \"x\$"$ac_enable"\" = x"no"; then :
@@ -14311,7 +14317,7 @@
$ac_name.rc:
echo \"$ac_name.exe TESTRES \\\"$ac_name.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
$ac_name.res: $ac_name.rc $ac_name.exe"
- wine_fn_all_dir_rules $ac_dir "Maketest.rules \$(MAKEDEP)"
+ wine_fn_all_dir_rules $ac_dir Maketest.rules
if test "x$enable_tests" = x""no; then :
@@ -14342,12 +14348,7 @@
wine_fn_config_tool ()
{
ac_dir=$1
- ac_deps="Make.rules"
- if test "$ac_dir" != tools
- then
- ac_deps="$ac_deps \$(MAKEDEP)"
- fi
- wine_fn_all_dir_rules $ac_dir "$ac_deps"
+ wine_fn_all_dir_rules $ac_dir Make.rules
if test "x$enable_tools" = x""no; then :
