janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-28 07:43:55 +01:00
Code Activity

defs.mk: Code beautification

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-03-09 11:49:40 +00:00
commit e66aa18e3f
1 changed files with 8 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

34
make/defs.mk
View file

@ -110,30 +110,12 @@ endif
# ----- function definitions # ----- function definitions
reverse = $(if $(wordlist 2,2,$(1)),$(call reverse,$(wordlist 2,$(words $(1)),$(1))) $(firstword $(1)),$(1)) reverse = $(if $(wordlist 2,2,$(1)),$(call reverse,$(wordlist 2,$(words $(1)),$(1))) $(firstword $(1)),$(1))
make_subdirs = set -e; for D in $(SUBDIRS) ; do make -C $$D ; done
define make_subdirs make_subdirs_target = set -e; for D in $(SUBDIRS) ; do make -C $$D $@; done
set -e; for D in $(SUBDIRS) ; do make -C $$D ; done install_local_cfg = $(INSTALL) -p -o $(CFGOWNER) -g $(CFGGROUP) -m $(CFGMODE) $< $@
endef cvs_files = sh $(MOD_SCRIPT_DIR)/scm.sh ls-files -f
add_flavour_prefix = $(SED) "s/\([^ ][^ ]*\) *\([<>=]*\) *\([^ ]*\)/$(FLAVOUR_PREFIX)\1 \2 \3/g"
define make_subdirs_target beautify_lib_path = $(SED) 's/:/\n + /g'
set -e; for D in $(SUBDIRS) ; do make -C $$D $@; done
endef
define install_local_cfg
$(INSTALL) -p -o $(CFGOWNER) -g $(CFGGROUP) -m $(CFGMODE) $< $@
endef
define cvs_files
sh $(MOD_SCRIPT_DIR)/scm.sh ls-files -f
endef
define add_flavour_prefix
$(SED) "s/\([^ ][^ ]*\) *\([<>=]*\) *\([^ ]*\)/$(FLAVOUR_PREFIX)\1 \2 \3/g"
endef
define beautify_lib_path
$(SED) 's/:/\n + /g'
endef
ifeq ($(INCLUDE_REV_IN_VERSIONS),true) ifeq ($(INCLUDE_REV_IN_VERSIONS),true)
version = $(shell $(CAT) $1/VERSION | $(SED) 's/-dev//; s/[ ]*//g') version = $(shell $(CAT) $1/VERSION | $(SED) 's/-dev//; s/[ ]*//g')
@ -273,12 +255,12 @@ REQUIRED := $(CONTRIB_MOD) $(REQUIRED)
ifeq ($(DEVELOPMENT),true) ifeq ($(DEVELOPMENT),true)
-include $(MODDIR)/make/defs-dev.mk -include $(MODDIR)/make/defs-dev.mk
ifneq ($(wildcard $(TOPDIR)/make/cfg_dev.mk),) ifneq ($(wildcard $(TOPDIR)/make/cfg_dev.mk),)
-include $(TOPDIR)/make/cfg_dev.mk include $(TOPDIR)/make/cfg_dev.mk
endif endif
else else
-include $(MODDIR)/make/defs-dist.mk -include $(MODDIR)/make/defs-dist.mk
ifneq ($(wildcard $(TOPDIR)/make/cfg_dist.mk),) ifneq ($(wildcard $(TOPDIR)/make/cfg_dist.mk),)
-include $(TOPDIR)/make/cfg_dist.mk include $(TOPDIR)/make/cfg_dist.mk
endif endif
endif endif