janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-27 23:43:54 +01:00
Code Activity

make: Clean-indented makefiles

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-03-17 16:24:26 +00:00
commit 68f25261ba
6 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/defs-dev.mk
View file

@ -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_DISABLE_COMPILER_OPTIMISATION_OPTS ?= true USE_DISABLE_COMPILER_OPTIMISATION_OPTS ?= true
ifeq ($(TARGET),mingw) ifeq ($(TARGET),mingw)
USE_STACK_PROTECTOR ?= false USE_STACK_PROTECTOR ?= false

2
make/defs-dist.mk
View file

@ -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_DISABLE_COMPILER_OPTIMISATION_OPTS ?= false USE_DISABLE_COMPILER_OPTIMISATION_OPTS ?= false
USE_STACK_PROTECTOR ?= true USE_STACK_PROTECTOR ?= true
#USE_STACK_CHECKER ?= true #USE_STACK_CHECKER ?= true

4
make/projects-dir.mk
View file

@ -84,7 +84,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),)
@ -94,7 +94,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/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/ .*//')