[PATCH 02/13] Makefile: fix git-instaweb dependency on gitweb
- From
Jeff King <peff@peff.net>
- Date
- Feb 5, 2014, 17:49 UTC
- Message-ID
- <20140205174923.GB15218@sigill.intra.peff.net>
- In-Reply-To
- <20140205174823.GA15070@sigill.intra.peff.net>
We build git-instaweb if NO_PERL is not defined, and it in turns depends on "gitweb", which causes us to descend into the gitweb subdir and recursively invoke make. But because gitweb is marked as .PHONY, this forces a rebuild of git-instaweb every time we run make.
We can drop the dependency of git-instaweb on gitweb. However, that means we do not recurse into "gitweb" at all, so we have to add back in the dependency to "all".
Note that the other subdirectories (like git-gui/ or perl/) are handled directly as build commands of "all", and we could simply do the same thing here. However, this patch keeps "gitweb" as a target so that "make gitweb" continues to work, in case anybody is using that.
Signed-off-by: Jeff King <peff@peff.net> --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile index 3cd4a92..1f3e5d9 100644 --- a/Makefile +++ b/Makefile @@ -1818,8 +1818,9 @@ GIT-PERL-DEFINES: FORCE .PHONY: gitweb gitweb: $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all +all:: gitweb -git-instaweb: git-instaweb.sh gitweb GIT-SCRIPT-DEFINES +git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES $(QUIET_GEN)$(cmd_munge_script) && \ chmod +x $@+ && \ mv $@+ $@
-- 1.8.5.2.500.g8060133