janware/jw-pkg
Watch
1
Code Pull requests Activity Actions

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 2082 additions and 2049 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 := 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
#CACHED_VARS += TARGET_ARCH
#CACHED_VARS += DEVELOPMENT
include $(TOPDIR)/make/proj.mk

32
make/defs-cpp.mk
View file

@ -24,9 +24,9 @@ ifeq ($(findstring $(TARGET_OS),linux),)
endif
ifeq ($(DEVELOPMENT),true)
export G_SLICE=always-malloc
export G_DEBUG=gc-friendly,resident-modules
export MALLOC_CHECK_=2
export G_SLICE = always-malloc
export G_DEBUG = gc-friendly,resident-modules
export MALLOC_CHECK_ = 2
endif
USE_PROJECT_LIB ?= true
@ -126,7 +126,7 @@ ifeq ($(COMPILER_SUITE),gcc)
STRIP ?= $(TC_BIN_PREFIX)strip
RANLIB ?= $(TC_BIN_PREFIX)ranlib
AR ?= $(TC_BIN_PREFIX)ar
PKG_CONFIG ?= $(TC_BIN_PREFIX)pkg-config
PKG_CONFIG_EXE ?= $(TC_BIN_PREFIX)pkg-config
# compiler and linker
# gcc
@ -138,7 +138,7 @@ ifeq ($(COMPILER_SUITE),gcc)
# Not needed anywhere
#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_MINOR := $(word 2,$(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)
BUILD_CFLAGS += -D_DEVELOPMENT_
BUILD_CPPFLAGS+= -D_DEVELOPMENT_
BUILD_CPPFLAGS += -D_DEVELOPMENT_
endif
CORE += $(filter-out $(wildcard *.intern-state*),$(wildcard core core.* vgcore vgcore.*))
ifeq ($(GCC_MAJOR),4)
BUILD_CFLAGS += -DGCC_HASCLASSVISIBILITY
BUILD_CPPFLAGS+= -DGCC_HASCLASSVISIBILITY
BUILD_CPPFLAGS += -DGCC_HASCLASSVISIBILITY
endif
ifeq ($(USE_QT),true)
@ -266,7 +266,7 @@ GENERATE_FUNC_TIMERS = $(MODDIR)/YStopWatchThreadList/generate_func_timers.sh
ifeq ($(LOG_THREAD_NAMES), true)
BUILD_CFLAGS += -DSLOG_THREAD_NAMES
BUILD_CPPFLAGS+= -DSLOG_THREAD_NAMES
BUILD_CPPFLAGS += -DSLOG_THREAD_NAMES
endif
# ----- standard features, switched on with USE_XXX = true
@ -291,9 +291,9 @@ ifneq ($(filter jw-build,$(PREREQ_BUILD)),)
endif
ifeq ($(USE_SYSTEMD),true)
BUILD_CFLAGS += -D_USE_SYSTEMD_ $(shell $(PKG_CONFIG) --cflags libsystemd)
BUILD_CPPFLAGS += -D_USE_SYSTEMD_ $(shell $(PKG_CONFIG) --cflags libsystemd)
BUILD_LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd)
BUILD_CFLAGS += -D_USE_SYSTEMD_ $(shell $(PKG_CONFIG_EXE) --cflags libsystemd)
BUILD_CPPFLAGS += -D_USE_SYSTEMD_ $(shell $(PKG_CONFIG_EXE) --cflags libsystemd)
BUILD_LDFLAGS += $(shell $(PKG_CONFIG_EXE) --libs libsystemd)
endif
ifeq ($(USE_TIMER),true)
@ -302,8 +302,8 @@ ifeq ($(USE_TIMER),true)
endif
ifeq ($(USE_FAST_LOG),false)
BUILD_CFLAGS +=-D_USE_FAST_LOG_=0
BUILD_CPPFLAGS +=-D_USE_FAST_LOG_=0
BUILD_CFLAGS += -D_USE_FAST_LOG_=0
BUILD_CPPFLAGS += -D_USE_FAST_LOG_=0
endif
ifeq ($(USE_YAMD),true)
@ -486,9 +486,9 @@ ifeq ($(USE_FFTW),true)
endif
ifeq ($(USE_GLIB),true)
PROJECT_CFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0)
PROJECT_CPPFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0)
LIBFLAGS += $(shell $(PKG_CONFIG) --libs glib-2.0)
PROJECT_CFLAGS += $(shell $(PKG_CONFIG_EXE) --cflags glib-2.0)
PROJECT_CPPFLAGS += $(shell $(PKG_CONFIG_EXE) --cflags glib-2.0)
LIBFLAGS += $(shell $(PKG_CONFIG_EXE) --libs glib-2.0)
endif
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
LOGROT_DIR ?= $(ENV_PREFIX)$(HOME)/etc/logrotate.d
APACHE_CONF_DIR ?= $(ENV_PREFIX)$(HOME)/etc/apache/conf.d
APACHE_VHOSTS_DIR?= $(ENV_PREFIX)$(HOME)/etc/apache/vhosts.d
APACHE_SNIPPETS_DIR?= $(ENV_PREFIX)$(HOME)/etc/apache/snippets.d
APACHE_VHOSTS_DIR ?= $(ENV_PREFIX)$(HOME)/etc/apache/vhosts.d
APACHE_SNIPPETS_DIR ?= $(ENV_PREFIX)$(HOME)/etc/apache/snippets.d
RSYSLOG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/rsyslog.d
IMG_PREFIX ?= $(PREFIX)
LOG_PREFIX ?= $(PREFIX)/log
@ -53,7 +53,7 @@ CGI_DIR ?= $(PROJECT_HTMLDIR)/cgi-bin
LOGID ?= $(shell $(ECHO) $(BUILD_USER) | cut -c1-2)-$(PROJECT)
DAEMON_RUN_USER ?= $(BUILD_USER)
DAEMON_RUN_GROUP ?= $(BUILD_GROUP)
CATCH_ONLY_YERROR?= true
CATCH_ONLY_YERROR ?= true
# -- file attributes
EXEOWNER ?= $(BUILD_USER)
@ -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
ifeq ($(TARGET),mingw)
USE_STACK_PROTECTOR ?= false
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
LOGROT_DIR ?= $(ENV_PREFIX)/etc/logrotate.d
APACHE_CONF_DIR ?= $(ENV_PREFIX)/etc/jw-apache/conf.d
APACHE_VHOSTS_DIR?= $(ENV_PREFIX)/etc/jw-apache/vhosts.d
APACHE_SNIPPETS_DIR?= $(ENV_PREFIX)/etc/jw-apache/snippets.d
APACHE_VHOSTS_DIR ?= $(ENV_PREFIX)/etc/jw-apache/vhosts.d
APACHE_SNIPPETS_DIR ?= $(ENV_PREFIX)/etc/jw-apache/snippets.d
RSYSLOG_DIR ?= $(ENV_PREFIX)/etc/rsyslog.d
IMG_PREFIX ?= $(PREFIX)
LOG_PREFIX ?= $(ENV_PREFIX)/var/log
@ -53,7 +53,7 @@ CGI_DIR ?= $(PROJECT_HTMLDIR)/cgi-bin
LOGID ?= $(PROJECT)
DAEMON_RUN_USER ?= root
DAEMON_RUN_GROUP ?= root
CATCH_ONLY_YERROR?= false
CATCH_ONLY_YERROR ?= false
# -- file attributes
EXEOWNER ?= root
@ -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_STACK_PROTECTOR ?= 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)
ifneq ($(PROJECT_DESCR_FILE),)
ifeq ($(shell $(GREP) "^ *subpackages *=.*devel" $(PROJECT_DESCR_FILE)),)
ifeq ($(shell $(GREP) "^ *subpackages * = .*devel" $(PROJECT_DESCR_FILE)),)
CREATE_DEVEL = false
endif
endif

2
make/dev-utils.mk
View file

@ -1,7 +1,7 @@
ifndef DEV_UTILS_MK_INCLUDED
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_ROOT ?= .

4
make/dist.mk
View file

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

2
make/gettext.mk
View file

@ -50,7 +50,7 @@ edit: merge $(GETTEXT_PROJECT_POT)
mv $@.tmp $@
#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
#msgfmt --check --verbose --output-file ./es_MX.utf8/LC_MESSAGES/$(PROJECT).mo $(PROJECT)_spanish.po

Some files were not shown because too many files have changed in this diff Show more