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 more reordering of compiler flags

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-03-03 14:50:05 +00:00
commit cb87d2b278
2 changed files with 85 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

23
make/defs.mk
View file

@ -22,10 +22,18 @@ endif
ifndef GREP
GREP := $(shell $(WHICH) grep)
endif
ifndef ECHO
ECHO := $(shell $(WHICH) echo)
endif
ifndef TEST
TEST := $(shell $(WHICH) test)
endif
ifndef SED
SED := $(shell $(WHICH) sed)
endif
ifndef CAT
CAT := $(shell $(WHICH) cat)
endif
ifndef BROWSER
BROWSER := $(shell $(WHICH) xdg-open)
endif
@ -135,10 +143,10 @@ endif
define install_links
cwd="$(CWD)"; \
echo "o in $(INSTALL_$(1)DIR):" ;\
$(ECHO) "o in $(INSTALL_$(1)DIR):" ;\
for f in $(notdir $(INSTALLED_$(1))); do \
cd $(INSTALL_$(1)DIR); \
echo " $(SUDO) ln -sf $$cwd/$$f" ; \
$(ECHO) " $(SUDO) ln -sf $$cwd/$$f" ; \
$(SUDO) ln -sf $$cwd/$$f; \
done;
endef
@ -147,7 +155,7 @@ endef
# ----- standard variables
ifeq ($(PROJECT),)
PROJECT := $(shell echo $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(realpath $(TOPDIR)))) | $(SED) 's/-[0-9].*//')
PROJECT := $(shell $(ECHO) $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(realpath $(TOPDIR)))) | $(SED) 's/-[0-9].*//')
endif
ifneq ($(wildcard $(TOPDIR)/.git),)
@ -161,6 +169,9 @@ endif
ifndef BUILD_USER
BUILD_USER := $(shell $(ID) -un)
endif
ifndef BUILD_GROUP
BUILD_GROUP := $(shell $(ID) -gn)
endif
JANWARE_USER ?= $(BUILD_USER)
export JANWARE_USER
ifndef FULL_NAME
@ -204,7 +215,7 @@ endif
PROJECT_DESCR_FILE ?= $(wildcard $(TOPDIR)/make/project.conf)
PROJECT_SHORT_NAME ?= $(PROJECT)
PROJECT_CAPNAME := $(shell echo $(PROJECT) | tr [a-z] [A-Z] | $(SED) 's/-/_/g')
PROJECT_CAPNAME := $(shell $(ECHO) $(PROJECT) | tr [a-z] [A-Z] | $(SED) 's/-/_/g')
PROJECT_DESCR ?= $(call proj_query, summary $(PROJECT))
PROJECT_SUMMARY ?= $(PROJECT_DESCR)
@ -220,9 +231,9 @@ ifeq ($(VERSION),)
endif
endif
DIST_VERSION ?= $(patsubst %-dev,%,$(VERSION))
HEX_VERSION := $(shell echo $(DIST_VERSION) | \
HEX_VERSION := $(shell $(ECHO) $(DIST_VERSION) | \
$(SED) 's/-dev//; s/pre[^\.]*//; s/F[^\.]//; s/[\.-]/ /g' | $(XARGS) $(PRINTF) "0x%02x%02x%02x%02x")
BINARY_VERSION := $(shell echo $(PROJECT)_$(DIST_VERSION) | tr [a-z] [A-Z] | $(SED) 's/-[^-]*$$//; s/-/_/g')
BINARY_VERSION := $(shell $(ECHO) $(PROJECT)_$(DIST_VERSION) | tr [a-z] [A-Z] | $(SED) 's/-[^-]*$$//; s/-/_/g')
WINVERSION = $(subst .,_,$(VERSION))
LOCAL_VERSION = $(VERSION)
LOCAL_WINVERSION = $(subst .,_,$(VERSION))