From b87df0be4cada85031eee852b2243e202fd7eab1 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Sat, 6 Jun 2009 14:30:18 +0000
Subject: [PATCH] targets-tools.mk: Add support for headers in $(PROJECT)/
 subdirectory to tools directory

---
 make/targets-tools.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/targets-tools.mk b/make/targets-tools.mk
index 3ce121d5..37c2e54a 100644
--- a/make/targets-tools.mk
+++ b/make/targets-tools.mk
@@ -13,11 +13,11 @@ all.done: $(PREREQ_DONE) $(BUILD_HDR) $(BUILD_EXE_SH) $(MEMBERS) $(LIB_A) $(LIB_
 
 project-header: $(PROJECT).h
 
-$(PROJECT).h: $(filter-out $(PROJECT).h,$(wildcard *.h))
+$(PROJECT).h: $(filter-out $(PROJECT).h $(PROJECT)/$(PROJECT).h,$(wildcard *.h $(PROJECT)/*.h))
 	echo "#ifndef _$(PROJECT_CAPNAME)_H" > $@.tmp
 	echo "#define _$(PROJECT_CAPNAME)_H" >> $@.tmp
 	echo >> $@.tmp
-	for h in $^; do echo "#include <$(PROJECT)/$$h>"; done >> $@.tmp
+	for h in $(sort $(patsubst $(PROJECT)/%,%,$^)); do echo "#include <$(PROJECT)/$$h>"; done >> $@.tmp
 	echo >> $@.tmp
 	echo "#endif /* #ifndef _$(PROJECT_CAPNAME)_H */" >> $@.tmp
 	mv $@.tmp $@