On Tue, 19 Apr 2011, Junio C Hamano wrote: > Jakub Narebski <jnareb@xxxxxxxxx> writes: > > > Perhaps something like that would be a good change, what do you think? > > Should be a lot saner thing to do. > > Do we even need to know about JSMIN, GITWEB_JS, etc., in our main > Makefile? Shouldn't we be delegating both the build and the install > targets to "$(MAKE) -C gitweb $@"? > > > diff --git i/Makefile w/Makefile > > index cbc3fce..8960cee 100644 > > --- i/Makefile > > +++ w/Makefile > > @@ -1773,7 +1773,7 @@ gitweb/static/gitweb.min.css: gitweb/static/gitweb.css > > endif # CSSMIN > > > > > > -git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/static/gitweb.css gitweb/static/gitweb.js > > +git-instaweb: git-instaweb.sh gitweb > > $(QUIET_GEN)$(RM) $@ $@+ && \ > > sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ > > -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ How about that? The patch below is to be after just sent "git-instaweb: Simplify build dependency on gitweb", not necessary as last patch in series. Note that I have left duplicated description of JSMIN and CSSMIN in main Makefile; perhaps they also should be removed... -- >8 -- Subject: [PATCH 12/11] Remove gitweb/gitweb.cgi and other legacy targets from main Makefile Now that there is gitweb/Makefile, let's leave only "gitweb" and "install-gitweb" targets in main Makefile. Those targets just delegate to gitweb's Makefile. Signed-off-by: Jakub Narebski <jnareb@xxxxxxxxx> --- Makefile | 26 -------------------------- 1 files changed, 0 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index 8960cee..d0c577b 100644 --- a/Makefile +++ b/Makefile @@ -1747,32 +1747,6 @@ $(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl gitweb: $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all -ifdef JSMIN -GITWEB_PROGRAMS += gitweb/static/gitweb.min.js -GITWEB_JS = gitweb/static/gitweb.min.js -else -GITWEB_JS = gitweb/static/gitweb.js -endif -ifdef CSSMIN -GITWEB_PROGRAMS += gitweb/static/gitweb.min.css -GITWEB_CSS = gitweb/static/gitweb.min.css -else -GITWEB_CSS = gitweb/static/gitweb.css -endif -OTHER_PROGRAMS += gitweb/gitweb.cgi $(GITWEB_PROGRAMS) -gitweb/gitweb.cgi: gitweb/gitweb.perl $(GITWEB_PROGRAMS) - $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@) - -ifdef JSMIN -gitweb/static/gitweb.min.js: gitweb/static/gitweb.js - $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@) -endif # JSMIN -ifdef CSSMIN -gitweb/static/gitweb.min.css: gitweb/static/gitweb.css - $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@) -endif # CSSMIN - - git-instaweb: git-instaweb.sh gitweb $(QUIET_GEN)$(RM) $@ $@+ && \ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ -- 1.7.3 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html