From: Jonathan Nieder Date: Sun, 31 Jan 2010 21:37:25 GMT Subject: [PATCH 14/12] Makefile: always remove .depend directories on 'make clean' Message-ID: <20100131213725.GB4636@progeny.tock> In-Reply-To: <7vaavuc6f4.fsf@alter.siamese.dyndns.org> 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 --- Junio C Hamano wrote: > Yes, the last one. After playing around, with or without COMPUTE/CHECK, > and then making a final build, it would be nice if "make distclean" > removed all the intermediate build products without the same special > "debug build" options (and without COMPUTE, dep_dirs is empty so nothing > is removed). Another good idea. :) Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index c939139..93e1a92 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 $@ -- 1.7.0.rc1