configure: Support specifying a .rules.in file as dependency.
diff --git a/aclocal.m4 b/aclocal.m4
index f9abe4c..021159d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -166,11 +166,17 @@
{
ac_dir=$[1]
ac_alldeps=$[2]
+ ac_makedep="\$(MAKEDEP)"
+ ac_input=Make.vars.in:$ac_dir/Makefile.in
if test $ac_dir != tools
then
dnl makedep is in tools so tools makefile cannot depend on it
- ac_alldeps="$[2] \$(MAKEDEP)"
+ ac_alldeps="$[2] $ac_makedep"
fi
+ case $[2] in
+ *.in) ac_input=$ac_input:$[2] ;;
+ *) ac_makedep="$[2] $ac_makedep" ;;
+ esac
wine_fn_append_file ALL_DIRS $ac_dir
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
@@ -180,11 +186,11 @@
@cd $ac_dir && \$(MAKE) clean
\$(RM) $ac_dir/Makefile
$ac_dir/Makefile: $ac_dir/Makefile.in Make.vars.in config.status $ac_alldeps
- @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && cd $ac_dir && \$(MAKE) depend
+ @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend
depend: $ac_dir/__depend__
.PHONY: $ac_dir/__depend__
-$ac_dir/__depend__: $[2] \$(MAKEDEP) dummy
- @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && cd $ac_dir && \$(MAKE) depend"
+$ac_dir/__depend__: $ac_makedep dummy
+ @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend"
}
wine_fn_config_makefile ()
diff --git a/configure b/configure
index 36807fc..f1f9435 100755
--- a/configure
+++ b/configure
@@ -14127,10 +14127,16 @@
{
ac_dir=$1
ac_alldeps=$2
+ ac_makedep="\$(MAKEDEP)"
+ ac_input=Make.vars.in:$ac_dir/Makefile.in
if test $ac_dir != tools
then
- ac_alldeps="$2 \$(MAKEDEP)"
+ ac_alldeps="$2 $ac_makedep"
fi
+ case $2 in
+ *.in) ac_input=$ac_input:$2 ;;
+ *) ac_makedep="$2 $ac_makedep" ;;
+ esac
wine_fn_append_file ALL_DIRS $ac_dir
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
@@ -14140,11 +14146,11 @@
@cd $ac_dir && \$(MAKE) clean
\$(RM) $ac_dir/Makefile
$ac_dir/Makefile: $ac_dir/Makefile.in Make.vars.in config.status $ac_alldeps
- @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && cd $ac_dir && \$(MAKE) depend
+ @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend
depend: $ac_dir/__depend__
.PHONY: $ac_dir/__depend__
-$ac_dir/__depend__: $2 \$(MAKEDEP) dummy
- @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && cd $ac_dir && \$(MAKE) depend"
+$ac_dir/__depend__: $ac_makedep dummy
+ @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend"
}
wine_fn_config_makefile ()
