janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-21 05:47:38 +01:00
Code Activity

defs.mk: Prepared defs.mk.in for removing project-specific definitions

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2015-06-19 11:20:42 +00:00
commit e2ab91fd41
1 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

39
make/defs.mk
View file

@ -2,6 +2,8 @@
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
# SHELL = $(MOD_SCRIPT_DIR)/timed-make-shell.sh
ifndef YTOOLS_DEF_MK_INCLUDED ifndef YTOOLS_DEF_MK_INCLUDED
YTOOLS_DEF_MK_INCLUDED = true YTOOLS_DEF_MK_INCLUDED = true
include $(MODDIR)/make/platform.mk include $(MODDIR)/make/platform.mk
@ -26,7 +28,8 @@ CAT = /bin/cat
SHELL = /bin/bash SHELL = /bin/bash
# ----- standard variables # ----- standard variables
PROJECT ?= $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(shell cd $(TOPDIR); pwd | $(SED) 's/.*\///; s/-[0-9].*//'))) #PROJECT ?= $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(shell cd $(TOPDIR); pwd | $(SED) 's/.*\///; s/-[0-9].*//')))
PROJECT := $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(shell cd $(TOPDIR); pwd | $(SED) 's/.*\///; s/-[0-9].*//')))
ifeq ($(PROJECT),ytools) ifeq ($(PROJECT),ytools)
MOD_SCRIPT_DIR ?= $(MODDIR)/devutil/scripts MOD_SCRIPT_DIR ?= $(MODDIR)/devutil/scripts
else else
@ -75,7 +78,7 @@ PROJECT_DESCR ?= No description
CUSTOMER ?= jannet CUSTOMER ?= jannet
VERSION_FILE ?= $(firstword $(wildcard VERSION $(TOPDIR)/VERSION)) VERSION_FILE ?= $(firstword $(wildcard VERSION $(TOPDIR)/VERSION))
VERSION ?= $(shell $(CAT) $(VERSION_FILE)) VERSION := $(shell $(CAT) $(VERSION_FILE))
DIST_VERSION ?= $(shell $(SED) -e "s/-dev//" $(VERSION_FILE)) DIST_VERSION ?= $(shell $(SED) -e "s/-dev//" $(VERSION_FILE))
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") $(SED) 's/-dev//; s/pre[^\.]*//; s/F[^\.]//; s/[\.-]/ /g' | xargs printf "0x%02x%02x%02x%02x")
@ -1078,12 +1081,12 @@ CCONSOLE_VERSION = $(call version,$(CCONSOLE_DIR))
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-cconsole-run = $(CCONSOLE_VERSION) RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-cconsole-run = $(CCONSOLE_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-cconsole-devel = $(CCONSOLE_VERSION) RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-cconsole-devel = $(CCONSOLE_VERSION)
INCLUDE += -I$(CCONSOLE_DIR)/include INCLUDE += -I$(CCONSOLE_DIR)/include
ifeq ($(DEVELOPMENT),true) ifeq ($(DEVELOPMENT),true)
LIBFLAGS += -L$(CCONSOLE_DIR)/lib LIBFLAGS += -L$(CCONSOLE_DIR)/lib
else else
# this is actually redundant to a definition in proj/dspc/src/cconsole/make/cfg_dist.mk: # this is actually redundant to a definition in proj/dspc/src/cconsole/make/cfg_dist.mk:
LIBFLAGS += -L$(ENV_PREFIX)/opt/$(FLAVOUR_PATH_PREFIX)dspider/feedfs/bin LIBFLAGS += -L$(ENV_PREFIX)/opt/$(FLAVOUR_PATH_PREFIX)dspider/feedfs/bin
endif endif
LIBFLAGS += -ldspider-cconsole LIBFLAGS += -ldspider-cconsole
EXE_SEARCH_PATH += $(CCONSOLE_DIR)/bin EXE_SEARCH_PATH += $(CCONSOLE_DIR)/bin
PREREQ += CCONSOLE PREREQ += CCONSOLE
@ -1698,16 +1701,16 @@ PREREQ += DSPTOOLS
endif endif
ifneq ($(filter ytools,$(PREREQ_BUILD)),) ifneq ($(filter ytools,$(PREREQ_BUILD)),)
ifneq ($(PROJECT),ytools) ifneq ($(PROJECT),ytools)
YTOOLS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/ytools /opt/$(FLAVOUR_PATH_PREFIX)ytools)) YTOOLS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/ytools /opt/$(FLAVOUR_PATH_PREFIX)ytools))
else else
YTOOLS_DIR = $(TOPDIR) YTOOLS_DIR = $(TOPDIR)
endif endif
YTOOLS_VERSION = $(call version,$(YTOOLS_DIR)) YTOOLS_VERSION = $(call version,$(YTOOLS_DIR))
ifneq ($(PROJECT),ytools) ifneq ($(PROJECT),ytools)
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)ytools-run = $(YTOOLS_VERSION) RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)ytools-run = $(YTOOLS_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)ytools-devel = $(YTOOLS_VERSION) RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)ytools-devel = $(YTOOLS_VERSION)
endif endif
INCLUDE += -I$(YTOOLS_DIR)/include INCLUDE += -I$(YTOOLS_DIR)/include
LIBFLAGS += -L$(YTOOLS_DIR)/lib -lytools LIBFLAGS += -L$(YTOOLS_DIR)/lib -lytools
EXE_SEARCH_PATH += $(YTOOLS_DIR)/bin EXE_SEARCH_PATH += $(YTOOLS_DIR)/bin