aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-01-31 15:37:25 -0600
committerJunio C Hamano <gitster@pobox.com>2010-01-31 14:08:55 -0800
commit010acc151981ebfb0e369ffdeaef63803c58ef2b (patch)
treef2beb585fbcb49969ad9891ed16b33ec32dab6da
parentec5e0bb860bf98008d51b8235d19ed3407141295 (diff)
downloadgit-010acc151981ebfb0e369ffdeaef63803c58ef2b.tar.gz
git-010acc151981ebfb0e369ffdeaef63803c58ef2b.tar.xz
Makefile: always remove .depend directories on 'make clean'
Even if COMPUTE_HEADER_DEPENDENCIES is not set, some .o.d files might be lying around from previous builds when it was. This is especially likely because using the CHECK_HEADER_DEPENDENCIES feature requires building sometimes with COMPUTE... on and sometimes with it off. At the end of such an exercise, to get a blank slate, the user ought to be able to just run 'make clean'. Make it so. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c9391390b..93e1a9218 100644
--- a/Makefile
+++ b/Makefile
@@ -1693,9 +1693,9 @@ XDIFF_OBJS = xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o \
OBJECTS := $(GIT_OBJS) $(XDIFF_OBJS)
dep_files := $(foreach f,$(OBJECTS),$(dir $f).depend/$(notdir $f).d)
+dep_dirs := $(addsuffix .depend,$(sort $(dir $(OBJECTS))))
ifdef COMPUTE_HEADER_DEPENDENCIES
-dep_dirs := $(addsuffix .depend,$(sort $(dir $(OBJECTS))))
$(dep_dirs):
mkdir -p $@