From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Erik Faye-Lund <kusmabite@googlemail.com>,
Sverre Rabbelier <srabbelier@gmail.com>,
Andreas Schwab <schwab@linux-m68k.org>
Subject: [PATCH 13/12] Makefile: tuck away generated makefile fragments in .depend
Date: Sun, 31 Jan 2010 15:23:53 -0600 [thread overview]
Message-ID: <20100131212353.GA4636@progeny.tock> (raw)
In-Reply-To: <7viqaic8gs.fsf@alter.siamese.dyndns.org>
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>
---
Junio C Hamano wrote:
> * "deps/" should probably be ".depend/" or something less distracting;
Good idea. Here goes...
Makefile | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 45b1f54..c939139 100644
--- a/Makefile
+++ b/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. \
--
1.7.0.rc1
next prev parent reply other threads:[~2010-01-31 21:24 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-23 14:42 [PATCH 0/5] Makefile: add missing header dependency rules Jonathan Nieder
2010-01-23 14:43 ` [PATCH 1/5] Makefile: add missing header file dependencies Jonathan Nieder
2010-01-23 14:44 ` [PATCH 2/5] Makefile: make sure test helpers are rebuilt when headers change Jonathan Nieder
2010-01-23 14:44 ` [PATCH 3/5] Makefile: remove wt-status.h from LIB_H Jonathan Nieder
2010-01-23 14:45 ` [PATCH 4/5] Makefile: clean up http-walker.o dependency rules Jonathan Nieder
2010-01-23 14:45 ` [PATCH 5/5] Makefile: drop dependency on $(wildcard */*.h) Jonathan Nieder
2010-01-25 4:44 ` [PATCH 0/5] Makefile: add missing header dependency rules Junio C Hamano
2010-01-26 15:43 ` [PATCH 00/12] " Jonathan Nieder
2010-01-26 15:44 ` [PATCH 01/12] Makefile: add missing header file dependencies Jonathan Nieder
2010-01-26 15:45 ` [PATCH 02/12] Makefile: make sure test helpers are rebuilt when headers change Jonathan Nieder
2010-01-26 15:46 ` [PATCH 03/12] Makefile: remove wt-status.h from LIB_H Jonathan Nieder
2010-01-26 15:46 ` [PATCH 04/12] Makefile: clean up http-walker.o dependency rules Jonathan Nieder
2010-01-26 15:46 ` [PATCH 05/12] Makefile: drop dependency on $(wildcard */*.h) Jonathan Nieder
2010-01-26 15:47 ` [PATCH 06/12] Makefile: transport.o depends on branch.h now Jonathan Nieder
2010-01-26 15:49 ` [PATCH 07/12] Makefile: rearrange dependency rules Jonathan Nieder
2010-01-26 15:51 ` [PATCH 08/12] Makefile: disable default implicit rules Jonathan Nieder
2010-01-26 15:52 ` [PATCH 09/12] Makefile: list generated object files in OBJECTS Jonathan Nieder
2010-01-26 15:52 ` [PATCH 10/12] Makefile: lazily compute header dependencies Jonathan Nieder
2010-01-26 15:54 ` [PATCH 11/12] Makefile: list standalone program object files in PROGRAM_OBJS Jonathan Nieder
2010-01-27 9:07 ` [PATCH v2 " Jonathan Nieder
2010-01-26 15:57 ` [PATCH 12/12] Teach Makefile to check header dependencies Jonathan Nieder
2010-01-31 20:42 ` Junio C Hamano
2010-01-31 21:14 ` Jonathan Nieder
2010-01-31 21:26 ` Junio C Hamano
2010-01-31 21:37 ` [PATCH 14/12] Makefile: always remove .depend directories on 'make clean' Jonathan Nieder
2010-01-31 21:23 ` Jonathan Nieder [this message]
2010-01-26 16:19 ` [PATCH 00/12] Re: Makefile: add missing header dependency rules Jonathan Nieder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100131212353.GA4636@progeny.tock \
--to=jrnieder@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kusmabite@googlemail.com \
--cc=schwab@linux-m68k.org \
--cc=srabbelier@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).