Commit 8598a4c6 authored by Alexandre Julliard's avatar Alexandre Julliard

makefiles: Attempt to automatically run make depend when reading an updated makefile.

parent 84cb26e4
......@@ -179,7 +179,7 @@ LINTS = $(C_SRCS:.c=.ln)
# 'all' target first in case the enclosing Makefile didn't define any target
all: Makefile
all:
filter: dummy
@$(TOPSRCDIR)/tools/winapi/make_filter --make $(MAKE) all
......@@ -193,12 +193,6 @@ $(RC_BINARIES): $(BIN2RES) $(RC_BINSRC)
$(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(WRC) $(RC_BINARIES) $(IDL_TLB_SRCS:.idl=.tlb)
# Rules for makefile
Makefile: Makefile.in $(TOPSRCDIR)/configure
@echo Makefile is older than $?, please rerun $(TOPSRCDIR)/configure
@exit 1
# Rule for linting
$(MODULE).ln : $(LINTS)
......
......@@ -103,10 +103,22 @@ fonts/__install__ loader/__install__ server/__install__: libs tools
programs/__install__: libs tools include dlls/__install-lib__
tools/__install-lib__ tools/__install-dev__: tools
depend $(SUBDIRS:%=%/__depend__): $(MAKEDEP)
RECURSE_TARGETS = \
$(SUBDIRS) \
$(SUBDIRS:%=%/__clean__) \
$(SUBDIRS:%=%/__depend__) \
$(SUBDIRS:%=%/__install-dev__) \
$(SUBDIRS:%=%/__install-lib__) \
$(SUBDIRS:%=%/__install__) \
$(SUBDIRS:%=%/__uninstall__) \
$(TESTSUBDIRS:%=%/__crosstest__) \
$(TESTSUBDIRS:%=%/__test__) \
$(TESTSUBDIRS:%=%/__testclean__)
depend $(RECURSE_TARGETS): $(MAKEDEP)
$(MAKEDEP):
@cd $(TOOLSDIR)/tools && $(MAKE) makedep
@cd $(TOOLSDIR)/tools && $(MAKE) makedep$(EXEEXT)
# Test rules
......
......@@ -23765,6 +23765,11 @@ esac
DEPENDENCIES="### Dependencies:
.INIT: Makefile
.BEGIN: Makefile
Makefile: dummy
-\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS)
\$(ALL_OBJS): \$(IDL_SRCS:.idl=.h)
\$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c)
\$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"
......
......@@ -1459,6 +1459,11 @@ dnl **** Generate output files ****
AC_SUBST(DEPENDENCIES,"### Dependencies:
.INIT: Makefile
.BEGIN: Makefile
Makefile: dummy
-\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS)
\$(ALL_OBJS): \$(IDL_SRCS:.idl=.h)
\$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c)
\$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)")
......
......@@ -95,3 +95,5 @@ uninstall::
-$(UPDATE_DESKTOP_DATABASE)
@DEPENDENCIES@ # everything below this line is overwritten by make depend
Makefile: makedep$(EXEEXT)
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