diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-01-31 15:23:53 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-31 14:08:50 -0800 |
| commit | ec5e0bb860bf98008d51b8235d19ed3407141295 (patch) | |
| tree | 5e7fa129edcb4b86c21cbe5a4f00eaef93f4d44e /Makefile | |
| parent | f2fabbf76e458010852ac7ced30594c8ab96b9fd (diff) | |
| download | git-ec5e0bb860bf98008d51b8235d19ed3407141295.tar.gz git-ec5e0bb860bf98008d51b8235d19ed3407141295.tar.xz | |
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>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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. \ |