janware/jw-pkg
1
mirror of ssh://git.janware.com/janware/proj/jw-pkg synced 2026-04-24 09:13:37 +02:00
Code Activity Actions

make: Align equal signs in *.mk to column 30

Browse source 
Chore: Format equal signs uniformly. They should all be at column 30
but aren't. Fix that.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-03-16 13:18:28 +01:00
commit ed17aaa6c9
17 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/conf.mk
View file

@ -16,7 +16,7 @@ $(INSTALLED_CFG): $(INSTALL_CFGDIR)
endif endif
ifneq ($(CONF_D),) ifneq ($(CONF_D),)
INSTALLED_CONF_D = $(addprefix $(INSTALL_CFGDIR)/,$(CONF_D)) INSTALLED_CONF_D = $(addprefix $(INSTALL_CFGDIR)/,$(CONF_D))
$(INSTALL_CFGDIR)/$(CONF_D): $(INSTALL_CFGDIR)/$(CONF_D):
$(INSTALL) -d -m $(CFGDIRMODE) -o $(CFGDIROWNER) -g $(CFGDIRGROUP) $@ $(INSTALL) -d -m $(CFGDIRMODE) -o $(CFGDIROWNER) -g $(CFGDIRGROUP) $@
install: $(INSTALLED_CONF_D) install: $(INSTALLED_CONF_D)

4
make/defs.mk
View file

@ -3,7 +3,7 @@
# $Id$ # $Id$
ifndef JW_PKG_DEF_MK_INCLUDED ifndef JW_PKG_DEF_MK_INCLUDED
JW_PKG_DEF_MK_INCLUDED = true JW_PKG_DEF_MK_INCLUDED = true
MAKEFLAGS += -r MAKEFLAGS += -r
@ -261,7 +261,7 @@ CVS_RSH ?= /usr/bin/ssh
# ----- input dirs # ----- input dirs
JW_PKG_DIR = $(JWBDIR) JW_PKG_DIR = $(JWBDIR)
PROJECT_STEM = $(PROJECT)-$(DIST_VERSION) PROJECT_STEM = $(PROJECT)-$(DIST_VERSION)
# only works if checked out true to CVS, i.e. below proj # only works if checked out true to CVS, i.e. below proj

4
make/git-cvs-bridge.mk
View file

@ -1,6 +1,6 @@
# is "origin" by default, but this clashes with the remote's name in some situations # is "origin" by default, but this clashes with the remote's name in some situations
CVS_HEAD_BRANCH ?= cvs-head CVS_HEAD_BRANCH ?= cvs-head
GIT_CVSIMPORT_EXTRA_ARGS ?= GIT_CVSIMPORT_EXTRA_ARGS ?=
all: all:

2
make/include.mk
View file

@ -3,7 +3,7 @@ include $(JWBDIR)/make/defs-cpp.mk
include $(JWBDIR)/make/dev-utils.mk include $(JWBDIR)/make/dev-utils.mk
# variables # variables
SRC_H += $(PROJ_H) $(wildcard $(HDRDIR_SCOPE_SUFFIX)/*.h) SRC_H += $(PROJ_H) $(wildcard $(HDRDIR_SCOPE_SUFFIX)/*.h)
# mandatory targets # mandatory targets
all: $(PROJ_H) all: $(PROJ_H)

6
make/lib.mk
View file

@ -11,14 +11,14 @@ include $(JWBDIR)/make/dev-utils.mk
all: all:
ifeq ($(wildcard $(LIB_A)),) ifeq ($(wildcard $(LIB_A)),)
USE_PROJECT_LIB = false USE_PROJECT_LIB = false
endif endif
ifeq ($(USE_PROJECT_LIB),false) ifeq ($(USE_PROJECT_LIB),false)
ifeq ($(TARGET),mingw) ifeq ($(TARGET),mingw)
SHOBJS += $(wildcard *.dll) SHOBJS += $(wildcard *.dll)
else else
SHOBJS += $(wildcard *.so) SHOBJS += $(wildcard *.so)
endif endif
all: $(LD_CONF) all: $(LD_CONF)
install: install:

2
make/list-files.mk
View file

@ -1,7 +1,7 @@
LIST_VCS_FILES := /bin/bash $(JWB_SCRIPT_DIR)/scm.sh ls-files LIST_VCS_FILES := /bin/bash $(JWB_SCRIPT_DIR)/scm.sh ls-files
ifndef LIST_FILES_MK_INCLUDED ifndef LIST_FILES_MK_INCLUDED
LIST_FILES_MK_INCLUDED := true LIST_FILES_MK_INCLUDED := true
list-files echo-files: list-files echo-files:
$(Q)$(LIST_VCS_FILES) -f $(Q)$(LIST_VCS_FILES) -f

4
make/projects-dir-minimal.mk
View file

@ -22,7 +22,7 @@ Q ?= @
ifeq ($(origin PROJECTS_DIR_REMOTE_BASE),undefined) ifeq ($(origin PROJECTS_DIR_REMOTE_BASE),undefined)
ifneq ($(wildcard $(JWBDIR)),) 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 endif
ifeq ($(PROJECTS_DIR_REMOTE_BASE),) ifeq ($(PROJECTS_DIR_REMOTE_BASE),)
PROJECTS_DIR_REMOTE_BASE := https://janware.com/code 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)),) else ifneq ($(wildcard $(PROJECTS_DIR_REMOTE_BASE)),)
$(warning Using local PROJECTS_DIR_REMOTE_BASE = $(PROJECTS_DIR_REMOTE_BASE)) $(warning Using local PROJECTS_DIR_REMOTE_BASE = $(PROJECTS_DIR_REMOTE_BASE))
else else
$(error Unsupported PROJECTS_DIR_REMOTE_BASE="$(PROJECTS_DIR_REMOTE_BASE)") $(error Unsupported PROJECTS_DIR_REMOTE_BASE = "$(PROJECTS_DIR_REMOTE_BASE)")
endif endif
ifeq ($(JANWARE_USER),) ifeq ($(JANWARE_USER),)

4
make/projects-dir.mk
View file

@ -89,9 +89,9 @@ else
endif endif
ifeq ($(filter pkg-%,$(MAKECMDGOALS)),) 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),) ifneq ($(JANWARE_USER),)
JW_PKG_SSH_EXTRA_OPTS += -l $(JANWARE_USER) JW_PKG_SSH_EXTRA_OPTS += -l $(JANWARE_USER)
endif endif
export JW_PKG_SSH_EXTRA_OPTS export JW_PKG_SSH_EXTRA_OPTS
endif endif

4
make/py-run.mk
View file

@ -3,8 +3,8 @@ include $(JWBDIR)/make/py-defs.mk
#include $(JWBDIR)/make/scripts-targets.mk #include $(JWBDIR)/make/scripts-targets.mk
#include $(JWBDIR)/make/rules.mk #include $(JWBDIR)/make/rules.mk
EXE ?= $(firstword $(wildcard main.py runme.py test.py *.py)) EXE ?= $(firstword $(wildcard main.py runme.py test.py *.py))
EXE_ARGS ?= EXE_ARGS ?=
all: all:
install: install:

2
make/rules.mk
View file

@ -4,7 +4,7 @@
# $Id$ # $Id$
ifndef JW_PKG_RULES_MK_INCLUDED ifndef JW_PKG_RULES_MK_INCLUDED
JW_PKG_RULES_MK_INCLUDED = true JW_PKG_RULES_MK_INCLUDED = true
# -- standard targets # -- standard targets
all: all:

2
make/scripts-targets.mk
View file

@ -8,7 +8,7 @@ ifeq ($(INSTALL_HOME_BIN_WRAPPERS),true)
install: install-home-bin install: install-home-bin
endif 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 $(HOME)/bin/%.py: %.py
echo -e "#!/bin/bash\nexec $(PYTHON) $(shell $(PWD))/$<" '"$$@"' > $@.tmp echo -e "#!/bin/bash\nexec $(PYTHON) $(shell $(PWD))/$<" '"$$@"' > $@.tmp

2
make/std-tools.mk
View file

@ -1,6 +1,6 @@
include $(JWBDIR)/make/defs.mk include $(JWBDIR)/make/defs.mk
PROFILE_SH = profile-$(PROJECT).sh PROFILE_SH = profile-$(PROJECT).sh
all: $(PROFILE_SH) all: $(PROFILE_SH)
clean: clean.std-tools clean: clean.std-tools

2
make/swig.mk
View file

@ -138,7 +138,7 @@ else ifeq ($(SWIG_TARGET),perl)
else else
$(error SWIG_TARGET=$(SWIG_TARGET) undefined or unknown) $(error SWIG_TARGET = $(SWIG_TARGET) undefined or unknown)
endif endif

2
make/tag-defs.mk
View file

@ -1 +1 @@
TAG_VERSION = V_$(shell echo $(VERSION) | $(SED) 's/[\.-]/_/g') TAG_VERSION = V_$(shell echo $(VERSION) | $(SED) 's/[\.-]/_/g')

2
make/test-exe.mk
View file

@ -3,7 +3,7 @@
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
EXE_BASENAME ?= test-$(notdir $(shell $(PWD))) EXE_BASENAME ?= test-$(notdir $(shell $(PWD)))
include $(JWBDIR)/make/run.mk include $(JWBDIR)/make/run.mk

4
make/tools.mk
View file

@ -12,8 +12,8 @@ include $(JWBDIR)/make/depend.mk
include $(JWBDIR)/make/backup.mk include $(JWBDIR)/make/backup.mk
include $(JWBDIR)/make/dev-utils.mk include $(JWBDIR)/make/dev-utils.mk
FINAL_CFLAGS += -D_USRDLL -DALL_EXPORTS FINAL_CFLAGS += -D_USRDLL -DALL_EXPORTS
FINAL_CXXFLAGS += -D_USRDLL -DALL_EXPORTS FINAL_CXXFLAGS += -D_USRDLL -DALL_EXPORTS
ifneq ($(SRC_ALL_CPP),) ifneq ($(SRC_ALL_CPP),)
all: all.done all: all.done

2
make/vim.mk
View file

@ -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 INSTALL_VIM_SYSTEM_PLUGIN_PATH = $(INSTALL_VIM_SYSTEM_PATH)/plugin