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

Makefile: set default goals in makefiles

Browse Source 
Explicitly set the default goal at the very top of various makefiles.
This is already present in some makefiles, but not all of them.

In particular, this corrects a regression introduced in a38edab7c8
(Makefile: generate doc versions via GIT-VERSION-GEN, 2024-12-06).  That
commit added some config files as build targets for the Documentation
directory, and put the target configuration in a sensible place.
Unfortunately, that sensible place was above any other build target
definitions, meaning the default goal changed to being those
configuration files only, rather than the HTML and man page
documentation.

Signed-off-by: Adam Dinwoodie <adam@dinwoodie.org>
Helped-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Adam Dinwoodie
2025-02-15 21:19:03 +00:00
committed by Junio C Hamano
parent 063bcebf0c
commit 5309c1e9fb
15 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/Makefile
View File

@ -1,3 +1,6 @@
# The default target of this Makefile is...
all::
# Import tree-wide shared Makefile behavior and libraries # Import tree-wide shared Makefile behavior and libraries
include ../shared.mak include ../shared.mak
@ -236,7 +239,7 @@ DEFAULT_EDITOR_SQ = $(subst ','\'',$(DEFAULT_EDITOR))
ASCIIDOC_EXTRA += -a 'git-default-editor=$(DEFAULT_EDITOR_SQ)' ASCIIDOC_EXTRA += -a 'git-default-editor=$(DEFAULT_EDITOR_SQ)'
endif endif
all: html man all:: html man
html: $(DOC_HTML) html: $(DOC_HTML)

3
contrib/credential/libsecret/Makefile
View File

@ -1,3 +1,6 @@
# The default target of this Makefile is...
all::
MAIN:=git-credential-libsecret MAIN:=git-credential-libsecret
all:: $(MAIN) all:: $(MAIN)

1
contrib/credential/osxkeychain/Makefile
View File

@ -1,3 +1,4 @@
# The default target of this Makefile is...
all:: git-credential-osxkeychain all:: git-credential-osxkeychain
CC = gcc CC = gcc

3
contrib/credential/wincred/Makefile
View File

@ -1,4 +1,5 @@
all: git-credential-wincred.exe # The default target of this Makefile is...
all:: git-credential-wincred.exe
-include ../../../config.mak.autogen -include ../../../config.mak.autogen
-include ../../../config.mak -include ../../../config.mak

3
contrib/diff-highlight/Makefile
View File

@ -1,4 +1,5 @@
all: diff-highlight # The default target of this Makefile is...
all:: diff-highlight
PERL_PATH = /usr/bin/perl PERL_PATH = /usr/bin/perl
-include ../../config.mak -include ../../config.mak

5
contrib/diff-highlight/t/Makefile
View File

@ -1,3 +1,6 @@
# The default target of this Makefile is...
all::
-include ../../../config.mak.autogen -include ../../../config.mak.autogen
-include ../../../config.mak -include ../../../config.mak
@ -6,7 +9,7 @@ SHELL_PATH ?= $(SHELL)
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh) T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
all: test all:: test
test: $(T) test: $(T)
.PHONY: help clean all test $(T) .PHONY: help clean all test $(T)

5
contrib/mw-to-git/Makefile
View File

@ -12,6 +12,9 @@
# #
# make install # make install
# The default target of this Makefile is...
all::
GIT_MEDIAWIKI_PM=Git/Mediawiki.pm GIT_MEDIAWIKI_PM=Git/Mediawiki.pm
SCRIPT_PERL=git-remote-mediawiki.perl SCRIPT_PERL=git-remote-mediawiki.perl
SCRIPT_PERL+=git-mw.perl SCRIPT_PERL+=git-mw.perl
@ -27,7 +30,7 @@ INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/ \
DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR)) INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR))
all: build all:: build
test: all test: all
$(MAKE) -C t $(MAKE) -C t

3
contrib/mw-to-git/t/Makefile
View File

@ -8,7 +8,8 @@
# #
## Test git-remote-mediawiki ## Test git-remote-mediawiki
all: test # The default target of this Makefile is...
all:: test
-include ../../../config.mak.autogen -include ../../../config.mak.autogen
-include ../../../config.mak -include ../../../config.mak

5
contrib/persistent-https/Makefile
View File

@ -12,10 +12,13 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# The default target of this Makefile is...
all::
BUILD_LABEL=$(shell cut -d" " -f3 ../../GIT-VERSION-FILE) BUILD_LABEL=$(shell cut -d" " -f3 ../../GIT-VERSION-FILE)
TAR_OUT=$(shell go env GOOS)_$(shell go env GOARCH).tar.gz TAR_OUT=$(shell go env GOOS)_$(shell go env GOARCH).tar.gz
all: git-remote-persistent-https git-remote-persistent-https--proxy \ all:: git-remote-persistent-https git-remote-persistent-https--proxy \
git-remote-persistent-http git-remote-persistent-http
git-remote-persistent-https--proxy: git-remote-persistent-https git-remote-persistent-https--proxy: git-remote-persistent-https

5
contrib/subtree/t/Makefile
View File

@ -3,6 +3,9 @@
# Copyright (c) 2005 Junio C Hamano # Copyright (c) 2005 Junio C Hamano
# #
# The default target of this Makefile is...
all::
-include ../../../config.mak.autogen -include ../../../config.mak.autogen
-include ../../../config.mak -include ../../../config.mak
@ -31,7 +34,7 @@ TSVN = $(sort $(wildcard t91[0-9][0-9]-*.sh))
TGITWEB = $(sort $(wildcard t95[0-9][0-9]-*.sh)) TGITWEB = $(sort $(wildcard t95[0-9][0-9]-*.sh))
THELPERS = $(sort $(filter-out $(T),$(wildcard *.sh))) THELPERS = $(sort $(filter-out $(T),$(wildcard *.sh)))
all: $(DEFAULT_TEST_TARGET) all:: $(DEFAULT_TEST_TARGET)
test: pre-clean $(TEST_LINT) test: pre-clean $(TEST_LINT)
$(MAKE) aggregate-results-and-cleanup $(MAKE) aggregate-results-and-cleanup

1
git-gui/Makefile
View File

@ -1,3 +1,4 @@
# The default target of this Makefile is...
all:: all::
# Define V=1 to have a more verbose compile. # Define V=1 to have a more verbose compile.

3
git-gui/po/glossary/Makefile
View File

@ -1,3 +1,6 @@
# The default target of this Makefile is...
update-po::
PO_TEMPLATE = git-gui-glossary.pot PO_TEMPLATE = git-gui-glossary.pot
ALL_POFILES = $(wildcard *.po) ALL_POFILES = $(wildcard *.po)

5
t/interop/Makefile
View File

@ -1,3 +1,6 @@
# The default target of this Makefile is...
all::
# Import tree-wide shared Makefile behavior and libraries # Import tree-wide shared Makefile behavior and libraries
include ../../shared.mak include ../../shared.mak
@ -8,7 +11,7 @@ SHELL_PATH ?= $(SHELL)
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
T = $(sort $(wildcard i[0-9][0-9][0-9][0-9]-*.sh)) T = $(sort $(wildcard i[0-9][0-9][0-9][0-9]-*.sh))
all: $(T) all:: $(T)
$(T): $(T):
@echo "*** $@ ***"; '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS) @echo "*** $@ ***"; '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)

5
t/perf/Makefile
View File

@ -1,10 +1,13 @@
# The default target of this Makefile is...
all::
# Import tree-wide shared Makefile behavior and libraries # Import tree-wide shared Makefile behavior and libraries
include ../../shared.mak include ../../shared.mak
-include ../../config.mak -include ../../config.mak
export GIT_TEST_OPTIONS export GIT_TEST_OPTIONS
all: test-lint perf all:: test-lint perf
perf: pre-clean perf: pre-clean
./run ./run

5
templates/Makefile
View File

@ -1,3 +1,6 @@
# The default target of this Makefile is...
all::
# Import tree-wide shared Makefile behavior and libraries # Import tree-wide shared Makefile behavior and libraries
include ../shared.mak include ../shared.mak
@ -23,7 +26,7 @@ PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
template_instdir_SQ = $(subst ','\'',$(template_instdir)) template_instdir_SQ = $(subst ','\'',$(template_instdir))
all: boilerplates.made custom all:: boilerplates.made custom
# Put templates that can be copied straight from the source # Put templates that can be copied straight from the source
# in a file direc--tory--file in the source. They will be # in a file direc--tory--file in the source. They will be