summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-11 18:38:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-11 18:38:39 (GMT)
commita5794988dd055fa4c2d28c4d73000577970beb1e (patch)
treef025c803c0f4d895f0352222105679b004e25b90 /Makefile
parentc7fe5b61e15cc5195e33f7d5e5ec452e6966c1ad (diff)
parentf09f1d35b5ea0637d8a3733cd246cb6bfb05b22a (diff)
downloadgit-a5794988dd055fa4c2d28c4d73000577970beb1e.zip
git-a5794988dd055fa4c2d28c4d73000577970beb1e.tar.gz
git-a5794988dd055fa4c2d28c4d73000577970beb1e.tar.bz2
Merge branch 'jn/gitweb-dependency'
* jn/gitweb-dependency: Remove gitweb/gitweb.cgi and other legacy targets from main Makefile git-instaweb: Simplify build dependency on gitweb
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile28
1 files changed, 1 insertions, 27 deletions
diff --git a/Makefile b/Makefile
index ef57c1c..320ccc7 100644
--- a/Makefile
+++ b/Makefile
@@ -1753,33 +1753,7 @@ $(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/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' \