gitweb/Makefile: define all .PHONY prerequisites inline

Move the '.PHONY' definition so that it's split up and accompanies the
relevant as they're defined. This will make a subsequent diff smaller
as we'll remove some of these, and won't need to re-edit the
now-removed '.PHONY' line.

Signed-off-by: Ævar Arnfjörð Bjarmason <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/Makefile b/Makefile
index 43c4e0b53cf97d4d74ef292beef1edc8c75cd74a1bfa1008496821122e67c03b..e79c2dca2cbff65c6d3a028f1e08c115f2f9dc31e3068270cac9b524c8abde1b 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.
 #


@@ -45,6 +46,7 @@ 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
 


@@ -152,6 +154,7 @@ GITWEB_REPLACE = \
        -e 's|++GITWEB_SITE_FOOTER++|$(GITWEB_SITE_FOOTER)|g' \
        -e 's|++HIGHLIGHT_BIN++|$(HIGHLIGHT_BIN)|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)" >$@+


@@ -171,15 +174,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)'


@@ -188,10 +194,8 @@ install: all
 
 ### Cleaning rules
 
 
 ### Cleaning rules
 

+.PHONY: clean

 clean:
        $(RM) gitweb.cgi static/gitweb.js \
                static/gitweb.min.js static/gitweb.min.css \
                GITWEB-BUILD-OPTIONS
 clean:
        $(RM) gitweb.cgi static/gitweb.js \
                static/gitweb.min.js static/gitweb.min.css \
                GITWEB-BUILD-OPTIONS

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