gitweb/Makefile: add a $(GITWEB_ALL) variable

[Gitweb] / Makefile

diff --git a/Makefile b/Makefile
index 7118540943ffe5ba341bc95b2a7258458b9c451dc9b26697770eeccb18c76809..3d6ab034f45985ba8c873dcf878e0a9e26af4b0366da51987041e6e78419c6ba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 # The default target of this Makefile is...
 all::
 # The default target of this Makefile is...
 all::

+.PHONY: all

 
 # Define V=1 to have a more verbose compile.
 #
 
 # Define V=1 to have a more verbose compile.
 #


@@ -34,6 +35,7 @@ GITWEB_CSS = static/gitweb.css
 GITWEB_LOGO = static/git-logo.png
 GITWEB_FAVICON = static/git-favicon.png
 GITWEB_JS = static/gitweb.js
 GITWEB_LOGO = static/git-logo.png
 GITWEB_FAVICON = static/git-favicon.png
 GITWEB_JS = static/gitweb.js

+GITWEB_SITE_HTML_HEAD_STRING =

 GITWEB_SITE_HEADER =
 GITWEB_SITE_FOOTER =
 HIGHLIGHT_BIN = highlight
 GITWEB_SITE_HEADER =
 GITWEB_SITE_FOOTER =
 HIGHLIGHT_BIN = highlight


@@ -44,10 +46,18 @@ HIGHLIGHT_BIN = highlight
 -include config.mak
 
 # determine version
 -include config.mak
 
 # determine version

+.PHONY: .FORCE-GIT-VERSION-FILE

 ../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
        $(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) GIT-VERSION-FILE
 
 ../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
        $(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) GIT-VERSION-FILE
 

+ifneq ($(MAKECMDGOALS),clean)

 -include ../GIT-VERSION-FILE
 -include ../GIT-VERSION-FILE

+endif
+
+# What targets we'll add to 'all' for "make gitweb"
+GITWEB_ALL =
+GITWEB_ALL += gitweb.cgi
+GITWEB_ALL += static/gitweb.js

 
 ### Build rules
 
 
 ### Build rules
 


@@ -87,7 +97,7 @@ ifndef V
 endif
 endif
 
 endif
 endif
 

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

 
 GITWEB_PROGRAMS = gitweb.cgi
 
 
 GITWEB_PROGRAMS = gitweb.cgi
 


@@ -144,10 +154,12 @@ GITWEB_REPLACE = \
        -e 's|++GITWEB_LOGO++|$(GITWEB_LOGO)|g' \
        -e 's|++GITWEB_FAVICON++|$(GITWEB_FAVICON)|g' \
        -e 's|++GITWEB_JS++|$(GITWEB_JS)|g' \
        -e 's|++GITWEB_LOGO++|$(GITWEB_LOGO)|g' \
        -e 's|++GITWEB_FAVICON++|$(GITWEB_FAVICON)|g' \
        -e 's|++GITWEB_JS++|$(GITWEB_JS)|g' \

+       -e 's|++GITWEB_SITE_HTML_HEAD_STRING++|$(GITWEB_SITE_HTML_HEAD_STRING)|g' \

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

+.PHONY: FORCE

 GITWEB-BUILD-OPTIONS: FORCE
        @rm -f $@+
        @echo "x" '$(PERL_PATH_SQ)' $(GITWEB_REPLACE) "$(JSMIN)|$(CSSMIN)" >$@+
 GITWEB-BUILD-OPTIONS: FORCE
        @rm -f $@+
        @echo "x" '$(PERL_PATH_SQ)' $(GITWEB_REPLACE) "$(JSMIN)|$(CSSMIN)" >$@+


@@ -167,15 +179,18 @@ static/gitweb.js: $(GITWEB_JSLIB_FILES)
 
 ### Testing rules
 
 
 ### Testing rules
 

+.PHONY: test

 test:
        $(MAKE) -C ../t gitweb-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
 
 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)'
        $(INSTALL) -m 755 $(GITWEB_PROGRAMS) '$(DESTDIR_SQ)$(gitwebdir_SQ)'
 install: all
        $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitwebdir_SQ)'
        $(INSTALL) -m 755 $(GITWEB_PROGRAMS) '$(DESTDIR_SQ)$(gitwebdir_SQ)'


@@ -184,8 +199,8 @@ install: all
 
 ### Cleaning rules
 
 
 ### Cleaning rules
 

+.PHONY: clean

 clean:
 clean:

-       $(RM) gitweb.cgi static/gitweb.min.js static/gitweb.min.css GITWEB-BUILD-OPTIONS
-
-.PHONY: all clean install test test-installed .FORCE-GIT-VERSION-FILE FORCE
-
+       $(RM) gitweb.cgi static/gitweb.js \
+               static/gitweb.min.js static/gitweb.min.css \
+               GITWEB-BUILD-OPTIONS