From e2ab91fd4122ded004df1df22557d729aa76026e Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Fri, 19 Jun 2015 11:20:42 +0000
Subject: [PATCH] defs.mk: Prepared defs.mk.in for removing project-specific
 definitions

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/defs.mk | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/make/defs.mk b/make/defs.mk
index c8d5ce52..13829002 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -2,6 +2,8 @@
 # contact@jannet.de
 # $Id$
 
+# SHELL = $(MOD_SCRIPT_DIR)/timed-make-shell.sh
+
 ifndef YTOOLS_DEF_MK_INCLUDED
 YTOOLS_DEF_MK_INCLUDED = true
 include $(MODDIR)/make/platform.mk
@@ -26,7 +28,8 @@ CAT                    = /bin/cat
 SHELL                  = /bin/bash
 
 # ----- 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)
 MOD_SCRIPT_DIR        ?= $(MODDIR)/devutil/scripts
 else
@@ -75,7 +78,7 @@ PROJECT_DESCR         ?= No description
 CUSTOMER              ?= jannet
 
 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))
 HEX_VERSION            = $(shell echo $(DIST_VERSION) | \
 	$(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_DEVEL        += $(FLAVOUR_PREFIX)dspider-cconsole-devel = $(CCONSOLE_VERSION)
 INCLUDE                   += -I$(CCONSOLE_DIR)/include
-ifeq ($(DEVELOPMENT),true)
-LIBFLAGS                  += -L$(CCONSOLE_DIR)/lib
-else
-# 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
-endif
+ ifeq ($(DEVELOPMENT),true)
+ LIBFLAGS                 += -L$(CCONSOLE_DIR)/lib
+ else
+ # 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
+ endif
 LIBFLAGS                  += -ldspider-cconsole
 EXE_SEARCH_PATH           += $(CCONSOLE_DIR)/bin
 PREREQ                    += CCONSOLE
@@ -1698,16 +1701,16 @@ PREREQ                    += DSPTOOLS
 endif
 
 ifneq ($(filter ytools,$(PREREQ_BUILD)),)
-ifneq ($(PROJECT),ytools)
-YTOOLS_DIR                 = $(firstword $(wildcard $(CVS_PROJ_DIR)/ytools /opt/$(FLAVOUR_PATH_PREFIX)ytools))
-else
-YTOOLS_DIR                 = $(TOPDIR)
-endif
-YTOOLS_VERSION             = $(call version,$(YTOOLS_DIR))
-ifneq ($(PROJECT),ytools)
-RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)ytools-run = $(YTOOLS_VERSION)
-RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)ytools-devel = $(YTOOLS_VERSION)
-endif
+ ifneq ($(PROJECT),ytools)
+ YTOOLS_DIR                 = $(firstword $(wildcard $(CVS_PROJ_DIR)/ytools /opt/$(FLAVOUR_PATH_PREFIX)ytools))
+ else
+ YTOOLS_DIR                 = $(TOPDIR)
+ endif
+ YTOOLS_VERSION             = $(call version,$(YTOOLS_DIR))
+ ifneq ($(PROJECT),ytools)
+ RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)ytools-run = $(YTOOLS_VERSION)
+ RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)ytools-devel = $(YTOOLS_VERSION)
+ endif
 INCLUDE                   += -I$(YTOOLS_DIR)/include
 LIBFLAGS                  += -L$(YTOOLS_DIR)/lib -lytools
 EXE_SEARCH_PATH           += $(YTOOLS_DIR)/bin