*.mk: Escape newlines instead of using +=

It's more robust to only spell the variable name once.  We've fixed typos
related to that in the past, and in this patch we're fixing another one:

	DEFAULT_CPPCHECKFLAgS += --inconclusive

Even if we could merge some of those lines into one (because they're
short), I prefer to keep one line per option.  Semantic newlines, aren't
they?  :)

Signed-off-by: Alejandro Colomar <alx@kernel.org>

6 files changed, 55 insertions, 44 deletions

diff --git a/share/mk/build/catman.mk b/share/mk/build/catman.mk
index 5686ae12a..7b8766e7b 100644
--- a/share/mk/build/catman.mk
+++ b/share/mk/build/catman.mk
@@ -24,10 +24,11 @@ NROFF_OUT_DEVICE     := $(shell $(LOCALE) charmap \
                                     && $(ECHO) utf8 \
                                     || $(ECHO) ascii)
 
-DEFAULT_NROFFFLAGS := -T$(NROFF_OUT_DEVICE)
-DEFAULT_NROFFFLAGS += -rLL=$(NROFF_LINE_LENGTH)n
-DEFAULT_NROFFFLAGS += -rCHECKSTYLE=$(TROFF_CHECKSTYLE_LVL)
-DEFAULT_NROFFFLAGS += -ww
+DEFAULT_NROFFFLAGS := \
+	-T$(NROFF_OUT_DEVICE) \
+	-rLL=$(NROFF_LINE_LENGTH)n \
+	-rCHECKSTYLE=$(TROFF_CHECKSTYLE_LVL) \
+	-ww
 EXTRA_NROFFFLAGS   :=
 NROFFFLAGS         := $(DEFAULT_NROFFFLAGS) $(EXTRA_NROFFFLAGS)
 
diff --git a/share/mk/build/groff.mk b/share/mk/build/groff.mk
index b619aab82..2a5a3de13 100644
--- a/share/mk/build/groff.mk
+++ b/share/mk/build/groff.mk
@@ -23,13 +23,15 @@ EXTRA_TROFFFLAGS     :=
 TROFFFLAGS           := $(DEFAULT_TROFFFLAGS) $(EXTRA_TROFFFLAGS)
 TROFF                := troff
 
-DEFAULT_TROFFFLAGS_MAN := $(TROFFFLAGS)
-DEFAULT_TROFFFLAGS_MAN += -man
+DEFAULT_TROFFFLAGS_MAN := \
+	$(TROFFFLAGS) \
+	-man
 EXTRA_TROFFFLAGS_MAN   :=
 TROFFFLAGS_MAN         := $(DEFAULT_TROFFFLAGS_MAN) $(EXTRA_TROFFFLAGS_MAN)
 
-DEFAULT_TROFFFLAGS_MDOC := $(TROFFFLAGS)
-DEFAULT_TROFFFLAGS_MDOC += -mdoc
+DEFAULT_TROFFFLAGS_MDOC := \
+	$(TROFFFLAGS) \
+	-mdoc
 EXTRA_TROFFFLAGS_MDOC   :=
 TROFFFLAGS_MDOC         := $(DEFAULT_TROFFFLAGS_MDOC) $(EXTRA_TROFFFLAGS_MDOC)
 
diff --git a/share/mk/build/src.mk b/share/mk/build/src.mk
index 86d024e2f..5db5a3792 100644
--- a/share/mk/build/src.mk
+++ b/share/mk/build/src.mk
@@ -21,31 +21,34 @@ DEFAULT_CPPFLAGS := $(shell $(PKGCONF) --cflags $(PKGCONF_LIBS) $(HIDE_ERR))
 EXTRA_CPPFLAGS   :=
 CPPFLAGS         := $(DEFAULT_CPPFLAGS) $(EXTRA_CPPFLAGS)
 
-DEFAULT_CFLAGS := -std=gnu17
-DEFAULT_CFLAGS += -Wall
-DEFAULT_CFLAGS += -Wextra
-DEFAULT_CFLAGS += -Wstrict-prototypes
-DEFAULT_CFLAGS += -Wdeclaration-after-statement
-DEFAULT_CFLAGS += -Werror
-DEFAULT_CFLAGS += -Wno-error=unused-parameter
-DEFAULT_CFLAGS += -Wno-error=sign-compare
-DEFAULT_CFLAGS += -Wno-error=format
-DEFAULT_CFLAGS += -Wno-error=uninitialized
-#DEFAULT_CFLAGS += -Wno-error=declaration-after-statement
+DEFAULT_CFLAGS := \
+	-std=gnu17 \
+	-Wall \
+	-Wextra \
+	-Wstrict-prototypes \
+	-Wdeclaration-after-statement \
+	-Werror \
+	-Wno-error=unused-parameter \
+	-Wno-error=sign-compare \
+	-Wno-error=format \
+	-Wno-error=uninitialized
+	#-Wno-error=declaration-after-statement
 EXTRA_CFLAGS   :=
 CFLAGS         := $(DEFAULT_CFLAGS) $(EXTRA_CFLAGS)
 
-DEFAULT_LDFLAGS := -Wl,--as-needed
-DEFAULT_LDFLAGS += -Wl,--no-allow-shlib-undefined
-DEFAULT_LDFLAGS += -Wl,--no-copy-dt-needed-entries
-DEFAULT_LDFLAGS += -Wl,--no-undefined
-DEFAULT_LDFLAGS += $(shell $(PKGCONF) --libs-only-L $(PKGCONF_LIBS) $(HIDE_ERR))
-DEFAULT_LDFLAGS += $(shell $(PKGCONF) --libs-only-other $(PKGCONF_LIBS) $(HIDE_ERR))
+DEFAULT_LDFLAGS := \
+	-Wl,--as-needed \
+	-Wl,--no-allow-shlib-undefined \
+	-Wl,--no-copy-dt-needed-entries \
+	-Wl,--no-undefined \
+	$(shell $(PKGCONF) --libs-only-L $(PKGCONF_LIBS) $(HIDE_ERR)) \
+	$(shell $(PKGCONF) --libs-only-other $(PKGCONF_LIBS) $(HIDE_ERR))
 EXTRA_LDFLAGS   :=
 LDFLAGS         := $(DEFAULT_LDFLAGS) $(EXTRA_LDFLAGS)
 
-DEFAULT_LDLIBS := -lc
-DEFAULT_LDLIBS += $(shell $(PKGCONF) --libs-only-l $(PKGCONF_LIBS) $(HIDE_ERR))
+DEFAULT_LDLIBS := \
+	-lc \
+	$(shell $(PKGCONF) --libs-only-l $(PKGCONF_LIBS) $(HIDE_ERR))
 EXTRA_LDLIBS   :=
 LDLIBS         := $(DEFAULT_LDLIBS) $(EXTRA_LDLIBS)
 
diff --git a/share/mk/check/catman.mk b/share/mk/check/catman.mk
index 8268e85d3..8a0d3b6db 100644
--- a/share/mk/check/catman.mk
+++ b/share/mk/check/catman.mk
@@ -15,9 +15,10 @@ include $(MAKEFILEDIR)/check/_.mk
 include $(MAKEFILEDIR)/src.mk
 
 
-DEFAULT_COLFLAGS := -b
-DEFAULT_COLFLAGS += -p
-DEFAULT_COLFLAGS += -x
+DEFAULT_COLFLAGS := \
+	-b \
+	-p \
+	-x
 EXTRA_COLFLAGS   :=
 COLFLAGS         := $(DEFAULT_COLFLAGS) $(EXTRA_COLFLAGS)
 COL              := col
diff --git a/share/mk/dist.mk b/share/mk/dist.mk
index 90e2870e5..b18197dd7 100644
--- a/share/mk/dist.mk
+++ b/share/mk/dist.mk
@@ -19,10 +19,11 @@ include $(MAKEFILEDIR)/verbose.mk
 _DISTDIR := $(builddir)/dist
 
 
-DEFAULT_TARFLAGS := --sort=name
-DEFAULT_TARFLAGS += --owner=root:0
-DEFAULT_TARFLAGS += --group=root:0
-DEFAULT_TARFLAGS += --mtime='$(DISTDATE)'
+DEFAULT_TARFLAGS := \
+	--sort=name \
+	--owner=root:0 \
+	--group=root:0 \
+	--mtime='$(DISTDATE)'
 EXTRA_TARFLAGS   :=
 TARFLAGS         := $(DEFAULT_TARFLAGS) $(EXTRA_TARFLAGS)
 
diff --git a/share/mk/lint/c.mk b/share/mk/lint/c.mk
index 94cee5f9b..b7d80a9ba 100644
--- a/share/mk/lint/c.mk
+++ b/share/mk/lint/c.mk
@@ -19,19 +19,21 @@ CHECKPATCHFLAGS         := $(DEFAULT_CHECKPATCHFLAGS) $(EXTRA_CHECKPATCHFLAGS)
 CHECKPATCH              := checkpatch
 
 clang-tidy_config       := $(SYSCONFDIR)/clang-tidy/config.yaml
-DEFAULT_CLANG-TIDYFLAGS := --config-file=$(clang-tidy_config)
-DEFAULT_CLANG-TIDYFLAGS += --quiet
-DEFAULT_CLANG-TIDYFLAGS += --use-color
+DEFAULT_CLANG-TIDYFLAGS := \
+	--config-file=$(clang-tidy_config) \
+	--quiet \
+	--use-color
 EXTRA_CLANG-TIDYFLAGS   :=
 CLANG-TIDYFLAGS         := $(DEFAULT_CLANG-TIDYFLAGS) $(EXTRA_CLANG-TIDYFLAGS)
 CLANG-TIDY              := clang-tidy
 
 CPPCHECK_SUPPRESS     := $(SYSCONFDIR)/cppcheck/cppcheck.suppress
-DEFAULT_CPPCHECKFLAGS := --enable=all
-DEFAULT_CPPCHECKFLAGS += --error-exitcode=2
-DEFAULT_CPPCHECKFLAgS += --inconclusive
-DEFAULT_CPPCHECKFLAGS += --quiet
-DEFAULT_CPPCHECKFLAGS += --suppressions-list=$(CPPCHECK_SUPPRESS)
+DEFAULT_CPPCHECKFLAGS := \
+	--enable=all \
+	--error-exitcode=2 \
+	--inconclusive \
+	--quiet \
+	--suppressions-list=$(CPPCHECK_SUPPRESS)
 EXTRA_CPPCHECKFLAGS   :=
 CPPCHECKFLAGS         := $(DEFAULT_CPPCHECKFLAGS) $(EXTRA_CPPCHECKFLAGS)
 CPPCHECK              := cppcheck
@@ -41,8 +43,9 @@ EXTRA_CPPLINTFLAGS   :=
 CPPLINTFLAGS         := $(DEFAULT_CPPLINTFLAGS) $(EXTRA_CPPLINTFLAGS)
 CPPLINT              := cpplint
 
-DEFAULT_IWYUFLAGS := -Xiwyu --no_fwd_decls
-DEFAULT_IWYUFLAGS += -Xiwyu --error
+DEFAULT_IWYUFLAGS := \
+	-Xiwyu --no_fwd_decls \
+	-Xiwyu --error
 EXTRA_IWYUFLAGS   :=
 IWYUFLAGS         := $(DEFAULT_IWYUFLAGS) $(EXTRA_IWYUFLAGS)
 IWYU              := iwyu