diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-04-07 18:54:40 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-04-07 18:54:40 -0700 |
| commit | a614cd416c5dd71702428a008992589395a722fc (patch) | |
| tree | 4216bdfdcdc2a21c701e427a00682157f0547bde | |
| parent | 6fbbfc77d4071cbc3df86d14f9d21c1fd7a09683 (diff) | |
| download | emacs-a614cd416c5dd71702428a008992589395a722fc.tar.gz | |
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.
| -rw-r--r-- | src/Makefile.in | 20 |
1 files changed, 10 insertions, 10 deletions
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 |