Skip to content

Commit

Permalink
gitweb/Makefile: define all .PHONY prerequisites inline
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
avar authored and gitster committed Jun 28, 2022
1 parent 2668e36 commit 7decdb9
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions gitweb/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# The default target of this Makefile is...
all::
.PHONY: all

# Define V=1 to have a more verbose compile.
#
Expand Down Expand Up @@ -45,6 +46,7 @@ HIGHLIGHT_BIN = highlight
-include config.mak

# determine version
.PHONY: .FORCE-GIT-VERSION-FILE
../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
$(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) GIT-VERSION-FILE

Expand Down Expand Up @@ -152,6 +154,7 @@ GITWEB_REPLACE = \
-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)" >$@+
Expand All @@ -171,15 +174,18 @@ static/gitweb.js: $(GITWEB_JSLIB_FILES)

### 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)'
$(INSTALL) -m 755 $(GITWEB_PROGRAMS) '$(DESTDIR_SQ)$(gitwebdir_SQ)'
Expand All @@ -188,10 +194,8 @@ install: all

### Cleaning rules

.PHONY: clean
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

0 comments on commit 7decdb9

Please sign in to comment.