Makefile: tuck away generated makefile fragments in .depend
When building with COMPUTE_HEADER_DEPENDENCIES on, save dependency information to .depend/ instead of deps/ so it does not show up in ‘ls’ output. Otherwise, the extra directories can be distracting. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
f2fabbf76e
commit
ec5e0bb860
6
Makefile
6
Makefile
@ -1692,15 +1692,15 @@ XDIFF_OBJS = xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o \
|
||||
xdiff/xmerge.o xdiff/xpatience.o
|
||||
OBJECTS := $(GIT_OBJS) $(XDIFF_OBJS)
|
||||
|
||||
dep_files := $(foreach f,$(OBJECTS),$(dir $f)deps/$(notdir $f).d)
|
||||
dep_files := $(foreach f,$(OBJECTS),$(dir $f).depend/$(notdir $f).d)
|
||||
|
||||
ifdef COMPUTE_HEADER_DEPENDENCIES
|
||||
dep_dirs := $(addsuffix deps,$(sort $(dir $(OBJECTS))))
|
||||
dep_dirs := $(addsuffix .depend,$(sort $(dir $(OBJECTS))))
|
||||
$(dep_dirs):
|
||||
mkdir -p $@
|
||||
|
||||
missing_dep_dirs := $(filter-out $(wildcard $(dep_dirs)),$(dep_dirs))
|
||||
dep_file = $(dir $@)deps/$(notdir $@).d
|
||||
dep_file = $(dir $@).depend/$(notdir $@).d
|
||||
dep_args = -MF $(dep_file) -MMD -MP
|
||||
ifdef CHECK_HEADER_DEPENDENCIES
|
||||
$(error cannot compute header dependencies outside a normal build. \
|
||||
|
Loading…
Reference in New Issue
Block a user