gitweb: remove "test" and "test-installed" targets

[Gitweb] / Makefile

diff --git a/Makefile b/Makefile
index e79c2dca2cbff65c6d3a028f1e08c115f2f9dc31e3068270cac9b524c8abde1b..075cc02b6578a4c8a1da6b8bf1c83cc91c162483a66d5489b3ebfd15404ab002 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,8 @@
 all::
 .PHONY: all
 
 all::
 .PHONY: all
 

+MAK_DIR_GITWEB =
+

 # Define V=1 to have a more verbose compile.
 #
 # Define JSMIN to point to JavaScript minifier that functions as
 # Define V=1 to have a more verbose compile.
 #
 # Define JSMIN to point to JavaScript minifier that functions as


@@ -31,10 +33,12 @@ GITWEB_STRICT_EXPORT =
 GITWEB_BASE_URL =
 GITWEB_LIST =
 GITWEB_HOMETEXT = indextext.html
 GITWEB_BASE_URL =
 GITWEB_LIST =
 GITWEB_HOMETEXT = indextext.html

-GITWEB_CSS = static/gitweb.css
+GITWEB_CSS_IN = static/gitweb.css
+GITWEB_CSS = $(GITWEB_CSS_IN)

 GITWEB_LOGO = static/git-logo.png
 GITWEB_FAVICON = static/git-favicon.png
 GITWEB_LOGO = static/git-logo.png
 GITWEB_FAVICON = static/git-favicon.png

-GITWEB_JS = static/gitweb.js
+GITWEB_JS_IN = static/gitweb.js
+GITWEB_JS = $(GITWEB_JS_IN)

 GITWEB_SITE_HTML_HEAD_STRING =
 GITWEB_SITE_HEADER =
 GITWEB_SITE_FOOTER =
 GITWEB_SITE_HTML_HEAD_STRING =
 GITWEB_SITE_HEADER =
 GITWEB_SITE_FOOTER =


@@ -54,6 +58,11 @@ ifneq ($(MAKECMDGOALS),clean)
 -include ../GIT-VERSION-FILE
 endif
 
 -include ../GIT-VERSION-FILE
 endif
 

+# What targets we'll add to 'all' for "make gitweb"
+GITWEB_ALL =
+GITWEB_ALL += gitweb.cgi
+GITWEB_ALL += $(GITWEB_JS)
+

 ### Build rules
 
 SHELL_PATH ?= $(SHELL)
 ### Build rules
 
 SHELL_PATH ?= $(SHELL)


@@ -92,29 +101,29 @@ ifndef V
 endif
 endif
 
 endif
 endif
 

-all:: gitweb.cgi static/gitweb.js
+all:: $(GITWEB_ALL)

 
 GITWEB_PROGRAMS = gitweb.cgi
 
 
 GITWEB_PROGRAMS = gitweb.cgi
 

+GITWEB_JS_MIN = static/gitweb.min.js

 ifdef JSMIN
 ifdef JSMIN

-GITWEB_FILES += static/gitweb.min.js
-GITWEB_JS = static/gitweb.min.js
-all:: static/gitweb.min.js
-static/gitweb.min.js: static/gitweb.js GITWEB-BUILD-OPTIONS
+GITWEB_JS = $(GITWEB_JS_MIN)
+all:: $(MAK_DIR_GITWEB)$(GITWEB_JS_MIN)
+$(MAK_DIR_GITWEB)$(GITWEB_JS_MIN): $(MAK_DIR_GITWEB)GITWEB-BUILD-OPTIONS
+$(MAK_DIR_GITWEB)$(GITWEB_JS_MIN): $(MAK_DIR_GITWEB)$(GITWEB_JS_IN)

        $(QUIET_GEN)$(JSMIN) <$< >$@
        $(QUIET_GEN)$(JSMIN) <$< >$@

-else
-GITWEB_FILES += static/gitweb.js

 endif
 endif

+GITWEB_FILES += $(GITWEB_JS)

 
 

+GITWEB_CSS_MIN = static/gitweb.min.css

 ifdef CSSMIN
 ifdef CSSMIN

-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 = $(GITWEB_CSS_MIN)
+all:: $(MAK_DIR_GITWEB)$(GITWEB_CSS_MIN)
+$(MAK_DIR_GITWEB)$(GITWEB_CSS_MIN): $(MAK_DIR_GITWEB)GITWEB-BUILD-OPTIONS
+$(MAK_DIR_GITWEB)$(GITWEB_CSS_MIN): $(MAK_DIR_GITWEB)$(GITWEB_CSS_IN)

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

-else
-GITWEB_FILES += static/gitweb.css

 endif
 endif

+GITWEB_FILES += $(GITWEB_CSS)

 
 GITWEB_FILES += static/git-logo.png static/git-favicon.png
 
 
 GITWEB_FILES += static/git-logo.png static/git-favicon.png
 


@@ -122,6 +131,7 @@ GITWEB_FILES += static/git-logo.png static/git-favicon.png
 #
 # js/lib/common-lib.js should be always first, then js/lib/*.js,
 # then the rest of files; js/gitweb.js should be last (if it exists)
 #
 # js/lib/common-lib.js should be always first, then js/lib/*.js,
 # then the rest of files; js/gitweb.js should be last (if it exists)

+GITWEB_JSLIB_FILES =

 GITWEB_JSLIB_FILES += static/js/lib/common-lib.js
 GITWEB_JSLIB_FILES += static/js/lib/datetime.js
 GITWEB_JSLIB_FILES += static/js/lib/cookies.js
 GITWEB_JSLIB_FILES += static/js/lib/common-lib.js
 GITWEB_JSLIB_FILES += static/js/lib/datetime.js
 GITWEB_JSLIB_FILES += static/js/lib/cookies.js


@@ -155,47 +165,39 @@ GITWEB_REPLACE = \
        -e 's|++HIGHLIGHT_BIN++|$(HIGHLIGHT_BIN)|g'
 
 .PHONY: FORCE
        -e 's|++HIGHLIGHT_BIN++|$(HIGHLIGHT_BIN)|g'
 
 .PHONY: FORCE

-GITWEB-BUILD-OPTIONS: FORCE
+$(MAK_DIR_GITWEB)GITWEB-BUILD-OPTIONS: FORCE

        @rm -f $@+
        @echo "x" '$(PERL_PATH_SQ)' $(GITWEB_REPLACE) "$(JSMIN)|$(CSSMIN)" >$@+
        @cmp -s $@+ $@ && rm -f $@+ || mv -f $@+ $@
 
        @rm -f $@+
        @echo "x" '$(PERL_PATH_SQ)' $(GITWEB_REPLACE) "$(JSMIN)|$(CSSMIN)" >$@+
        @cmp -s $@+ $@ && rm -f $@+ || mv -f $@+ $@
 

-gitweb.cgi: gitweb.perl GITWEB-BUILD-OPTIONS
+$(MAK_DIR_GITWEB)gitweb.cgi: $(MAK_DIR_GITWEB)GITWEB-BUILD-OPTIONS
+$(MAK_DIR_GITWEB)gitweb.cgi: $(MAK_DIR_GITWEB)gitweb.perl

        $(QUIET_GEN)$(RM) $@ $@+ && \
        sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \
                $(GITWEB_REPLACE) $< >$@+ && \
        chmod +x $@+ && \
        mv $@+ $@
 
        $(QUIET_GEN)$(RM) $@ $@+ && \
        sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \
                $(GITWEB_REPLACE) $< >$@+ && \
        chmod +x $@+ && \
        mv $@+ $@
 

-static/gitweb.js: $(GITWEB_JSLIB_FILES)
+$(MAK_DIR_GITWEB)static/gitweb.js: $(addprefix $(MAK_DIR_GITWEB),$(GITWEB_JSLIB_FILES))

        $(QUIET_GEN)$(RM) $@ $@+ && \
        cat $^ >$@+ && \
        mv $@+ $@
 
        $(QUIET_GEN)$(RM) $@ $@+ && \
        cat $^ >$@+ && \
        mv $@+ $@
 

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

 ### Installation rules
 
 .PHONY: install
 install: all
        $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitwebdir_SQ)'
 ### Installation rules
 
 .PHONY: install
 install: all
        $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitwebdir_SQ)'

-       $(INSTALL) -m 755 $(GITWEB_PROGRAMS) '$(DESTDIR_SQ)$(gitwebdir_SQ)'
+       $(INSTALL) -m 755 $(addprefix $(MAK_DIR_GITWEB),$(GITWEB_PROGRAMS)) \
+               '$(DESTDIR_SQ)$(gitwebdir_SQ)'

        $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitwebstaticdir_SQ)'
        $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitwebstaticdir_SQ)'

-       $(INSTALL) -m 644 $(GITWEB_FILES) '$(DESTDIR_SQ)$(gitwebstaticdir_SQ)'
+       $(INSTALL) -m 644 $(addprefix $(MAK_DIR_GITWEB),$(GITWEB_FILES)) \
+               '$(DESTDIR_SQ)$(gitwebstaticdir_SQ)'

 
 ### Cleaning rules
 
 .PHONY: clean
 clean:
 
 ### Cleaning rules
 
 .PHONY: clean
 clean:

-       $(RM) gitweb.cgi static/gitweb.js \
-               static/gitweb.min.js static/gitweb.min.css \
-               GITWEB-BUILD-OPTIONS
+       $(RM) $(addprefix $(MAK_DIR_GITWEB),gitweb.cgi $(GITWEB_JS_IN) \
+               $(GITWEB_JS_MIN) $(GITWEB_CSS_MIN) \
+               GITWEB-BUILD-OPTIONS)