diff --git a/make/defs-dev.mk b/make/defs-dev.mk
index e7d7edf5..216e973d 100644
--- a/make/defs-dev.mk
+++ b/make/defs-dev.mk
@@ -282,7 +282,7 @@ LOG_THREAD_NAMES            ?= true
 COMPILE_DEBUG_CODE          ?= true
 #COMPILE_DEBUG_LOG          ?= true
 USE_COMPILER_DEBUG_OPTS     ?= true
-#USE_COMPILER_OPTIMIZATION_OPTS?= true
+#USE_COMPILER_OPTIMIZATION_OPTS ?= true
 USE_DISABLE_COMPILER_OPTIMISATION_OPTS ?= true
 ifeq ($(TARGET),mingw)
 USE_STACK_PROTECTOR         ?= false
diff --git a/make/defs-dist.mk b/make/defs-dist.mk
index 16a0c58b..0f1f8d3d 100644
--- a/make/defs-dist.mk
+++ b/make/defs-dist.mk
@@ -282,7 +282,7 @@ LOG_THREAD_NAMES            ?= true
 #COMPILE_DEBUG_CODE         ?= true
 #COMPILE_DEBUG_LOG          ?= true
 USE_COMPILER_DEBUG_OPTS     ?= true
-USE_COMPILER_OPTIMIZATION_OPTS?= true
+USE_COMPILER_OPTIMIZATION_OPTS ?= true
 USE_DISABLE_COMPILER_OPTIMISATION_OPTS ?= false
 USE_STACK_PROTECTOR         ?= true
 #USE_STACK_CHECKER          ?= true
diff --git a/make/mcu-defs.mk b/make/mcu-defs.mk
index f32c972d..880b5109 100644
--- a/make/mcu-defs.mk
+++ b/make/mcu-defs.mk
@@ -12,11 +12,11 @@ ifneq ($(MAKECMDGOALS),clean)
   ifeq ($(MCU_BOARD_MODEL),)
     $(error MCU_BOARD_MODEL not specified)
   endif
-  
+
   ifeq ($(MCU_FLASH_OFFSET),)
     $(error MCU_FLASH_OFFSET not specified)
   endif
-  
+
   ifeq ($(MCU_FLASH_SIZE),)
     $(error MCU_FLASH_SIZE not specified)
   endif
diff --git a/make/projects-dir.mk b/make/projects-dir.mk
index 024522d9..8041a826 100644
--- a/make/projects-dir.mk
+++ b/make/projects-dir.mk
@@ -84,7 +84,7 @@ endif
 
 export GIT_SSH              := $(CVS_RSH)
 ifeq ($(filter pkg-%,$(MAKECMDGOALS)),)
-  export JW_BUILD_SSH_EXTRA_OPTS+= -o StrictHostKeyChecking=no -o ControlMaster=auto -o ControlPath=/tmp/%r@jw-build:%h:%p -o ControlPersist=3m -l $(JANWARE_USER)
+  export JW_BUILD_SSH_EXTRA_OPTS += -o StrictHostKeyChecking=no -o ControlMaster=auto -o ControlPath=/tmp/%r@jw-build:%h:%p -o ControlPersist=3m -l $(JANWARE_USER)
 endif
 
 ifneq ($(CLONE_FROM_USER),)
@@ -94,7 +94,7 @@ else
 endif
 
 ifneq ($(EXCLUDE_FROM_BUILD),)
-  PROJECTS_PY_EXTRA_BUILD_OPTS+= --exclude "$(EXCLUDE_FROM_BUILD)"
+  PROJECTS_PY_EXTRA_BUILD_OPTS += --exclude "$(EXCLUDE_FROM_BUILD)"
 endif
 
 # ------------ external programs II
diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index 39b62777..b0e8445b 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -25,7 +25,7 @@ RELEASES_FILE                = $(TOPDIR)/RELEASES$(FLAVOUR_SUFFIX)
 RELEASES                    ?= $(shell $(PKG_SH_EXE) version \
 	-p $(OS_NAME_VERSION)/$(RPM_ARCH) $(RELEASES_FILE) read | $(SED) 's/-dev//')
 RPMBUILD                    ?= pkgbuild
-CHECK_CVS_SYNC_BEFORE_RPM_RELEASE?= true
+CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true
 HASH                         = $(shell $(cvs_files) -z | \
 	grep -vz "CHANGES\|VERSION\|HASH\|MD5SUMS\|RELEASES" | \
 	xargs -0 md5sum | md5sum | $(SED) 's/ .*//')
diff --git a/make/targets-tools.mk b/make/targets-tools.mk
index dc759ca3..61c19435 100644
--- a/make/targets-tools.mk
+++ b/make/targets-tools.mk
@@ -4,7 +4,7 @@
 # $Id$
 
 ifndef TARGETS_TOOLS_MK_INCLUDED
-TARGETS_TOOLS_MK_INCLUDED = true
+TARGETS_TOOLS_MK_INCLUDED    = true
 
 include $(MODDIR)/make/rules.mk
 
@@ -52,34 +52,34 @@ clean.link:
 		rmdir -p $(dir $(HDRDIR_SCOPE_SUFFIX)) 2>/dev/null || : ;\
 	fi
 
-CLANG_TIDY_H_C_CPP  := $(shell $(ECHO) $(LOCAL_H) | xargs -r $(GREP) -l 'extern  *"C"')
-CLANG_TIDY_H_C      := $(wildcard [a-z]*.h)
-CLANG_TIDY_H_CPP    := $(wildcard [A-Z]*.h)
-#CLANG_TIDY_H_CPP    := $(filter-out $(CLANG_TIDY_H_C),$(LOCAL_H))
+CLANG_TIDY_H_C_CPP          := $(shell $(ECHO) $(LOCAL_H) | xargs -r $(GREP) -l 'extern  *"C"')
+CLANG_TIDY_H_C              := $(wildcard [a-z]*.h)
+CLANG_TIDY_H_CPP            := $(wildcard [A-Z]*.h)
+#CLANG_TIDY_H_CPP           := $(filter-out $(CLANG_TIDY_H_C),$(LOCAL_H))
 
 # false positives on assert(), see https://reviews.llvm.org/D31130
-CLANG_TIDY_EXTRA_ARGS += -cppcoreguidelines-pro-bounds-array-to-pointer-decay
+CLANG_TIDY_EXTRA_ARGS       += -cppcoreguidelines-pro-bounds-array-to-pointer-decay
 
 # keep va_args
-CLANG_TIDY_EXTRA_ARGS += -cppcoreguidelines-pro-type-vararg
+CLANG_TIDY_EXTRA_ARGS       += -cppcoreguidelines-pro-type-vararg
 
 # keep pointer arithmetic
-CLANG_TIDY_EXTRA_ARGS += -cppcoreguidelines-pro-bounds-pointer-arithmetic
+CLANG_TIDY_EXTRA_ARGS       += -cppcoreguidelines-pro-bounds-pointer-arithmetic
 
 # don't have GSL (for now)
-CLANG_TIDY_EXTRA_ARGS += -cppcoreguidelines-pro-bounds-constant-array-index
+CLANG_TIDY_EXTRA_ARGS       += -cppcoreguidelines-pro-bounds-constant-array-index
 
-CLANG_TIDY_FILTER = $(SED) 's%\[\([a-z-]\+\)\]$$%[https://clang.llvm.org/extra/clang-tidy/checks/\1.html]%'
-comma := ,
-empty :=
-space := $(empty) $(empty)
-CLANG_TIDY_CHECKS ?= -$(subst  $(space),,*,clang-analyzer-*,-clang-analyzer-cplusplus*,modernize-*,portability-*,cppcoreguidelines-*$(addprefix $(comma),$(CLANG_TIDY_EXTRA_ARGS)))
-CLANG_TIDY ?= clang-tidy -checks=$(CLANG_TIDY_CHECKS)
+CLANG_TIDY_FILTER            = $(SED) 's%\[\([a-z-]\+\)\]$$%[https://clang.llvm.org/extra/clang-tidy/checks/\1.html]%'
+comma                       := ,
+empty                       :=
+space                       := $(empty) $(empty)
+CLANG_TIDY_CHECKS           ?= -$(subst  $(space),,*,clang-analyzer-*,-clang-analyzer-cplusplus*,modernize-*,portability-*,cppcoreguidelines-*$(addprefix $(comma),$(CLANG_TIDY_EXTRA_ARGS)))
+CLANG_TIDY                  ?= clang-tidy -checks=$(CLANG_TIDY_CHECKS)
 
 clean: clang-tidy-clean
 clang-tidy-clean:
 	rm -f clang-tidy-cache*.tmp
-CLANG_TIDY_CACHE_CPP = clang-tidy-cache-cpp.tmp
+CLANG_TIDY_CACHE_CPP         = clang-tidy-cache-cpp.tmp
 $(CLANG_TIDY_CACHE_CPP): $(LOCAL_CPP)
 	$(CLANG_TIDY) $(LOCAL_CPP) -- $(INCLUDE) -x c++ | $(CLANG_TIDY_FILTER) | tee $@