makefiles: Always build dependencies by default and get rid of the auto-depend rules.

aclocal.m4

@@ -194,14 +194,16 @@ dnl
 AC_DEFUN([WINE_CONFIG_MAKEFILE],
 [m4_pushdef([ac_dir],m4_bpatsubst([$1],[^\(\(.*\)/\)?Makefile$],[\2]))dnl
 m4_pushdef([ac_name],m4_bpatsubst(ac_dir,[.*/\(.*\)$],[\1]))dnl
-m4_if(ac_dir,,AC_CONFIG_FILES([$1]),WINE_APPEND_FILE(ALL_DIRS,ac_dir))
+m4_if(ac_dir,,WINE_APPEND_RULE(ALL_MAKEFILE_DEPENDS,[$1: $1.in $2 config.status])
+AC_CONFIG_FILES([$1]),
+[WINE_APPEND_FILE(ALL_DIRS,ac_dir)
 AS_VAR_PUSHDEF([ac_enable],m4_default([$4],[enable_]ac_name))dnl
 m4_ifval([$3],[test "x$ac_enable" != xno]m4_foreach([ac_var],[$3],[ && WINE_APPEND_FILE(ac_var,ac_dir)]))
 AS_VAR_POPDEF([ac_enable])dnl
-WINE_APPEND_RULE(ALL_MAKEFILE_DEPENDS,[m4_if(ac_dir,,[$1: $1.in $2 config.status],
+WINE_APPEND_RULE(ALL_MAKEFILE_DEPENDS,
 [\$(RECURSE_TARGETS:%=ac_dir/%) ac_dir: $1
 $1 ac_dir/__depend__: $1.in $2 config.status]m4_if(ac_dir,tools,,[ \$(MAKEDEP)])[
-	@./config.status --file $1 && cd ac_dir && \$(MAKE) Makefile])])
+	@./config.status --file $1 && cd ac_dir && \$(MAKE) depend])])
 m4_popdef([ac_dir])dnl
 m4_popdef([ac_name])])
 

configure.ac

@@ -2088,13 +2088,6 @@ esac
 dnl **** Generate output files ****
 
 AC_SUBST(DEPENDENCIES,["### Dependencies:
-
-.INIT: Makefile
-.BEGIN: Makefile
-.MAKEFILEDEPS:
-Makefile: dummy
-	-\$(MAKEDEP) \$(MAKEDEPFLAGS) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS)
-
 \$(OBJS) \$(CROSSOBJS): \$(IDL_GEN_HEADERS) \$(BISON_SRCS:.y=.tab.h)
 \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS)
 \$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb)