From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 8 Apr 2017 01:54:40 +0000 (-0700)
Subject: Fix dependency checking in src/Makefile.in
X-Git-Tag: emacs-26.0.90~521^2~680
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a614cd416c5dd71702428a008992589395a722fc;p=emacs.git

Fix dependency checking in src/Makefile.in

* src/Makefile.in (AUTO_DEPEND, DEPDIR, DEPFLAGS): Move includes of
dependency files until after ALLOBJS is defined, since it uses ALLOBJS.
Otherwise, some dependencies will be missed.
---

diff --git a/src/Makefile.in b/src/Makefile.in
index 5a3d0bd0445..bed53f8f4be 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -347,16 +347,6 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 =
 
-AUTO_DEPEND = @AUTO_DEPEND@
-DEPDIR = deps
-ifeq ($(AUTO_DEPEND),yes)
-  DEPFLAGS = -MMD -MF $(DEPDIR)/$*.d -MP
-  -include $(ALLOBJS:%.o=$(DEPDIR)/%.d)
-else
-  DEPFLAGS =
-  include $(srcdir)/deps.mk
-endif
-
 # Flags that might be in WARN_CFLAGS but are not valid for Objective C.
 NON_OBJC_CFLAGS = -Wignored-attributes -Wignored-qualifiers -Wopenmp-simd
 
@@ -445,6 +435,16 @@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(GMALLOC_OBJ) $(RALLOC_OBJ) \
 FIRSTFILE_OBJ=@FIRSTFILE_OBJ@
 ALLOBJS = $(FIRSTFILE_OBJ) $(VMLIMIT_OBJ) $(obj) $(otherobj)
 
+AUTO_DEPEND = @AUTO_DEPEND@
+DEPDIR = deps
+ifeq ($(AUTO_DEPEND),yes)
+  DEPFLAGS = -MMD -MF $(DEPDIR)/$*.d -MP
+  -include $(ALLOBJS:%.o=$(DEPDIR)/%.d)
+else
+  DEPFLAGS =
+  include $(srcdir)/deps.mk
+endif
+
 all: emacs$(EXEEXT) $(OTHER_FILES)
 .PHONY: all