From 31ead7a0c527dc79448d600e71c22c26aafba380 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 16 Nov 2014 13:41:13 +0000 Subject: [PATCH] yapp.mk: Add support for YAPP_INCLUDE_DIR Signed-off-by: Jan Lindemann --- make/yapp.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/make/yapp.mk b/make/yapp.mk index 43e79f58..def6e8ab 100644 --- a/make/yapp.mk +++ b/make/yapp.mk @@ -1,7 +1,9 @@ SRC_ALL_CPP += main.cpp -YAPP_CLASS ?= $(firstword $(basename $(wildcard YApp*.h Y*.h *.h))) +YAPP_INCLUDE_DIR ?= . +YAPP_CLASS ?= $(firstword $(basename $(notdir $(wildcard $(addprefix \ + $(YAPP_INCLUDE_DIR)/, YApp*.h Y*.h *.h))))) YAPP_CLASS_H ?= $(firstword $(wildcard $(addsuffix /$(YAPP_CLASS).h,\ - $(subst -I,,$(INCLUDE)))) $(YAPP_CLASS).h) + $(YAPP_INCLUDE_DIR) $(subst -I,,$(INCLUDE)))) $(YAPP_CLASS).h) YAPP_NAMESPACE ?= ifneq ($(TARGET),mingw)