Browse Source

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 7b76d6bf22 (Makefile: add and use the ".DELETE_ON_ERROR"
flag, 2021-06-29) and db10fc6c09 (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 <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Ævar Arnfjörð Bjarmason 3 years ago committed by Junio C Hamano
parent
commit
8df786d298
  1. 6
      Documentation/Makefile
  2. 13
      Makefile
  3. 3
      contrib/scalar/Makefile
  4. 3
      contrib/scalar/t/Makefile
  5. 9
      shared.mak
  6. 3
      t/Makefile
  7. 3
      t/interop/Makefile
  8. 3
      t/perf/Makefile
  9. 3
      templates/Makefile

6
Documentation/Makefile

@ -1,3 +1,6 @@ @@ -1,3 +1,6 @@
# Import tree-wide shared Makefile behavior and libraries
include ../shared.mak

# Guard against environment variables
MAN1_TXT =
MAN5_TXT =
@ -524,7 +527,4 @@ doc-l10n install-l10n:: @@ -524,7 +527,4 @@ doc-l10n install-l10n::
$(MAKE) -C po $@
endif

# Delete the target file on error
.DELETE_ON_ERROR:

.PHONY: FORCE

13
Makefile

@ -1,6 +1,9 @@ @@ -1,6 +1,9 @@
# The default target of this Makefile is...
all::

# Import tree-wide shared Makefile behavior and libraries
include shared.mak

# Define V=1 to have a more verbose compile.
#
# 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 @@ -2194,16 +2197,6 @@ shell_compatibility_test: please_set_SHELL_PATH_to_a_more_modern_shell
strip: $(PROGRAMS) git$X
$(STRIP) $(STRIP_OPTS) $^

### Flags affecting all rules

# A GNU make extension since gmake 3.72 (released in late 1994) to
# remove the target of rules if commands in those rules fail. The
# default is to only do that if make itself receives a signal. Affects
# all targets, see:
#
# info make --index-search=.DELETE_ON_ERROR
.DELETE_ON_ERROR:

### Target-specific flags and dependencies

# The generic compilation pattern rule and automatically

3
contrib/scalar/Makefile

@ -1,6 +1,9 @@ @@ -1,6 +1,9 @@
# The default target of this Makefile is...
all::

# Import tree-wide shared Makefile behavior and libraries
include ../../shared.mak

include ../../config.mak.uname
-include ../../config.mak.autogen
-include ../../config.mak

3
contrib/scalar/t/Makefile

@ -1,3 +1,6 @@ @@ -1,3 +1,6 @@
# Import tree-wide shared Makefile behavior and libraries
include ../../../shared.mak

# Run scalar tests
#
# Copyright (c) 2005,2021 Junio C Hamano, Johannes Schindelin

9
shared.mak

@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
### Flags affecting all rules

# A GNU make extension since gmake 3.72 (released in late 1994) to
# remove the target of rules if commands in those rules fail. The
# default is to only do that if make itself receives a signal. Affects
# all targets, see:
#
# info make --index-search=.DELETE_ON_ERROR
.DELETE_ON_ERROR:

3
t/Makefile

@ -1,3 +1,6 @@ @@ -1,3 +1,6 @@
# Import tree-wide shared Makefile behavior and libraries
include ../shared.mak

# Run tests
#
# Copyright (c) 2005 Junio C Hamano

3
t/interop/Makefile

@ -1,3 +1,6 @@ @@ -1,3 +1,6 @@
# Import tree-wide shared Makefile behavior and libraries
include ../../shared.mak

-include ../../config.mak
export GIT_TEST_OPTIONS


3
t/perf/Makefile

@ -1,3 +1,6 @@ @@ -1,3 +1,6 @@
# Import tree-wide shared Makefile behavior and libraries
include ../../shared.mak

-include ../../config.mak
export GIT_TEST_OPTIONS


3
templates/Makefile

@ -1,3 +1,6 @@ @@ -1,3 +1,6 @@
# Import tree-wide shared Makefile behavior and libraries
include ../shared.mak

# make and install sample templates

ifndef V

Loading…
Cancel
Save