Wed May 20 03:41:25 2009 UTC ()
Revert part of last: .include <bsd.own.mk> for TOOL_SED / TOOL_AWK
definitions instead of using :Used / :Uawk alternates.  Now,
'nbmake-i386 tags' works.


(dyoung)
diff -r1.6 -r1.7 src/sys/arch/xen/Makefile
cvs diff -r1.6 -r1.7 src/sys/arch/xen/Makefile (expand / switch to unified diff)

--- src/sys/arch/xen/Makefile 2009/05/20 03:36:36 1.6
+++ src/sys/arch/xen/Makefile 2009/05/20 03:41:25 1.7
@@ -1,39 +1,41 @@ @@ -1,39 +1,41 @@
1# $NetBSD: Makefile,v 1.6 2009/05/20 03:36:36 dyoung Exp $ 1# $NetBSD: Makefile,v 1.7 2009/05/20 03:41:25 dyoung Exp $
 2
 3.include <bsd.own.mk>
2 4
3# Makefile for xen tags file 5# Makefile for xen tags file
4 6
5.include "../../kern/Make.tags.inc" 7.include "../../kern/Make.tags.inc"
6 8
7.ifmake tags 9.ifmake tags
8.include "${SYSDIR}/arch/xen/conf/Makefile.arch.inc" 10.include "${SYSDIR}/arch/xen/conf/Makefile.arch.inc"
9.endif 11.endif
10 12
11TXEN= ${SYSDIR}/arch/xen/tags 13TXEN= ${SYSDIR}/arch/xen/tags
12 14
13SXEN!= ${TOOL_AWK:Uawk} '($$2 ~ /^arch.*\.[c]$$/) {print "${SYSDIR}/" $$2}' \ 15SXEN!= ${TOOL_AWK} '($$2 ~ /^arch.*\.[c]$$/) {print "${SYSDIR}/" $$2}' \
14 ${SYSDIR}/arch/xen/conf/files.xen 16 ${SYSDIR}/arch/xen/conf/files.xen
15AXEN!= ${TOOL_AWK:Uawk} '($$2 ~ /^arch.*\.[sS]$$/) {print "${SYSDIR}/" $$2}' \ 17AXEN!= ${TOOL_AWK} '($$2 ~ /^arch.*\.[sS]$$/) {print "${SYSDIR}/" $$2}' \
16 ${SYSDIR}/arch/xen/conf/files.xen 18 ${SYSDIR}/arch/xen/conf/files.xen
17AXEN+= ${SYSDIR}/arch/xen/${XEN_BUILD}/*.[sS] 19AXEN+= ${SYSDIR}/arch/xen/${XEN_BUILD}/*.[sS]
18 20
19# Directories in which to place tags links 21# Directories in which to place tags links
20DXEN= xen ${XEN_MACHINE_ARCHS} include 22DXEN= xen ${XEN_MACHINE_ARCHS} include
21 23
22tags: 24tags:
23 -rm -f ${TXEN} 25 -rm -f ${TXEN}
24 -echo ${SXEN} | xargs ctags -wadtf ${TXEN} 26 -echo ${SXEN} | xargs ctags -wadtf ${TXEN}
25 ${FINDCOMM} | xargs ctags -wadtf ${TXEN} 27 ${FINDCOMM} | xargs ctags -wadtf ${TXEN}
26 egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AXEN} | \ 28 egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AXEN} | \
27 ${TOOL_SED:Used} -e \ 29 ${TOOL_SED} -e \
28 "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ 30 "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
29 >> ${TXEN} 31 >> ${TXEN}
30 sort -o ${TXEN} ${TXEN} 32 sort -o ${TXEN} ${TXEN}
31 33
32links: 34links:
33 -for i in ${DXEN}; do \ 35 -for i in ${DXEN}; do \
34 (cd $$i && rm -f tags; ln -s ../tags tags); done 36 (cd $$i && rm -f tags; ln -s ../tags tags); done
35 37
36 38
37SUBDIR= compile include 39SUBDIR= compile include
38 40
39.include <bsd.subdir.mk> 41.include <bsd.subdir.mk>