From 9b61381a618a70a12d39f7133b3b657ed8b7e0be Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Sat, 30 Jun 2007 11:18:14 +0000
Subject: [PATCH] defs.mk: Fix compilation with ytools

  - Add $(MODDIR)/include to CFLAGS if $(USE_YTOOLS) = true
  - Ignore F.* (as in dsp stuff) in version string
---
 make/defs.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/make/defs.mk b/make/defs.mk
index 1676b559..94a547d8 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -10,7 +10,7 @@ CUSTOMER              ?= No customer
 VERSION               ?= $(shell cat $(TOPDIR)/VERSION)
 DIST_VERSION          ?= $(shell sed -e "s/-dev//" $(TOPDIR)/VERSION)
 HEX_VERSION            = $(shell echo $(DIST_VERSION) | \
-	sed 's/-dev//; s/pre[^\.]*//; 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")
 DEVELOPMENT           ?= $(shell grep -q 'dev' $(TOPDIR)/VERSION && echo true)
 USE_PROJECT_LIB       ?= true
 USE_YTOOLS            ?= true
@@ -296,6 +296,8 @@ ifeq ($(USE_PROJECT_LIB),true)
 endif
 
 ifeq ($(USE_YTOOLS),true)
+	CFLAGS                += -I$(MODDIR)/include
+	CPPFLAGS              += -I$(MODDIR)/include
 	PROJECTLIB_LDFLAGS    += -lytools -L$(MODDIR)/lib
 	LD_LIB_PATH           += $(MODDIR)/lib
 endif