diff options
| author | Paul Eggert | 2017-04-07 18:54:40 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-04-07 18:54:40 -0700 |
| commit | a614cd416c5dd71702428a008992589395a722fc (patch) | |
| tree | 4216bdfdcdc2a21c701e427a00682157f0547bde | |
| parent | 6fbbfc77d4071cbc3df86d14f9d21c1fd7a09683 (diff) | |
| download | emacs-a614cd416c5dd71702428a008992589395a722fc.tar.gz emacs-a614cd416c5dd71702428a008992589395a722fc.zip | |
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@) | |||
| 347 | am__v_at_0 = @ | 347 | am__v_at_0 = @ |
| 348 | am__v_at_1 = | 348 | am__v_at_1 = |
| 349 | 349 | ||
| 350 | AUTO_DEPEND = @AUTO_DEPEND@ | ||
| 351 | DEPDIR = deps | ||
| 352 | ifeq ($(AUTO_DEPEND),yes) | ||
| 353 | DEPFLAGS = -MMD -MF $(DEPDIR)/$*.d -MP | ||
| 354 | -include $(ALLOBJS:%.o=$(DEPDIR)/%.d) | ||
| 355 | else | ||
| 356 | DEPFLAGS = | ||
| 357 | include $(srcdir)/deps.mk | ||
| 358 | endif | ||
| 359 | |||
| 360 | # Flags that might be in WARN_CFLAGS but are not valid for Objective C. | 350 | # Flags that might be in WARN_CFLAGS but are not valid for Objective C. |
| 361 | NON_OBJC_CFLAGS = -Wignored-attributes -Wignored-qualifiers -Wopenmp-simd | 351 | NON_OBJC_CFLAGS = -Wignored-attributes -Wignored-qualifiers -Wopenmp-simd |
| 362 | 352 | ||
| @@ -445,6 +435,16 @@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(GMALLOC_OBJ) $(RALLOC_OBJ) \ | |||
| 445 | FIRSTFILE_OBJ=@FIRSTFILE_OBJ@ | 435 | FIRSTFILE_OBJ=@FIRSTFILE_OBJ@ |
| 446 | ALLOBJS = $(FIRSTFILE_OBJ) $(VMLIMIT_OBJ) $(obj) $(otherobj) | 436 | ALLOBJS = $(FIRSTFILE_OBJ) $(VMLIMIT_OBJ) $(obj) $(otherobj) |
| 447 | 437 | ||
| 438 | AUTO_DEPEND = @AUTO_DEPEND@ | ||
| 439 | DEPDIR = deps | ||
| 440 | ifeq ($(AUTO_DEPEND),yes) | ||
| 441 | DEPFLAGS = -MMD -MF $(DEPDIR)/$*.d -MP | ||
| 442 | -include $(ALLOBJS:%.o=$(DEPDIR)/%.d) | ||
| 443 | else | ||
| 444 | DEPFLAGS = | ||
| 445 | include $(srcdir)/deps.mk | ||
| 446 | endif | ||
| 447 | |||
| 448 | all: emacs$(EXEEXT) $(OTHER_FILES) | 448 | all: emacs$(EXEEXT) $(OTHER_FILES) |
| 449 | .PHONY: all | 449 | .PHONY: all |
| 450 | 450 | ||