From bd1447ab76e7c256f67b203d74b2359d472bc69e Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Fri, 30 Jun 2023 11:31:17 +0200 Subject: Makefile: move the prelude to prelude.mk --- .dockerignore | 1 + Makefile | 22 +--------------------- prelude.mk | 23 +++++++++++++++++++++++ 3 files changed, 25 insertions(+), 21 deletions(-) create mode 100644 prelude.mk diff --git a/.dockerignore b/.dockerignore index f6edc94..73a357c 100644 --- a/.dockerignore +++ b/.dockerignore @@ -5,6 +5,7 @@ !/CMakeLists.txt !/LICENSE.txt !/Makefile +!/prelude.mk !/README.md !/client/** !/cmake/** diff --git a/Makefile b/Makefile index 07d7662..d933134 100644 --- a/Makefile +++ b/Makefile @@ -1,24 +1,4 @@ -MAKEFLAGS += --no-builtin-rules --no-builtin-variables --warn-undefined-variables -unexport MAKEFLAGS -.DEFAULT_GOAL := all -.DELETE_ON_ERROR: -.SUFFIXES: -SHELL := bash -.SHELLFLAGS := -eu -o pipefail -c - -escape = $(subst ','\'',$(1)) - -define noexpand -ifeq ($$(origin $(1)),environment) - $(1) := $$(value $(1)) -endif -ifeq ($$(origin $(1)),environment override) - $(1) := $$(value $(1)) -endif -ifeq ($$(origin $(1)),command line) - override $(1) := $$(value $(1)) -endif -endef +include prelude.mk .PHONY: DO DO: diff --git a/prelude.mk b/prelude.mk new file mode 100644 index 0000000..374111e --- /dev/null +++ b/prelude.mk @@ -0,0 +1,23 @@ +# Please see https://egort.name/blog/notes/makefile.html + +MAKEFLAGS += --no-builtin-rules --no-builtin-variables --warn-undefined-variables +unexport MAKEFLAGS +.DEFAULT_GOAL := all +.DELETE_ON_ERROR: +.SUFFIXES: +SHELL := bash +.SHELLFLAGS := -eu -o pipefail -c + +escape = $(subst ','\'',$(1)) + +define noexpand +ifeq ($$(origin $(1)),environment) + $(1) := $$(value $(1)) +endif +ifeq ($$(origin $(1)),environment override) + $(1) := $$(value $(1)) +endif +ifeq ($$(origin $(1)),command line) + override $(1) := $$(value $(1)) +endif +endef -- cgit v1.2.3