janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-30 00:12:48 +01:00
Code Activity

conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-03-03 18:12:28 +00:00
commit 0eaef0c326
59 changed files with 2065 additions and 2032 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/Makefile
View file

@ -9,7 +9,7 @@ CACHED_FILES := defs.mk projects.mk platform.mk Makefile
#CACHED_VARS = $(shell sed '/^[ \t]*\([A-Z_]\+\) *\(.=\).*$$.shell/!d; s/ *.=.*//' $(CACHED_FILES)) #CACHED_VARS = $(shell sed '/^[ \t]*\([A-Z_]\+\) *\(.=\).*$$.shell/!d; s/ *.=.*//' $(CACHED_FILES))
CACHED_VARS := WHICH ECHO TEST BROWSER SED RM PWD ID CUT TR AWK GETENT XARGS FIND PRINTF HOST_TUPLE OS_NAME_VERSION OS_NAME CAT BIN_INSTALL SUDO CACHED_VARS := WHICH ECHO TEST BROWSER SED RM PWD ID CUT TR AWK GETENT XARGS FIND PRINTF HOST_TUPLE OS_NAME_VERSION OS_NAME CAT BIN_INSTALL SUDO
#CACHED_VARS += TARGET_ARCH RPM_ARCH #CACHED_VARS += TARGET_ARCH RPM_ARCH
CACHED_VARS += TARGET_ARCH #CACHED_VARS += TARGET_ARCH
#CACHED_VARS += DEVELOPMENT #CACHED_VARS += DEVELOPMENT
include $(TOPDIR)/make/proj.mk include $(TOPDIR)/make/proj.mk

32
make/defs-cpp.mk
View file

@ -24,9 +24,9 @@ ifeq ($(findstring $(TARGET_OS),linux),)
endif endif
ifeq ($(DEVELOPMENT),true) ifeq ($(DEVELOPMENT),true)
export G_SLICE=always-malloc export G_SLICE = always-malloc
export G_DEBUG=gc-friendly,resident-modules export G_DEBUG = gc-friendly,resident-modules
export MALLOC_CHECK_=2 export MALLOC_CHECK_ = 2
endif endif
USE_PROJECT_LIB ?= true USE_PROJECT_LIB ?= true
@ -126,7 +126,7 @@ ifeq ($(COMPILER_SUITE),gcc)
STRIP ?= $(TC_BIN_PREFIX)strip STRIP ?= $(TC_BIN_PREFIX)strip
RANLIB ?= $(TC_BIN_PREFIX)ranlib RANLIB ?= $(TC_BIN_PREFIX)ranlib
AR ?= $(TC_BIN_PREFIX)ar AR ?= $(TC_BIN_PREFIX)ar
PKG_CONFIG ?= $(TC_BIN_PREFIX)pkg-config PKG_CONFIG_EXE ?= $(TC_BIN_PREFIX)pkg-config
# compiler and linker # compiler and linker
# gcc # gcc
@ -138,7 +138,7 @@ ifeq ($(COMPILER_SUITE),gcc)
# Not needed anywhere # Not needed anywhere
#GNU_LD_VERSION := $(shell $(LD) -V | $(SED) '/GNU ld/ !d; s/(.*)//; s/[^0-9.-]*//') #GNU_LD_VERSION := $(shell $(LD) -V | $(SED) '/GNU ld/ !d; s/(.*)//; s/[^0-9.-]*//')
#GNU_LD_VERSION_NUMBERS:= $(subst ., ,$(GNU_LD_VERSION)) #GNU_LD_VERSION_NUMBERS := $(subst ., ,$(GNU_LD_VERSION))
#GNU_LD_MAJOR := $(word 1,$(GNU_LD_VERSION_NUMBERS)) #GNU_LD_MAJOR := $(word 1,$(GNU_LD_VERSION_NUMBERS))
#GNU_LD_MINOR := $(word 2,$(GNU_LD_VERSION_NUMBERS)) #GNU_LD_MINOR := $(word 2,$(GNU_LD_VERSION_NUMBERS))
#GNU_LD_REV := $(word 3,$(GNU_LD_VERSION_NUMBERS)) #GNU_LD_REV := $(word 3,$(GNU_LD_VERSION_NUMBERS))
@ -213,14 +213,14 @@ ALL_CSRC += $(LOCAL_CSRC) $(PREREQ_CSRC)
ifeq ($(DEVELOPMENT),true) ifeq ($(DEVELOPMENT),true)
BUILD_CFLAGS += -D_DEVELOPMENT_ BUILD_CFLAGS += -D_DEVELOPMENT_
BUILD_CPPFLAGS+= -D_DEVELOPMENT_ BUILD_CPPFLAGS += -D_DEVELOPMENT_
endif endif
CORE += $(filter-out $(wildcard *.intern-state*),$(wildcard core core.* vgcore vgcore.*)) CORE += $(filter-out $(wildcard *.intern-state*),$(wildcard core core.* vgcore vgcore.*))
ifeq ($(GCC_MAJOR),4) ifeq ($(GCC_MAJOR),4)
BUILD_CFLAGS += -DGCC_HASCLASSVISIBILITY BUILD_CFLAGS += -DGCC_HASCLASSVISIBILITY
BUILD_CPPFLAGS+= -DGCC_HASCLASSVISIBILITY BUILD_CPPFLAGS += -DGCC_HASCLASSVISIBILITY
endif endif
ifeq ($(USE_QT),true) ifeq ($(USE_QT),true)
@ -266,7 +266,7 @@ GENERATE_FUNC_TIMERS = $(MODDIR)/YStopWatchThreadList/generate_func_timers.sh
ifeq ($(LOG_THREAD_NAMES), true) ifeq ($(LOG_THREAD_NAMES), true)
BUILD_CFLAGS += -DSLOG_THREAD_NAMES BUILD_CFLAGS += -DSLOG_THREAD_NAMES
BUILD_CPPFLAGS+= -DSLOG_THREAD_NAMES BUILD_CPPFLAGS += -DSLOG_THREAD_NAMES
endif endif
# ----- standard features, switched on with USE_XXX = true # ----- standard features, switched on with USE_XXX = true
@ -291,9 +291,9 @@ ifneq ($(filter jw-build,$(PREREQ_BUILD)),)
endif endif
ifeq ($(USE_SYSTEMD),true) ifeq ($(USE_SYSTEMD),true)
BUILD_CFLAGS += -D_USE_SYSTEMD_ $(shell $(PKG_CONFIG) --cflags libsystemd) BUILD_CFLAGS += -D_USE_SYSTEMD_ $(shell $(PKG_CONFIG_EXE) --cflags libsystemd)
BUILD_CPPFLAGS += -D_USE_SYSTEMD_ $(shell $(PKG_CONFIG) --cflags libsystemd) BUILD_CPPFLAGS += -D_USE_SYSTEMD_ $(shell $(PKG_CONFIG_EXE) --cflags libsystemd)
BUILD_LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd) BUILD_LDFLAGS += $(shell $(PKG_CONFIG_EXE) --libs libsystemd)
endif endif
ifeq ($(USE_TIMER),true) ifeq ($(USE_TIMER),true)
@ -302,8 +302,8 @@ ifeq ($(USE_TIMER),true)
endif endif
ifeq ($(USE_FAST_LOG),false) ifeq ($(USE_FAST_LOG),false)
BUILD_CFLAGS +=-D_USE_FAST_LOG_=0 BUILD_CFLAGS += -D_USE_FAST_LOG_=0
BUILD_CPPFLAGS +=-D_USE_FAST_LOG_=0 BUILD_CPPFLAGS += -D_USE_FAST_LOG_=0
endif endif
ifeq ($(USE_YAMD),true) ifeq ($(USE_YAMD),true)
@ -486,9 +486,9 @@ ifeq ($(USE_FFTW),true)
endif endif
ifeq ($(USE_GLIB),true) ifeq ($(USE_GLIB),true)
PROJECT_CFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0) PROJECT_CFLAGS += $(shell $(PKG_CONFIG_EXE) --cflags glib-2.0)
PROJECT_CPPFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0) PROJECT_CPPFLAGS += $(shell $(PKG_CONFIG_EXE) --cflags glib-2.0)
LIBFLAGS += $(shell $(PKG_CONFIG) --libs glib-2.0) LIBFLAGS += $(shell $(PKG_CONFIG_EXE) --libs glib-2.0)
endif endif
ifeq ($(CC),$(CLANG)) ifeq ($(CC),$(CLANG))

8
make/defs-dev.mk
View file

@ -22,8 +22,8 @@ CONFIG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT_DIR
LD_CONF_DIR ?= $(ENV_PREFIX)$(HOME)/etc/ld.so.conf.d LD_CONF_DIR ?= $(ENV_PREFIX)$(HOME)/etc/ld.so.conf.d
LOGROT_DIR ?= $(ENV_PREFIX)$(HOME)/etc/logrotate.d LOGROT_DIR ?= $(ENV_PREFIX)$(HOME)/etc/logrotate.d
APACHE_CONF_DIR ?= $(ENV_PREFIX)$(HOME)/etc/apache/conf.d APACHE_CONF_DIR ?= $(ENV_PREFIX)$(HOME)/etc/apache/conf.d
APACHE_VHOSTS_DIR?= $(ENV_PREFIX)$(HOME)/etc/apache/vhosts.d APACHE_VHOSTS_DIR ?= $(ENV_PREFIX)$(HOME)/etc/apache/vhosts.d
APACHE_SNIPPETS_DIR?= $(ENV_PREFIX)$(HOME)/etc/apache/snippets.d APACHE_SNIPPETS_DIR ?= $(ENV_PREFIX)$(HOME)/etc/apache/snippets.d
RSYSLOG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/rsyslog.d RSYSLOG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/rsyslog.d
IMG_PREFIX ?= $(PREFIX) IMG_PREFIX ?= $(PREFIX)
LOG_PREFIX ?= $(PREFIX)/log LOG_PREFIX ?= $(PREFIX)/log
@ -53,7 +53,7 @@ CGI_DIR ?= $(PROJECT_HTMLDIR)/cgi-bin
LOGID ?= $(shell $(ECHO) $(BUILD_USER) | cut -c1-2)-$(PROJECT) LOGID ?= $(shell $(ECHO) $(BUILD_USER) | cut -c1-2)-$(PROJECT)
DAEMON_RUN_USER ?= $(BUILD_USER) DAEMON_RUN_USER ?= $(BUILD_USER)
DAEMON_RUN_GROUP ?= $(BUILD_GROUP) DAEMON_RUN_GROUP ?= $(BUILD_GROUP)
CATCH_ONLY_YERROR?= true CATCH_ONLY_YERROR ?= true
# -- file attributes # -- file attributes
EXEOWNER ?= $(BUILD_USER) EXEOWNER ?= $(BUILD_USER)
@ -282,7 +282,7 @@ LOG_THREAD_NAMES ?= true
COMPILE_DEBUG_CODE ?= true COMPILE_DEBUG_CODE ?= true
#COMPILE_DEBUG_LOG ?= true #COMPILE_DEBUG_LOG ?= true
USE_COMPILER_DEBUG_OPTS ?= true USE_COMPILER_DEBUG_OPTS ?= true
#USE_COMPILER_OPTIMIZATION_OPTS ?= true #USE_COMPILER_OPTIMIZATION_OPTS?= true
ifeq ($(TARGET),mingw) ifeq ($(TARGET),mingw)
USE_STACK_PROTECTOR ?= false USE_STACK_PROTECTOR ?= false
else else

8
make/defs-dist.mk
View file

@ -22,8 +22,8 @@ CONFIG_DIR ?= $(ENV_PREFIX)/etc/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT_DIRNAM
LD_CONF_DIR ?= $(ENV_PREFIX)/etc/ld.so.conf.d LD_CONF_DIR ?= $(ENV_PREFIX)/etc/ld.so.conf.d
LOGROT_DIR ?= $(ENV_PREFIX)/etc/logrotate.d LOGROT_DIR ?= $(ENV_PREFIX)/etc/logrotate.d
APACHE_CONF_DIR ?= $(ENV_PREFIX)/etc/jw-apache/conf.d APACHE_CONF_DIR ?= $(ENV_PREFIX)/etc/jw-apache/conf.d
APACHE_VHOSTS_DIR?= $(ENV_PREFIX)/etc/jw-apache/vhosts.d APACHE_VHOSTS_DIR ?= $(ENV_PREFIX)/etc/jw-apache/vhosts.d
APACHE_SNIPPETS_DIR?= $(ENV_PREFIX)/etc/jw-apache/snippets.d APACHE_SNIPPETS_DIR ?= $(ENV_PREFIX)/etc/jw-apache/snippets.d
RSYSLOG_DIR ?= $(ENV_PREFIX)/etc/rsyslog.d RSYSLOG_DIR ?= $(ENV_PREFIX)/etc/rsyslog.d
IMG_PREFIX ?= $(PREFIX) IMG_PREFIX ?= $(PREFIX)
LOG_PREFIX ?= $(ENV_PREFIX)/var/log LOG_PREFIX ?= $(ENV_PREFIX)/var/log
@ -53,7 +53,7 @@ CGI_DIR ?= $(PROJECT_HTMLDIR)/cgi-bin
LOGID ?= $(PROJECT) LOGID ?= $(PROJECT)
DAEMON_RUN_USER ?= root DAEMON_RUN_USER ?= root
DAEMON_RUN_GROUP ?= root DAEMON_RUN_GROUP ?= root
CATCH_ONLY_YERROR?= false CATCH_ONLY_YERROR ?= false
# -- file attributes # -- file attributes
EXEOWNER ?= root EXEOWNER ?= root
@ -282,7 +282,7 @@ LOG_THREAD_NAMES ?= true
#COMPILE_DEBUG_CODE ?= true #COMPILE_DEBUG_CODE ?= true
#COMPILE_DEBUG_LOG ?= true #COMPILE_DEBUG_LOG ?= true
USE_COMPILER_DEBUG_OPTS ?= true USE_COMPILER_DEBUG_OPTS ?= true
USE_COMPILER_OPTIMIZATION_OPTS ?= true USE_COMPILER_OPTIMIZATION_OPTS?= true
USE_STACK_PROTECTOR ?= true USE_STACK_PROTECTOR ?= true
#USE_STACK_CHECKER ?= true #USE_STACK_CHECKER ?= true

2
make/defs.mk
View file

@ -220,7 +220,7 @@ PROJECT_DESCR ?= $(call proj_query, summary $(PROJECT))
PROJECT_SUMMARY ?= $(PROJECT_DESCR) PROJECT_SUMMARY ?= $(PROJECT_DESCR)
ifneq ($(PROJECT_DESCR_FILE),) ifneq ($(PROJECT_DESCR_FILE),)
ifeq ($(shell $(GREP) "^ *subpackages *=.*devel" $(PROJECT_DESCR_FILE)),) ifeq ($(shell $(GREP) "^ *subpackages * = .*devel" $(PROJECT_DESCR_FILE)),)
CREATE_DEVEL = false CREATE_DEVEL = false
endif endif
endif endif

2
make/dev-utils.mk
View file

@ -1,7 +1,7 @@
ifndef DEV_UTILS_MK_INCLUDED ifndef DEV_UTILS_MK_INCLUDED
DEV_UTILS_MK_INCLUDED = true DEV_UTILS_MK_INCLUDED = true
MAKEFILE_INDENT_EQUAL_POS ?= 35 MAKEFILE_INDENT_EQUAL_POS ?= 30
MAKEFILE_INDENT_NAME_REGEX ?= (\.mk$$|makefile$$|Makefile$$|GNUmakefile$$) MAKEFILE_INDENT_NAME_REGEX ?= (\.mk$$|makefile$$|Makefile$$|GNUmakefile$$)
MAKEFILE_INDENT_ROOT ?= . MAKEFILE_INDENT_ROOT ?= .

4
make/dist.mk
View file

@ -18,8 +18,8 @@ DOWNLOAD_REFERRER_DIRS = $(addprefix $(UPLOAD_DOCUMENT_ROOT)/, \
# -- general, and less important # -- general, and less important
DISTDIR = $(TOPDIR)/dist DISTDIR = $(TOPDIR)/dist
DIST_FILE = $(DISTDIR)/$(PROJECT)-$(VERSION).tar.gz DIST_FILE = $(DISTDIR)/$(PROJECT)-$(VERSION).tar.gz
TMPHTML=$(DISTDIR)/html TMPHTML = $(DISTDIR)/html
DOWNLOAD_URLDIR=$(DOWNLOAD_SERVER)/$(URL_RELATIVE_PATH) DOWNLOAD_URLDIR = $(DOWNLOAD_SERVER)/$(URL_RELATIVE_PATH)
TARGET_DIR ?= $(UPLOAD_DOCUMENT_ROOT)/$(UPLOAD_VIRTUAL_SERVER_ROOT)/$(URL_RELATIVE_PATH) TARGET_DIR ?= $(UPLOAD_DOCUMENT_ROOT)/$(UPLOAD_VIRTUAL_SERVER_ROOT)/$(URL_RELATIVE_PATH)
SSI_PREFIX = $(TMPHTML)/ssi_download_ SSI_PREFIX = $(TMPHTML)/ssi_download_

2
make/gettext.mk
View file

@ -50,7 +50,7 @@ edit: merge $(GETTEXT_PROJECT_POT)
mv $@.tmp $@ mv $@.tmp $@
#msginit --no-translator --locale es_MX --output-file $(PROJECT)_spanish.po --input $(PROJECT).pot #msginit --no-translator --locale es_MX --output-file $(PROJECT)_spanish.po --input $(PROJECT).pot
#sed --in-place $(PROJECT)_spanish.po --expression='/"hello, world!"/,/#: / s/""/"hola mundo"/' #sed --in-place $(PROJECT)_spanish.po --expression = '/"hello, world!"/,/#: / s/""/"hola mundo"/'
#mkdir --parents ./es_MX.utf8/LC_MESSAGES #mkdir --parents ./es_MX.utf8/LC_MESSAGES
#msgfmt --check --verbose --output-file ./es_MX.utf8/LC_MESSAGES/$(PROJECT).mo $(PROJECT)_spanish.po #msgfmt --check --verbose --output-file ./es_MX.utf8/LC_MESSAGES/$(PROJECT).mo $(PROJECT)_spanish.po

2
make/ldlibpath.mk
View file

@ -11,7 +11,7 @@ ifeq ($(TARGET),mingw)
DLL_PATH = $(shell echo $(LD_LIBRARY_PATH) | $(SED) 's/:/;/g');$(CROSS_TOOL_DIR)/bin DLL_PATH = $(shell echo $(LD_LIBRARY_PATH) | $(SED) 's/:/;/g');$(CROSS_TOOL_DIR)/bin
endif endif
#export LD_LIBRARY_PATH=$(shell echo $(strip $(LD_LIB_PATH_LDFLAGS):$(LD_LIB_PATH):$(LD_LIB_PATH_ENV)) | $(SED) 's/ /:/g; s/::/:/g') #export LD_LIBRARY_PATH = $(shell echo $(strip $(LD_LIB_PATH_LDFLAGS):$(LD_LIB_PATH):$(LD_LIB_PATH_ENV)) | $(SED) 's/ /:/g; s/::/:/g')
LD_LIBRARY_PATH := $(call proj_query, ldlibpath $(PROJECT) $(PREREQ_BUILD)) LD_LIBRARY_PATH := $(call proj_query, ldlibpath $(PROJECT) $(PREREQ_BUILD))
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
export PATH := $(call proj_query, exepath $(PROJECT) $(PREREQ_BUILD)):$(EXE_SEARCH_PATH_ENV) export PATH := $(call proj_query, exepath $(PROJECT) $(PREREQ_BUILD)):$(EXE_SEARCH_PATH_ENV)

2
make/linux-rpm-build.mk
View file

@ -74,7 +74,7 @@ F_BOOTFILES = $(addsuffix -$(COMPLETE_VERSION),$(addprefix $(TMP_INSTAL
F_CURRENT = $(addprefix CURRENT_, SRC RPM_SRC RPM_RUN_I386 RPM_DEVEL_I386) F_CURRENT = $(addprefix CURRENT_, SRC RPM_SRC RPM_RUN_I386 RPM_DEVEL_I386)
F_ULDONE = $(addsuffix .uldone,$(F_RPMS) $(F_TGZ) $(F_SPM) current) F_ULDONE = $(addsuffix .uldone,$(F_RPMS) $(F_TGZ) $(F_SPM) current)
# note that order matters for F_ULDONE and F_RPMS (remote directory attributes) # note that order matters for F_ULDONE and F_RPMS (remote directory attributes)
KERNEL_INSTALL_PREFIX= $(shell pwd)/$(TMP_INSTALL) KERNEL_INSTALL_PREFIX = $(shell pwd)/$(TMP_INSTALL)
BUILD = sh $(MODDIR)/devutil/jcs/build_linux.sh \ BUILD = sh $(MODDIR)/devutil/jcs/build_linux.sh \
-c config-$(KERNEL_VERSION) \ -c config-$(KERNEL_VERSION) \

81
make/platform.mk
View file

@ -16,15 +16,48 @@ $(eval $(call try_include,$(MODDIR)/make/pre-local.mk))
$(eval $(call try_include,$(TOPDIR)/make/pre-local.mk)) $(eval $(call try_include,$(TOPDIR)/make/pre-local.mk))
$(eval $(call try_include,pre-local.mk)) $(eval $(call try_include,pre-local.mk))
MOD_SCRIPT_DIR := $(firstword $(wildcard $(MODDIR)/scripts $(MODDIR)/bin))
ifndef GET_OS_SH
GET_OS_SH := $(SHELL) $(MOD_SCRIPT_DIR)/get-os.sh
endif
ifndef TARGET ifndef TARGET
ifneq ($(subst mingw,,$(CWD)),$(CWD)) ifneq ($(subst mingw,,$(CWD)),$(CWD))
TARGET := mingw TARGET := mingw
endif endif
endif endif
MOD_SCRIPT_DIR := $(firstword $(wildcard $(MODDIR)/scripts $(MODDIR)/bin)) DEFINE_FROM_TARGET := false
ifndef GET_OS_SH ifdef TARGET
GET_OS_SH := $(SHELL) $(MOD_SCRIPT_DIR)/get-os.sh ifndef TARGET_TUPLE
ifndef TARGET_TRIPLET
DEFINE_FROM_TARGET := true
endif
else ifndef TARGET_TRIPLET
ifndef TARGET_TUPLE
DEFINE_FROM_TARGET := true
endif
endif
ifeq ($(DEFINE_FROM_TARGET),true)
ifeq ($(TARGET),mingw)
TARGET_ARCH ?= i686
TARGET_ABI := mingw32
TARGET_OS ?= w64
else ifeq ($(TARGET),mingw32)
TARGET_ARCH ?= i686
TARGET_ABI := mingw32
TARGET_OS ?= w64
else ifeq ($(TARGET),mingw64)
TARGET_ARCH ?= x86_64
TARGET_ABI := mingw64
TARGET_OS := w64
endif
TARGET_ARCH ?= i686
TARGET_VENDOR ?= unknown
TARGET_OS ?= linux
TARGET_ABI ?= gnu
endif
TARGET_TUPLE := $(TARGET_ARCH)-$(TARGET_VENDOR)-$(TARGET_OS)-$(TARGET_ABI)
endif endif
ifeq ($(HOST_TUPLE),) ifeq ($(HOST_TUPLE),)
@ -45,29 +78,29 @@ else
endif endif
ifneq ($(TARGET_TUPLE),) ifneq ($(TARGET_TUPLE),)
TARGET_TUPLE_WORDS := $(subst -, ,$(TARGET_TUPLE)) TARGET_TUPLE_WORDS ?= $(subst -, ,$(TARGET_TUPLE))
TARGET_ARCH := $(word 1,$(TARGET_TUPLE_WORDS)) TARGET_ARCH ?= $(word 1,$(TARGET_TUPLE_WORDS))
TARGET_VENDOR := $(word 2,$(TARGET_TUPLE_WORDS)) TARGET_VENDOR ?= $(word 2,$(TARGET_TUPLE_WORDS))
TARGET_OS := $(word 3,$(TARGET_TUPLE_WORDS)) TARGET_OS ?= $(word 3,$(TARGET_TUPLE_WORDS))
TARGET_ABI := $(word 4,$(TARGET_TUPLE_WORDS)) TARGET_ABI ?= $(word 4,$(TARGET_TUPLE_WORDS))
TARGET_TRIPLET := $(TARGET_ARCH)-$(TARGET_OS)-$(TARGET_ABI) TARGET_TRIPLET ?= $(TARGET_ARCH)-$(TARGET_OS)-$(TARGET_ABI)
else ifneq ($(TARGET_TRIPLET),) else ifneq ($(TARGET_TRIPLET),)
TARGET_TRIPLET_WORDS := $(subst -, ,$(TARGET_TRIPLET)) TARGET_TRIPLET_WORDS ?= $(subst -, ,$(TARGET_TRIPLET))
TARGET_ARCH := $(word 1,$(TARGET_TRIPLET_WORDS)) TARGET_ARCH ?= $(word 1,$(TARGET_TRIPLET_WORDS))
TARGET_VENDOR := unknown TARGET_VENDOR ?= unknown
TARGET_OS := $(word 2,$(TARGET_TRIPLET_WORDS)) TARGET_OS ?= $(word 2,$(TARGET_TRIPLET_WORDS))
TARGET_ABI := $(word 3,$(TARGET_TRIPLET_WORDS)) TARGET_ABI ?= $(word 3,$(TARGET_TRIPLET_WORDS))
TARGET_TUPLE := $(TARGET_ARCH)-$(TARGET_VENDOR)-$(TARGET_OS)-$(TARGET_ABI) TARGET_TUPLE ?= $(TARGET_ARCH)-$(TARGET_VENDOR)-$(TARGET_OS)-$(TARGET_ABI)
TARGET_TUPLE_WORDS := $(subst -, ,$(TARGET_TUPLE)) TARGET_TUPLE_WORDS ?= $(subst -, ,$(TARGET_TUPLE))
else else
TARGET_TUPLE := $(HOST_TUPLE) TARGET_TUPLE ?= $(HOST_TUPLE)
TARGET_TUPLE_WORDS := $(subst -, ,$(TARGET_TUPLE)) TARGET_TUPLE_WORDS ?= $(subst -, ,$(TARGET_TUPLE))
TARGET_ARCH := $(word 1,$(TARGET_TUPLE_WORDS)) TARGET_ARCH ?= $(word 1,$(TARGET_TUPLE_WORDS))
TARGET_VENDOR := $(word 2,$(TARGET_TUPLE_WORDS)) TARGET_VENDOR ?= $(word 2,$(TARGET_TUPLE_WORDS))
TARGET_OS := $(word 3,$(TARGET_TUPLE_WORDS)) TARGET_OS ?= $(word 3,$(TARGET_TUPLE_WORDS))
TARGET_ABI := $(word 4,$(TARGET_TUPLE_WORDS)) TARGET_ABI ?= $(word 4,$(TARGET_TUPLE_WORDS))
TARGET_TRIPLET := $(TARGET_ARCH)-$(TARGET_OS)-$(TARGET_ABI) TARGET_TRIPLET ?= $(TARGET_ARCH)-$(TARGET_OS)-$(TARGET_ABI)
TARGET_TRIPLET_WORDS := $(subst -, ,$(TARGET_TRIPLET)) TARGET_TRIPLET_WORDS ?= $(subst -, ,$(TARGET_TRIPLET))
endif endif
ifeq ($(TARGET_TUPLE),) ifeq ($(TARGET_TUPLE),)

6
make/projects-dir.mk
View file

@ -6,7 +6,7 @@
# #
# Some of its targets download software from janware GmbH servers. For those, # Some of its targets download software from janware GmbH servers. For those,
# you will need a janware.com user account. Ask admin@janware.com if you want # you will need a janware.com user account. Ask admin@janware.com if you want
# one, then define the JANWARE_USER=<janware user name> environment variable. # one, then define the JANWARE_USER = <janware user name> environment variable.
# #
# Current documentation on how this Makefile is meant to be used can be found # Current documentation on how this Makefile is meant to be used can be found
# under https://janware.com/wiki/pub/en/sw/build/. Running "make doc-module" # under https://janware.com/wiki/pub/en/sw/build/. Running "make doc-module"
@ -83,7 +83,7 @@ endif
export GIT_SSH := $(CVS_RSH) export GIT_SSH := $(CVS_RSH)
ifeq ($(filter pkg-%,$(MAKECMDGOALS)),) 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 endif
ifneq ($(CLONE_FROM_USER),) ifneq ($(CLONE_FROM_USER),)
@ -93,7 +93,7 @@ else
endif endif
ifneq ($(EXCLUDE_FROM_BUILD),) ifneq ($(EXCLUDE_FROM_BUILD),)
PROJECTS_PY_EXTRA_BUILD_OPTS += --exclude "$(EXCLUDE_FROM_BUILD)" PROJECTS_PY_EXTRA_BUILD_OPTS+= --exclude "$(EXCLUDE_FROM_BUILD)"
endif endif
# ------------ external programs II # ------------ external programs II

2
make/py-mod.mk
View file

@ -6,7 +6,7 @@ include $(MODDIR)/make/dev-utils.mk
PY_INIT_TMPL = $(wildcard __init__.py.tmpl) PY_INIT_TMPL = $(wildcard __init__.py.tmpl)
PY_SED_EXTRACT_EXPORT ?= /\(class\|def\) ..*\# *export/ !d; s/\(class\|def\) *//; s/[(:].*// PY_SED_EXTRACT_EXPORT ?= /\(class\|def\) ..*\# *export/ !d; s/\(class\|def\) *//; s/[(:].*//
#leftparen:=( #leftparen := (
#PY_EXPORT ?= $(shell sed '/\(class\|def\) ..*\# *export/ !d; s/\(class\|def\) *//; s/[$(leftparen):].*//' $(PY_SRC_PY)) #PY_EXPORT ?= $(shell sed '/\(class\|def\) ..*\# *export/ !d; s/\(class\|def\) *//; s/[$(leftparen):].*//' $(PY_SRC_PY))
all: $(PY_PYC) all: $(PY_PYC)

2
make/rpmdist.mk
View file

@ -25,7 +25,7 @@ RELEASES_FILE = $(TOPDIR)/RELEASES$(FLAVOUR_SUFFIX)
RELEASES ?= $(shell $(PKG_SH_EXE) version \ RELEASES ?= $(shell $(PKG_SH_EXE) version \
-p $(OS_NAME_VERSION)/$(RPM_ARCH) $(RELEASES_FILE) read | $(SED) 's/-dev//') -p $(OS_NAME_VERSION)/$(RPM_ARCH) $(RELEASES_FILE) read | $(SED) 's/-dev//')
RPMBUILD ?= pkgbuild RPMBUILD ?= pkgbuild
CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true CHECK_CVS_SYNC_BEFORE_RPM_RELEASE?= true
HASH = $(shell $(cvs_files) -z | \ HASH = $(shell $(cvs_files) -z | \
grep -vz "CHANGES\|VERSION\|HASH\|MD5SUMS\|RELEASES" | \ grep -vz "CHANGES\|VERSION\|HASH\|MD5SUMS\|RELEASES" | \
xargs -0 md5sum | md5sum | $(SED) 's/ .*//') xargs -0 md5sum | md5sum | $(SED) 's/ .*//')

8
make/tex.mk
View file

@ -138,11 +138,11 @@ FMT_OUT = $(patsubst %,$(OUT).%.zip,$(FMT))
FMT_OFFLINE_OUT = $(patsubst %,$(OUT).%.zip,$(FMT_OFFLINE)) FMT_OFFLINE_OUT = $(patsubst %,$(OUT).%.zip,$(FMT_OFFLINE))
ALL = $(FMT_OUT) html_install ALL = $(FMT_OUT) html_install
#PRE_HTML = $(patsubst %.tmpl,%,$(wildcard *.html.tmpl)) #PRE_HTML = $(patsubst %.tmpl,%,$(wildcard *.html.tmpl))
#LINETMPL=$(wildcard *.linetmpl) #LINETMPL = $(wildcard *.linetmpl)
#TEXFROMGER=$(patsubst %.ger,%.tex,$(wildcard *.ger)) #TEXFROMGER = $(patsubst %.ger,%.tex,$(wildcard *.ger))
#TMPL=$(wildcard *.tmpl) #TMPL = $(wildcard *.tmpl)
#FILEFROMTMPL = $(patsubst %.tmpl,%,$(TMPL)) #FILEFROMTMPL = $(patsubst %.tmpl,%,$(TMPL))
#GERFROMLINETMPL=$(patsubst %.linetmpl,%,$(wildcard *.linetmpl)) #GERFROMLINETMPL = $(patsubst %.linetmpl,%,$(wildcard *.linetmpl))
#PRE_TEX = $(patsubst %.ger,%.tex,\ #PRE_TEX = $(patsubst %.ger,%.tex,\
# $(patsubst %.tmpl,%,$(wildcard *.tex.tmpl *.ger.tmpl) $(LOCAL_IMPORTED_TEMPLATES)) \ # $(patsubst %.tmpl,%,$(wildcard *.tex.tmpl *.ger.tmpl) $(LOCAL_IMPORTED_TEMPLATES)) \
# $(GERFROMLINETMPL)) $(TEXFROMGER) # $(GERFROMLINETMPL)) $(TEXFROMGER)

2
make/wt-defs.mk
View file

@ -9,7 +9,7 @@ ifeq ($(USE_WT),true)
ifeq ($(USE_WT_HTTPD),true) ifeq ($(USE_WT_HTTPD),true)
PROJECT_LDFLAGS += -lwthttp PROJECT_LDFLAGS += -lwthttp
PROJECT_CFLAGS += -DCONNECTOR_HTTP=YES PROJECT_CFLAGS += -DCONNECTOR_HTTP=YES
PROJECT_CPPFLAGS+= -DCONNECTOR_HTTP=YES PROJECT_CPPFLAGS += -DCONNECTOR_HTTP=YES
endif endif
ifeq ($(USE_WT_DBO),true) ifeq ($(USE_WT_DBO),true)