janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

defs.mk / defs-cpp.mk: Some reordering of variables

Browse source 
Reordered some variables in defs.mk and defs-cpp.mk for clarity. Most notably
FULL_NAME was moved back into defs.mk, which amounts to a bugfix.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-03-01 11:03:23 +00:00
commit 8bb94c6f57
3 changed files with 32 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

22
make/defs-cpp.mk
View file

@ -19,29 +19,17 @@ else ifeq ($(ARCH),aarch64)
PROJECT_LDFLAGS +=
endif
BUILD_USER := $(shell id -un)
JANWARE_USER ?= $(BUILD_USER)
JANWARE_CLIENT ?= jw
JANWARE_WIKI ?= $(JANWARE_CLIENT)
JANWARE_URL_DOC_MODULE ?= https://janware.com/wiki/$(JANWARE_WIKI)/assets/types/data/sw/$(PROJECT)/$(notdir $(CWD))
JANWARE_URL_DOC_PROJECT ?= https://janware.com/wiki/$(JANWARE_WIKI)/assets/types/data/sw/$(PROJECT)/$(PROJECT)
PKG_VENDOR ?= janware GmbH
FULL_NAME := $(shell $(ID) -nu | $(XARGS) $(GETENT) passwd | $(CUT) -d: -f5)
USE_PROJECT_LIB ?= true
EXPORT_PROJECT_LIB ?= $(USE_PROJECT_LIB)
USE_JW_BUILD ?= true
USE_EXCEPTIONS_IN_C ?= true
REENTRANT ?= true
export REENTRANT
ifeq ($(DEVELOPMENT),true)
export G_SLICE=always-malloc
export G_DEBUG=gc-friendly,resident-modules
export MALLOC_CHECK_=2
endif
USE_PROJECT_LIB ?= true
EXPORT_PROJECT_LIB ?= $(USE_PROJECT_LIB)
USE_JW_BUILD ?= true
USE_EXCEPTIONS_IN_C ?= true
USE_COMPILER_OPTIMIZATION_OPTS = false
USE_COMPILER_DEBUG_OPTS = true
COMPILE_DEBUG_CODE = true