[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master a614cd4 2/3: Fix dependency checking in src/Makefil
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master a614cd4 2/3: Fix dependency checking in src/Makefile.in |
Date: |
Fri, 7 Apr 2017 21:54:46 -0400 (EDT) |
branch: master
commit a614cd416c5dd71702428a008992589395a722fc
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
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.
---
src/Makefile.in | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/Makefile.in b/src/Makefile.in
index 5a3d0bd..bed53f8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -347,16 +347,6 @@ am__v_at_ = $(address@hidden@)
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) \
address@hidden@
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