Skip to content

Commit 8df786d

Browse files
avargitster
avar
authored and
gitster
committed
Makefiles: add "shared.mak", move ".DELETE_ON_ERROR" to it
We have various behavior that's shared across our Makefiles, or that really should be (e.g. via defined templates). Let's create a top-level "shared.mak" to house those sorts of things, and start by adding the ".DELETE_ON_ERROR" flag to it. See my own 7b76d6b (Makefile: add and use the ".DELETE_ON_ERROR" flag, 2021-06-29) and db10fc6 (doc: simplify Makefile using .DELETE_ON_ERROR, 2021-05-21) for the addition and use of the ".DELETE_ON_ERROR" flag. I.e. this changes the behavior of existing rules in the altered Makefiles (except "Makefile" & "Documentation/Makefile"). I'm confident that this is safe having read the relevant rules in those Makfiles, and as the GNU make manual notes that it isn't the default behavior is out of an abundance of backwards compatibility caution. From edition 0.75 of its manual, covering GNU make 4.3: [Enabling '.DELETE_ON_ERROR' is] almost always what you want 'make' to do, but it is not historical practice; so for compatibility, you must explicitly request it. This doesn't introduce a bug by e.g. having this ".DELETE_ON_ERROR" flag only apply to this new shared.mak, Makefiles have no such scoping semantics. It does increase the danger that any Makefile without an explicit "The default target of this Makefile is..." snippet to define the default target as "all" could have its default rule changed if our new shared.mak ever defines a "real" rule. In subsequent commits we'll be careful not to do that, and such breakage would be obvious e.g. in the case of "make -C t". We might want to make that less fragile still (e.g. by using ".DEFAULT_GOAL" as noted in the preceding commit), but for now let's simply include "shared.mak" without adding that boilerplate to all the Makefiles that don't have it already. Most of those are already exposed to that potential caveat e.g. due to including "config.mak*". Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a36b575 commit 8df786d

File tree

9 files changed

+33
-13
lines changed

9 files changed

+33
-13
lines changed

‎Documentation/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Import tree-wide shared Makefile behavior and libraries
2+
include ../shared.mak
3+
14
# Guard against environment variables
25
MAN1_TXT =
36
MAN5_TXT =
@@ -524,7 +527,4 @@ doc-l10n install-l10n::
524527
$(MAKE) -C po $@
525528
endif
526529

527-
# Delete the target file on error
528-
.DELETE_ON_ERROR:
529-
530530
.PHONY: FORCE

‎Makefile

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# The default target of this Makefile is...
22
all::
33

4+
# Import tree-wide shared Makefile behavior and libraries
5+
include shared.mak
6+
47
# Define V=1 to have a more verbose compile.
58
#
69
# Define SHELL_PATH to a POSIX shell if your /bin/sh is broken.
@@ -2194,16 +2197,6 @@ shell_compatibility_test: please_set_SHELL_PATH_to_a_more_modern_shell
21942197
strip: $(PROGRAMS) git$X
21952198
$(STRIP) $(STRIP_OPTS) $^
21962199

2197-
### Flags affecting all rules
2198-
2199-
# A GNU make extension since gmake 3.72 (released in late 1994) to
2200-
# remove the target of rules if commands in those rules fail. The
2201-
# default is to only do that if make itself receives a signal. Affects
2202-
# all targets, see:
2203-
#
2204-
# info make --index-search=.DELETE_ON_ERROR
2205-
.DELETE_ON_ERROR:
2206-
22072200
### Target-specific flags and dependencies
22082201

22092202
# The generic compilation pattern rule and automatically

‎contrib/scalar/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# The default target of this Makefile is...
22
all::
33

4+
# Import tree-wide shared Makefile behavior and libraries
5+
include ../../shared.mak
6+
47
include ../../config.mak.uname
58
-include ../../config.mak.autogen
69
-include ../../config.mak

‎contrib/scalar/t/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Import tree-wide shared Makefile behavior and libraries
2+
include ../../../shared.mak
3+
14
# Run scalar tests
25
#
36
# Copyright (c) 2005,2021 Junio C Hamano, Johannes Schindelin

‎shared.mak

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
### Flags affecting all rules
2+
3+
# A GNU make extension since gmake 3.72 (released in late 1994) to
4+
# remove the target of rules if commands in those rules fail. The
5+
# default is to only do that if make itself receives a signal. Affects
6+
# all targets, see:
7+
#
8+
# info make --index-search=.DELETE_ON_ERROR
9+
.DELETE_ON_ERROR:

‎t/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Import tree-wide shared Makefile behavior and libraries
2+
include ../shared.mak
3+
14
# Run tests
25
#
36
# Copyright (c) 2005 Junio C Hamano

‎t/interop/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Import tree-wide shared Makefile behavior and libraries
2+
include ../../shared.mak
3+
14
-include ../../config.mak
25
export GIT_TEST_OPTIONS
36

‎t/perf/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Import tree-wide shared Makefile behavior and libraries
2+
include ../../shared.mak
3+
14
-include ../../config.mak
25
export GIT_TEST_OPTIONS
36

‎templates/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Import tree-wide shared Makefile behavior and libraries
2+
include ../shared.mak
3+
14
# make and install sample templates
25

36
ifndef V

0 commit comments

Comments
 (0)