mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitweb/Makefile: define all .PHONY prerequisites inline

Browse Source 
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 <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2022-06-28 12:15:55 +02:00
committed by Junio C Hamano
parent 2668e3608e
commit 7decdb9b4a
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gitweb/Makefile
View File

@ -1,5 +1,6 @@
# The default target of this Makefile is... # The default target of this Makefile is...
all:: 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 -include config.mak
# determine version # determine version
.PHONY: .FORCE-GIT-VERSION-FILE
../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE ../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
$(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) 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|++GITWEB_SITE_FOOTER++|$(GITWEB_SITE_FOOTER)|g' \
-e 's|++HIGHLIGHT_BIN++|$(HIGHLIGHT_BIN)|g' -e 's|++HIGHLIGHT_BIN++|$(HIGHLIGHT_BIN)|g'
.PHONY: FORCE
GITWEB-BUILD-OPTIONS: FORCE GITWEB-BUILD-OPTIONS: FORCE
@rm -f $@+ @rm -f $@+
@echo "x" '$(PERL_PATH_SQ)' $(GITWEB_REPLACE) "$(JSMIN)|$(CSSMIN)" >$@+ @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: test:
$(MAKE) -C ../t gitweb-test $(MAKE) -C ../t gitweb-test
.PHONY: test-installed
test-installed: test-installed:
GITWEB_TEST_INSTALLED='$(DESTDIR_SQ)$(gitwebdir_SQ)' \ GITWEB_TEST_INSTALLED='$(DESTDIR_SQ)$(gitwebdir_SQ)' \
$(MAKE) -C ../t gitweb-test $(MAKE) -C ../t gitweb-test
### Installation rules ### Installation rules
.PHONY: install
install: all install: all
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitwebdir_SQ)' $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitwebdir_SQ)'
$(INSTALL) -m 755 $(GITWEB_PROGRAMS) '$(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: clean:
$(RM) gitweb.cgi static/gitweb.js \ $(RM) gitweb.cgi static/gitweb.js \
static/gitweb.min.js static/gitweb.min.css \ static/gitweb.min.js static/gitweb.min.css \
GITWEB-BUILD-OPTIONS GITWEB-BUILD-OPTIONS
.PHONY: all clean install test test-installed .FORCE-GIT-VERSION-FILE FORCE