mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile: tuck away generated makefile fragments in .depend

Browse Source 
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:
Jonathan Nieder
2010-01-31 15:23:53 -06:00
committed by Junio C Hamano
parent f2fabbf76e
commit ec5e0bb860
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -1692,15 +1692,15 @@ XDIFF_OBJS = xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o \
xdiff/xmerge.o xdiff/xpatience.o xdiff/xmerge.o xdiff/xpatience.o
OBJECTS := $(GIT_OBJS) $(XDIFF_OBJS) 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 ifdef COMPUTE_HEADER_DEPENDENCIES
dep_dirs := $(addsuffix deps,$(sort $(dir $(OBJECTS)))) dep_dirs := $(addsuffix .depend,$(sort $(dir $(OBJECTS))))
$(dep_dirs): $(dep_dirs):
mkdir -p $@ mkdir -p $@
missing_dep_dirs := $(filter-out $(wildcard $(dep_dirs)),$(dep_dirs)) 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 dep_args = -MF $(dep_file) -MMD -MP
ifdef CHECK_HEADER_DEPENDENCIES ifdef CHECK_HEADER_DEPENDENCIES
$(error cannot compute header dependencies outside a normal build. \ $(error cannot compute header dependencies outside a normal build. \