From e976684e7ce32b83875c1d71d79ba2d3abb0e5c0 Mon Sep 17 00:00:00 2001
From: Ben Gras <ben@minix3.org>
Date: Mon, 23 Sep 2013 12:23:34 +0000
Subject: [PATCH] kernel: fixes for DEBUG_DUMPIPC mode

	. add dependency of headers on debug.d
	. put the generated headers in the right dir
	. also resilience against future ELAST duplicate errno

Change-Id: I9d10702c8e09699a40138193f14defe902399da6
---
 kernel/Makefile         | 8 ++++----
 kernel/extract-errno.sh | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kernel/Makefile b/kernel/Makefile
index c16eadcc9..6604392cf 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -80,18 +80,18 @@ CPPFLAGS+= -DUSE_TRACE
 
 CLEANFILES+=extracted-errno.h extracted-mfield.h extracted-mtype.h procoffsets.h
 
-debug.o: extracted-errno.h extracted-mfield.h extracted-mtype.h
+debug.o debug.d: extracted-errno.h extracted-mfield.h extracted-mtype.h
 
 extracted-errno.h: extract-errno.sh ../include/errno.h
 	${_MKTARGET_CREATE}
-	cd ${.CURDIR} ; ${HOST_SH} extract-errno.sh > ${.OBJDIR}/extracted-errno.h
+	cd ${.CURDIR} ; ${HOST_SH} extract-errno.sh > extracted-errno.h
 
 extracted-mfield.h: extract-mfield.sh ../lib/libc/sys-minix/*.c ../lib/libsys/*.c
 	${_MKTARGET_CREATE}
-	cd ${.CURDIR} ; ${HOST_SH} extract-mfield.sh > ${.OBJDIR}/extracted-mfield.h
+	cd ${.CURDIR} ; ${HOST_SH} extract-mfield.sh > extracted-mfield.h
 
 extracted-mtype.h: extract-mtype.sh ../include/minix/com.h
 	${_MKTARGET_CREATE}
-	cd ${.CURDIR} ; ${HOST_SH} extract-mtype.sh > ${.OBJDIR}/extracted-mtype.h
+	cd ${.CURDIR} ; ${HOST_SH} extract-mtype.sh > extracted-mtype.h
 
 .include <minix.service.mk>
diff --git a/kernel/extract-errno.sh b/kernel/extract-errno.sh
index 0629f03a0..09ba67bba 100644
--- a/kernel/extract-errno.sh
+++ b/kernel/extract-errno.sh
@@ -8,5 +8,5 @@ tr -s ' \t' ' ' | \
 sed 's/^# /#/' | \
 egrep '^#define [A-Z_][A-Z0-9_]* \( ?_SIGN ?[0-9]+ ?\)' | \
 cut -d' ' -f2 | \
-sed 's/\(.*\)/IDENT(\1)/' | \
+sed 's/\(.*\)/IDENT(\1)/' | grep -v ELAST | \
 sort