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

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>

make/defs-cpp.mk

@@ -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

make/defs.mk

@@ -7,12 +7,6 @@ JW_BUILD_DEF_MK_INCLUDED = true
 
 MAKEFLAGS             += -r
 
-define try_include
-  ifneq ($(wildcard $(1)),)
-    include $(1)
-  endif
-endef
-
 ifneq ($(wildcard $(MODDIR)/make/.cache.mk),)
   include $(MODDIR)/make/.cache.mk
 endif
@@ -168,17 +162,36 @@ endef
 
 
 # ----- standard variables
+
+ifeq ($(PROJECT),)
+  PROJECT             := $(shell echo $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(realpath $(TOPDIR)))) | $(SED) 's/-[0-9].*//')
+endif
+
 ifneq ($(wildcard $(TOPDIR)/.git),)
   VCS                 ?= git
 else ifneq ($(wildcard $(TOPDIR)/CVS),)
   VCS                 ?= cvs
 endif
 
-CVSTOPDIR             ?= $(PROJECTS_DIR)/..
+# ----- user and organization
 
-ifeq ($(PROJECT),)
+ifndef BUILD_USER
-  PROJECT             := $(shell echo $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(realpath $(TOPDIR)))) | $(SED) 's/-[0-9].*//')
+  BUILD_USER          := $(shell $(ID) -un)
 endif
+JANWARE_USER          ?= $(BUILD_USER)
+export JANWARE_USER
+ifndef FULL_NAME
+  FULL_NAME           := $(shell $(ID) -nu | $(XARGS) $(GETENT) passwd | $(CUT) -d: -f5)
+endif
+
+JANWARE_CLIENT        ?= jw
+CUSTOMER              ?= $(JANWARE_CLIENT)
+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)
+PUBLIC_PATH_DEVEL_DOC  = /doc/devel
+UPLOAD_URL_DEVEL_DOC   = rsync_ssh://$(JANWARE_USER)@janware.com:/srv/dav/pub/clients/$(JANWARE_CLIENT)/$(PUBLIC_PATH_DEVEL_DOC)
+PKG_VENDOR            ?= janware GmbH
 
 # ----- host and target variables
 
@@ -210,9 +223,9 @@ else
   TARGET_TRIPLET      := $(TARGET_ARCH)-$(TARGET_OS)-$(TARGET_ABI)
 endif
 
-#ifeq ($(TARGET_TUPLE),)
+ifeq ($(TARGET_TUPLE),)
-#  $(error TARGET_TUPLE is undefined)
+  $(error TARGET_TUPLE is empty)
-#endif
+endif
 
 # - support legacy jw-build target variables
 ifeq ($(TARGET_ABI),mingw32)
@@ -299,7 +312,6 @@ PROJECT_SHORT_NAME    ?= $(PROJECT)
 PROJECT_CAPNAME       := $(shell echo $(PROJECT) | tr [a-z] [A-Z] | $(SED) 's/-/_/g')
 PROJECT_DESCR         ?= $(call proj_query, summary $(PROJECT))
 PROJECT_SUMMARY       ?= $(PROJECT_DESCR)
-CUSTOMER              ?= jannet
 
 ifneq ($(PROJECT_DESCR_FILE),)
   ifeq ($(shell $(GREP) "^ *subpackages *=.*devel" $(PROJECT_DESCR_FILE)),)
@@ -332,6 +344,7 @@ MAJOR_MINOR_RELEASE    = $(MAJOR_VERSION).$(MINOR_VERSION).$(RELEASE_VERSION)
 CVS_RSH               ?= /usr/bin/ssh
 
 # ----- input dirs
+
 JW_BUILD_DIR           = $(MODDIR)
 PROJECT_STEM           = $(PROJECT)-$(DIST_VERSION)
 
@@ -351,9 +364,6 @@ HDRDIR_SCOPE_SUFFIX   ?= $(PROJECT)
 CONTRIB_MOD           += $(addprefix contrib/,$(CONTRIB_LIBS))
 REQUIRED              := $(CONTRIB_MOD) $(REQUIRED)
 
-PUBLIC_PATH_DEVEL_DOC  = /proj/devel-docs
-UPLOAD_URL_DEVEL_DOC   = rsync_ssh://root@feitnix.jannet.de:/srv/www/htdocs/jannet.de_443/$(PUBLIC_PATH_DEVEL_DOC)
-
 ifeq ($(DEVELOPMENT),true)
   -include $(MODDIR)/make/defs-dev.mk
   ifneq ($(wildcard $(TOPDIR)/make/cfg_dev.mk),)

make/make.mk

@@ -7,7 +7,7 @@ include $(MODDIR)/make/defs.mk
 include $(MODDIR)/make/defs-dirs.mk
 
 CACHED_FILES      ?= $(VERSION_FILE) $(wildcard $(TOPDIR)/make/project.conf)
-CACHED_VARS       ?= PROJECT PREREQ VERSION HEX_VERSION
+CACHED_VARS       ?= PROJECT PREREQ VERSION HEX_VERSION FULL_NAME
 
 include $(MODDIR)/make/cache.mk