[src/trunk]: src/sys/arch Fix 'tags' target.

[dyoung <dyoung%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f7a75fb23a28
branches:  trunk
changeset: 763769:f7a75fb23a28
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Sun Apr 03 23:07:19 2011 +0000

description:
Fix 'tags' target.

diffstat:

 sys/arch/alpha/Makefile |  23 +++++++++++++++--------
 sys/arch/arc/Makefile   |  17 ++++++++++-------
 2 files changed, 25 insertions(+), 15 deletions(-)

diffs (84 lines):

diff -r d438f55ce9a6 -r f7a75fb23a28 sys/arch/alpha/Makefile
--- a/sys/arch/alpha/Makefile   Sun Apr 03 22:29:25 2011 +0000
+++ b/sys/arch/alpha/Makefile   Sun Apr 03 23:07:19 2011 +0000
@@ -1,19 +1,26 @@
-# $NetBSD: Makefile,v 1.13 2008/10/25 22:27:36 apb Exp $
+# $NetBSD: Makefile,v 1.14 2011/04/03 23:07:19 dyoung Exp $
 
 # Makefile for alpha tags file and boot blocks
 
-TALPHA=        ../alpha/tags
-SALPHA=        ../alpha/alpha/*.[ch] ../alpha/include/*.h \
-       ../alpha/pci/*.[ch] ../alpha/tlsb/*.[ch] ../alpha/tc/*.[ch]
-AALPHA=        ../alpha/alpha/*.S
+TALPHA=        ${SYSDIR}/arch/alpha/tags
+SALPHA=        ${SYSDIR}/arch/alpha/alpha/*.[ch] ${SYSDIR}/arch/alpha/common/*.[ch] \
+       ${SYSDIR}/arch/alpha/eisa/*.[ch] ${SYSDIR}/arch/alpha/include/*.h \
+       ${SYSDIR}/arch/alpha/isa/*.[ch] \
+       ${SYSDIR}/arch/alpha/jensenio/*.[ch] ${SYSDIR}/arch/alpha/mcbus/*.[ch] \
+       ${SYSDIR}/arch/alpha/pci/*.[ch] ${SYSDIR}/arch/alpha/sableio/*.[ch] \
+       ${SYSDIR}/arch/alpha/tc/*.[ch] \
+       ${SYSDIR}/arch/alpha/tlsb/*.[ch]
+AALPHA=        ${SYSDIR}/arch/alpha/alpha/*.s ${SYSDIR}/arch/alpha/pci/*.s
 
 # Directories in which to place tags links
-DALPHA=        tc include
+DALPHA=        a12 common eisa include isa jensenio mcbus pci sableio tc tlsb
 
 .include "../../kern/Make.tags.inc"
 
 tags:
-       -ctags -wdtf ${TALPHA} ${SALPHA} ${COMM} 
+       -rm -f ${TALPHA}
+       -echo ${SALPHA} | xargs ctags -wadtf ${TALPHA}
+       -${FINDCOMM} | xargs ctags -wadtf ${TALPHA}
        egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AALPHA} | \
            ${TOOL_SED} "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
            >> ${TALPHA}
@@ -21,7 +28,7 @@
 
 links:
        -for i in ${DALPHA}; do \
-           cd $$i && rm -f tags; ln -s ../tags tags; done
+           (cd $$i && rm -f tags; ln -s ../tags tags); done
 
 
 SUBDIR=        compile include stand
diff -r d438f55ce9a6 -r f7a75fb23a28 sys/arch/arc/Makefile
--- a/sys/arch/arc/Makefile     Sun Apr 03 22:29:25 2011 +0000
+++ b/sys/arch/arc/Makefile     Sun Apr 03 23:07:19 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2008/10/25 22:27:36 apb Exp $
+#      $NetBSD: Makefile,v 1.12 2011/04/03 23:14:12 dyoung Exp $
 #      $OpenBSD: Makefile,v 1.5 1997/05/19 10:34:53 pefo Exp $
 #      from: @(#)Makefile      8.1 (Berkeley) 6/16/93
 
@@ -7,11 +7,12 @@
 # Find where mips source files are for inclusion in tags
 .include <../mips/Makefile.inc>
 
-TARC=  ../arc/tags
-SARC=  ../arc/arc/*.[ch] ../arc/dev/*.[ch] \
-       ../arc/dti/*.[ch] ../arc/include/*.h ../arc/isa/*.[ch] \
-       ../arc/pci/*.[ch] ../arc/jazz/*.[ch]
-AARC=  ../arc/arc/*.S
+TARC=  ${SYSDIR}/arch/arc/tags
+SARC=  ${SYSDIR}/arch/arc/arc/*.[ch] ${SYSDIR}/arch/arc/dev/*.[ch] \
+       ${SYSDIR}/arch/arc/dti/*.[ch] ${SYSDIR}/arch/arc/include/*.h \
+       ${SYSDIR}/arch/arc/isa/*.[ch] \
+       ${SYSDIR}/arch/arc/pci/*.[ch] ${SYSDIR}/arch/arc/jazz/*.[ch]
+AARC=  ${SYSDIR}/arch/arc/arc/*.S
 
 # Directories in which to place tags links
 DARC=  arc dev dti include isa pci jazz
@@ -19,7 +20,9 @@
 .include "../../kern/Make.tags.inc"
 
 tags:
-       -ctags -wdtf ${TARC} ${SARC} ${SMIPS} ${COMM}
+       -rm -f ${TARC}
+       -echo ${SARC} ${SMIPS} | xargs ctags -wadtf ${TARC}
+       -${FINDCOMM} | xargs ctags -wadtf ${TARC}
        egrep "^LEAF(.*)|^[AN]LEAF(.*)|^NON_LEAF(.*)" ${AARC} ${AMIPS} | \
            ${TOOL_SED} "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
            >> ${TARC}