From ed17aaa6c99edc59ee6a9dfe6d32b5372d4b2709 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 16 Mar 2026 13:18:28 +0100 Subject: [PATCH] make: Align equal signs in *.mk to column 30 Chore: Format equal signs uniformly. They should all be at column 30 but aren't. Fix that. Signed-off-by: Jan Lindemann --- make/conf.mk | 2 +- make/defs.mk | 4 ++-- make/git-cvs-bridge.mk | 4 ++-- make/include.mk | 2 +- make/lib.mk | 6 +++--- make/list-files.mk | 2 +- make/projects-dir-minimal.mk | 4 ++-- make/projects-dir.mk | 4 ++-- make/py-run.mk | 4 ++-- make/rules.mk | 2 +- make/scripts-targets.mk | 2 +- make/std-tools.mk | 2 +- make/swig.mk | 2 +- make/tag-defs.mk | 2 +- make/test-exe.mk | 2 +- make/tools.mk | 4 ++-- make/vim.mk | 2 +- 17 files changed, 25 insertions(+), 25 deletions(-) diff --git a/make/conf.mk b/make/conf.mk index 6e219a72..e5158821 100644 --- a/make/conf.mk +++ b/make/conf.mk @@ -16,7 +16,7 @@ $(INSTALLED_CFG): $(INSTALL_CFGDIR) endif ifneq ($(CONF_D),) -INSTALLED_CONF_D = $(addprefix $(INSTALL_CFGDIR)/,$(CONF_D)) +INSTALLED_CONF_D = $(addprefix $(INSTALL_CFGDIR)/,$(CONF_D)) $(INSTALL_CFGDIR)/$(CONF_D): $(INSTALL) -d -m $(CFGDIRMODE) -o $(CFGDIROWNER) -g $(CFGDIRGROUP) $@ install: $(INSTALLED_CONF_D) diff --git a/make/defs.mk b/make/defs.mk index 8097169a..07fa46f1 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -3,7 +3,7 @@ # $Id$ ifndef JW_PKG_DEF_MK_INCLUDED -JW_PKG_DEF_MK_INCLUDED = true +JW_PKG_DEF_MK_INCLUDED = true MAKEFLAGS += -r @@ -261,7 +261,7 @@ CVS_RSH ?= /usr/bin/ssh # ----- input dirs -JW_PKG_DIR = $(JWBDIR) +JW_PKG_DIR = $(JWBDIR) PROJECT_STEM = $(PROJECT)-$(DIST_VERSION) # only works if checked out true to CVS, i.e. below proj diff --git a/make/git-cvs-bridge.mk b/make/git-cvs-bridge.mk index 39340539..00d2d336 100644 --- a/make/git-cvs-bridge.mk +++ b/make/git-cvs-bridge.mk @@ -1,6 +1,6 @@ # is "origin" by default, but this clashes with the remote's name in some situations -CVS_HEAD_BRANCH ?= cvs-head -GIT_CVSIMPORT_EXTRA_ARGS ?= +CVS_HEAD_BRANCH ?= cvs-head +GIT_CVSIMPORT_EXTRA_ARGS ?= all: diff --git a/make/include.mk b/make/include.mk index 79177c67..b98dec5f 100644 --- a/make/include.mk +++ b/make/include.mk @@ -3,7 +3,7 @@ include $(JWBDIR)/make/defs-cpp.mk include $(JWBDIR)/make/dev-utils.mk # variables -SRC_H += $(PROJ_H) $(wildcard $(HDRDIR_SCOPE_SUFFIX)/*.h) +SRC_H += $(PROJ_H) $(wildcard $(HDRDIR_SCOPE_SUFFIX)/*.h) # mandatory targets all: $(PROJ_H) diff --git a/make/lib.mk b/make/lib.mk index 02c25961..7eef30c2 100644 --- a/make/lib.mk +++ b/make/lib.mk @@ -11,14 +11,14 @@ include $(JWBDIR)/make/dev-utils.mk all: ifeq ($(wildcard $(LIB_A)),) - USE_PROJECT_LIB = false + USE_PROJECT_LIB = false endif ifeq ($(USE_PROJECT_LIB),false) ifeq ($(TARGET),mingw) - SHOBJS += $(wildcard *.dll) + SHOBJS += $(wildcard *.dll) else - SHOBJS += $(wildcard *.so) + SHOBJS += $(wildcard *.so) endif all: $(LD_CONF) install: diff --git a/make/list-files.mk b/make/list-files.mk index 16432322..681c5724 100644 --- a/make/list-files.mk +++ b/make/list-files.mk @@ -1,7 +1,7 @@ LIST_VCS_FILES := /bin/bash $(JWB_SCRIPT_DIR)/scm.sh ls-files ifndef LIST_FILES_MK_INCLUDED -LIST_FILES_MK_INCLUDED := true +LIST_FILES_MK_INCLUDED := true list-files echo-files: $(Q)$(LIST_VCS_FILES) -f diff --git a/make/projects-dir-minimal.mk b/make/projects-dir-minimal.mk index 146456ba..eb365f56 100644 --- a/make/projects-dir-minimal.mk +++ b/make/projects-dir-minimal.mk @@ -22,7 +22,7 @@ Q ?= @ ifeq ($(origin PROJECTS_DIR_REMOTE_BASE),undefined) ifneq ($(wildcard $(JWBDIR)),) - PROJECTS_DIR_REMOTE_BASE := $(shell /usr/bin/python3 $(JWBDIR)/scripts/jw-pkg.py -p . projects get-auth-info --remote-base --only-values) + PROJECTS_DIR_REMOTE_BASE := $(shell /usr/bin/python3 $(JWBDIR)/scripts/jw-pkg.py -p . projects get-auth-info --remote-base --only-values) endif ifeq ($(PROJECTS_DIR_REMOTE_BASE),) PROJECTS_DIR_REMOTE_BASE := https://janware.com/code @@ -39,7 +39,7 @@ else ifneq ($(findstring https://,$(PROJECTS_DIR_REMOTE_BASE)),) else ifneq ($(wildcard $(PROJECTS_DIR_REMOTE_BASE)),) $(warning Using local PROJECTS_DIR_REMOTE_BASE = $(PROJECTS_DIR_REMOTE_BASE)) else - $(error Unsupported PROJECTS_DIR_REMOTE_BASE="$(PROJECTS_DIR_REMOTE_BASE)") + $(error Unsupported PROJECTS_DIR_REMOTE_BASE = "$(PROJECTS_DIR_REMOTE_BASE)") endif ifeq ($(JANWARE_USER),) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index fc9010ba..6cafc19e 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -89,9 +89,9 @@ else endif ifeq ($(filter pkg-%,$(MAKECMDGOALS)),) - JW_PKG_SSH_EXTRA_OPTS += -o StrictHostKeyChecking=no -o ControlMaster=auto -o ControlPath=/tmp/%r@jw-pkg:%h:%p -o ControlPersist=3m + JW_PKG_SSH_EXTRA_OPTS += -o StrictHostKeyChecking=no -o ControlMaster=auto -o ControlPath=/tmp/%r@jw-pkg:%h:%p -o ControlPersist=3m ifneq ($(JANWARE_USER),) - JW_PKG_SSH_EXTRA_OPTS += -l $(JANWARE_USER) + JW_PKG_SSH_EXTRA_OPTS += -l $(JANWARE_USER) endif export JW_PKG_SSH_EXTRA_OPTS endif diff --git a/make/py-run.mk b/make/py-run.mk index d8c40ae4..5c7bfe1f 100644 --- a/make/py-run.mk +++ b/make/py-run.mk @@ -3,8 +3,8 @@ include $(JWBDIR)/make/py-defs.mk #include $(JWBDIR)/make/scripts-targets.mk #include $(JWBDIR)/make/rules.mk -EXE ?= $(firstword $(wildcard main.py runme.py test.py *.py)) -EXE_ARGS ?= +EXE ?= $(firstword $(wildcard main.py runme.py test.py *.py)) +EXE_ARGS ?= all: install: diff --git a/make/rules.mk b/make/rules.mk index ed21848f..6d2b5fe0 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -4,7 +4,7 @@ # $Id$ ifndef JW_PKG_RULES_MK_INCLUDED -JW_PKG_RULES_MK_INCLUDED = true +JW_PKG_RULES_MK_INCLUDED = true # -- standard targets all: diff --git a/make/scripts-targets.mk b/make/scripts-targets.mk index aee4ad85..653629e7 100644 --- a/make/scripts-targets.mk +++ b/make/scripts-targets.mk @@ -8,7 +8,7 @@ ifeq ($(INSTALL_HOME_BIN_WRAPPERS),true) install: install-home-bin endif -HOME_BIN_EXE_SH = $(addprefix $(HOME)/bin/, $(notdir $(EXE_SH))) +HOME_BIN_EXE_SH = $(addprefix $(HOME)/bin/, $(notdir $(EXE_SH))) $(HOME)/bin/%.py: %.py echo -e "#!/bin/bash\nexec $(PYTHON) $(shell $(PWD))/$<" '"$$@"' > $@.tmp diff --git a/make/std-tools.mk b/make/std-tools.mk index 14e9fe09..2ea2d24b 100644 --- a/make/std-tools.mk +++ b/make/std-tools.mk @@ -1,6 +1,6 @@ include $(JWBDIR)/make/defs.mk -PROFILE_SH = profile-$(PROJECT).sh +PROFILE_SH = profile-$(PROJECT).sh all: $(PROFILE_SH) clean: clean.std-tools diff --git a/make/swig.mk b/make/swig.mk index 916d898b..c416df2f 100644 --- a/make/swig.mk +++ b/make/swig.mk @@ -138,7 +138,7 @@ else ifeq ($(SWIG_TARGET),perl) else - $(error SWIG_TARGET=$(SWIG_TARGET) undefined or unknown) + $(error SWIG_TARGET = $(SWIG_TARGET) undefined or unknown) endif diff --git a/make/tag-defs.mk b/make/tag-defs.mk index add2d1cb..06f91fb4 100644 --- a/make/tag-defs.mk +++ b/make/tag-defs.mk @@ -1 +1 @@ -TAG_VERSION = V_$(shell echo $(VERSION) | $(SED) 's/[\.-]/_/g') +TAG_VERSION = V_$(shell echo $(VERSION) | $(SED) 's/[\.-]/_/g') diff --git a/make/test-exe.mk b/make/test-exe.mk index c0394b72..2c9a6e3e 100644 --- a/make/test-exe.mk +++ b/make/test-exe.mk @@ -3,7 +3,7 @@ # contact@jannet.de # $Id$ -EXE_BASENAME ?= test-$(notdir $(shell $(PWD))) +EXE_BASENAME ?= test-$(notdir $(shell $(PWD))) include $(JWBDIR)/make/run.mk diff --git a/make/tools.mk b/make/tools.mk index 15fdb465..56a7c8b2 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -12,8 +12,8 @@ include $(JWBDIR)/make/depend.mk include $(JWBDIR)/make/backup.mk include $(JWBDIR)/make/dev-utils.mk -FINAL_CFLAGS += -D_USRDLL -DALL_EXPORTS -FINAL_CXXFLAGS += -D_USRDLL -DALL_EXPORTS +FINAL_CFLAGS += -D_USRDLL -DALL_EXPORTS +FINAL_CXXFLAGS += -D_USRDLL -DALL_EXPORTS ifneq ($(SRC_ALL_CPP),) all: all.done diff --git a/make/vim.mk b/make/vim.mk index a2b862c0..8984a5b7 100644 --- a/make/vim.mk +++ b/make/vim.mk @@ -1,2 +1,2 @@ -INSTALL_VIM_SYSTEM_PATH = $(ENV_PREFIX)/usr/share/vim/site +INSTALL_VIM_SYSTEM_PATH = $(ENV_PREFIX)/usr/share/vim/site INSTALL_VIM_SYSTEM_PLUGIN_PATH = $(INSTALL_VIM_SYSTEM_PATH)/plugin