Commit d59227e5 authored by Alexandre Julliard's avatar Alexandre Julliard

makefiles: Make sure that dependencies are always updated when regenerating makefiles.

parent bc82a786
......@@ -67,7 +67,7 @@ WINAPI_CHECK_EXTRA_FLAGS = --global
# Rules for re-running configure
ALL_CONFIGS = Makefile $(ALL_DIRS:%=%/Makefile) @ALL_MAKERULES@ @ALL_SYMLINKS@
ALL_CONFIGS = Makefile @ALL_MAKERULES@ @ALL_SYMLINKS@
$(SRCDIR)/configure: @MAINTAINER_MODE@ configure.ac aclocal.m4
cd $(SRCDIR) && autoconf --warnings=all
......@@ -98,10 +98,7 @@ $(ALL_DIRS): dummy
# Rules for dependencies
$(ALL_DIRS:%=%/__depend__): dummy
@cd `dirname $@` && $(MAKE) depend
depend: $(MAKEDEP) $(ALL_DIRS:%=%/__depend__) dummy
depend: $(ALL_DIRS:%=%/__depend__) dummy
.PHONY: $(ALL_DIRS:%=%/__depend__)
# Rules for cleaning
......@@ -110,6 +107,7 @@ $(ALL_DIRS:%=%/__clean__): dummy
@cd `dirname $@` && $(MAKE) clean
clean:: $(ALL_DIRS:%=%/__clean__)
$(RM) $(ALL_DIRS:%=%/Makefile)
distclean:: clean
$(RM) config.* configure.lineno TAGS tags include/config.h include/stamp-h $(ALL_CONFIGS)
......@@ -227,7 +225,6 @@ tools/wrc/__install__ tools/wrc/__install-dev__: tools/wrc
RECURSE_TARGETS = \
__clean__ \
__depend__ \
__install__ \
__instal-dev__ \
__install-lib__ \
......
......@@ -198,8 +198,10 @@ m4_ifval(ac_dir,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_ifval(ac_dir,[\$(RECURSE_TARGETS:%=ac_dir/%) ac_dir: $1 \$(MAKEDEP)
])[$1: ]m4_ifval([$2],[$1.in $2],[$1.in]) config.status])
WINE_APPEND_RULE(ALL_MAKEFILE_DEPENDS,[m4_if(ac_dir,,[$1: $1.in $2 config.status],
[\$(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])])
AC_CONFIG_FILES([$1])dnl
m4_popdef([ac_dir])dnl
m4_popdef([ac_name])])
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment