gitweb: introduce remote_heads feature

[Gitweb] / Makefile

diff --git a/Makefile b/Makefile
index 63fa892ad444109aa4f1d5dc53240a65ae1a319a1e456f0db3a4917882ba956a..4a08f4257d82480ed4b2b6bec4647f41277fe3e51efe8127ed77764fc05e7d23 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -35,10 +35,12 @@ GITWEB_FAVICON = static/git-favicon.png
 GITWEB_JS = static/gitweb.js
 GITWEB_SITE_HEADER =
 GITWEB_SITE_FOOTER =
 GITWEB_JS = static/gitweb.js
 GITWEB_SITE_HEADER =
 GITWEB_SITE_FOOTER =

+HIGHLIGHT_BIN = highlight

 
 # include user config
 -include ../config.mak.autogen
 -include ../config.mak
 
 # include user config
 -include ../config.mak.autogen
 -include ../config.mak

+-include config.mak

 
 # determine version
 ../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 
 # determine version
 ../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE


@@ -103,7 +105,7 @@ GITWEB_FILES += static/gitweb.min.css
 GITWEB_CSS = static/gitweb.min.css
 all:: static/gitweb.min.css
 static/gitweb.min.css: static/gitweb.css GITWEB-BUILD-OPTIONS
 GITWEB_CSS = static/gitweb.min.css
 all:: static/gitweb.min.css
 static/gitweb.min.css: static/gitweb.css GITWEB-BUILD-OPTIONS

-       $(QUIET_GEN)$(CSSMIN) <$ >$@
+       $(QUIET_GEN)$(CSSMIN) <$< >$@

 else
 GITWEB_FILES += static/gitweb.css
 endif
 else
 GITWEB_FILES += static/gitweb.css
 endif


@@ -129,7 +131,8 @@ GITWEB_REPLACE = \
        -e 's|++GITWEB_FAVICON++|$(GITWEB_FAVICON)|g' \
        -e 's|++GITWEB_JS++|$(GITWEB_JS)|g' \
        -e 's|++GITWEB_SITE_HEADER++|$(GITWEB_SITE_HEADER)|g' \
        -e 's|++GITWEB_FAVICON++|$(GITWEB_FAVICON)|g' \
        -e 's|++GITWEB_JS++|$(GITWEB_JS)|g' \
        -e 's|++GITWEB_SITE_HEADER++|$(GITWEB_SITE_HEADER)|g' \

-       -e 's|++GITWEB_SITE_FOOTER++|$(GITWEB_SITE_FOOTER)|g'
+       -e 's|++GITWEB_SITE_FOOTER++|$(GITWEB_SITE_FOOTER)|g' \
+       -e 's|++HIGHLIGHT_BIN++|$(HIGHLIGHT_BIN)|g'

 
 GITWEB-BUILD-OPTIONS: FORCE
        @rm -f $@+
 
 GITWEB-BUILD-OPTIONS: FORCE
        @rm -f $@+


@@ -143,6 +146,15 @@ gitweb.cgi: gitweb.perl GITWEB-BUILD-OPTIONS
        chmod +x $@+ && \
        mv $@+ $@
 
        chmod +x $@+ && \
        mv $@+ $@
 

+### Testing rules
+
+test:
+       $(MAKE) -C ../t gitweb-test
+
+test-installed:
+       GITWEB_TEST_INSTALLED='$(DESTDIR_SQ)$(gitwebdir_SQ)' \
+               $(MAKE) -C ../t gitweb-test
+

 ### Installation rules
 
 install: all
 ### Installation rules
 
 install: all


@@ -156,5 +168,5 @@ install: all
 clean:
        $(RM) gitweb.cgi static/gitweb.min.js static/gitweb.min.css GITWEB-BUILD-OPTIONS
 
 clean:
        $(RM) gitweb.cgi static/gitweb.min.js static/gitweb.min.css GITWEB-BUILD-OPTIONS
 

-.PHONY: all clean install .FORCE-GIT-VERSION-FILE FORCE
+.PHONY: all clean install test test-installed .FORCE-GIT-VERSION-FILE FORCE