From adfdec749287ef45f8fdb31f47ee8878ccf0b0f4 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Wed, 2 May 2012 17:55:14 +0000
Subject: [PATCH] defs.mk.in: Do all -DVERSION_STR handling

Push -DVERSION_STR from main.mk and yapp.mk into defs.mk.in.
---
 make/defs.mk | 4 ++--
 make/main.mk | 3 +--
 make/yapp.mk | 2 --
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/make/defs.mk b/make/defs.mk
index a6181ee1..d644942f 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -147,8 +147,8 @@ SYSCFG_FILE           ?= $(SYSCFG_DIR)/$(PROJECT)
 endif
 OPTS_PID_FILE         ?= $(PIDDIR)/$(PROJECT).pid
 
-BUILD_CFLAGS          += -DVERSION=$(HEX_VERSION)
-BUILD_CPPFLAGS        += -DVERSION=$(HEX_VERSION)
+BUILD_CFLAGS          += -DVERSION=$(HEX_VERSION) -DVERSION_STR=\"$(VERSION)\"
+BUILD_CPPFLAGS        += -DVERSION=$(HEX_VERSION) -DVERSION_STR=\"$(VERSION)\"
 
 ifeq ($(TARGET),mingw)
  ifneq ($(wildcard /usr/bin/i686-w64-mingw32-gcc),)
diff --git a/make/main.mk b/make/main.mk
index 8d58ac1e..060afbaf 100644
--- a/make/main.mk
+++ b/make/main.mk
@@ -1,6 +1,5 @@
 EXE              =  $(PROJECT)
-LOCAL_CFLAGS    += -DVERSION_STR=\"$(VERSION)\"
-LOCAL_CPPFLAGS  += -DVERSION_STR=\"$(VERSION)\"
+
 ifneq ($(TARGET),mingw)
 LOCAL_LDFLAGS   += -rdynamic
 endif
diff --git a/make/yapp.mk b/make/yapp.mk
index 4ae6de5d..1e0af555 100644
--- a/make/yapp.mk
+++ b/make/yapp.mk
@@ -2,8 +2,6 @@ LOCAL_CPP        += main.cpp
 YAPP_CLASS       ?= $(firstword $(basename $(wildcard YApp*.h Y*.h *.h)))
 YAPP_CLASS_H     ?= $(firstword $(wildcard $(addsuffix /$(YAPP_CLASS).h,\
 	$(subst -I,,$(INCLUDE)))) $(YAPP_CLASS).h)
-LOCAL_CFLAGS    += -DVERSION_STR=\"$(VERSION)\"
-LOCAL_CPPFLAGS  += -DVERSION_STR=\"$(VERSION)\"
 
 ifneq ($(TARGET),mingw)
 LOCAL_LDFLAGS   += -rdynamic