repair tags building (due to obj dirs in /sys)

12 files changed, 143 insertions, 110 deletions

diff --git a/sys/arch/alpha/Makefile b/sys/arch/alpha/Makefile
index 94ee00f509d..7e86f913a54 100644
--- a/sys/arch/alpha/Makefile
+++ b/sys/arch/alpha/Makefile
@@ -1,22 +1,29 @@
-#	$OpenBSD: Makefile,v 1.4 1999/12/30 17:31:45 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.5 2002/07/15 21:29:16 mickey Exp $
 #	$NetBSD: Makefile,v 1.3 1995/02/27 16:36:07 cgd Exp $
 
 # Makefile for alpha tags file and boot blocks
 
+S=${.CURDIR}/../..
+.include "$S/kern/Make.tags.inc"
+
 NOPROG=	noprog
 NOMAN=	noman
 
 SUBDIR=	stand
 
-TALPHA=	../alpha/tags
-SALPHA=	../alpha/alpha/*.[ch] ../alpha/include/*.h ../alpha/tc/*.[ch]
-AALPHA=	../alpha/alpha/*.S
+TALPHA=	$S/arch/alpha/tags
+SALPHA=	$S/arch/alpha/alpha/*.[ch] $S/arch/alpha/include/*.h \
+	$S/arch/alpha/tc/*.[ch] $S/arch/alpha/dev/*.[ch] \
+	$S/arch/alpha/eisa/*.[ch] $S/arch/alpha/isa/*.[ch] \
+	$S/arch/alpha/pci/*.[ch]
+AALPHA=	$S/arch/alpha/alpha/*.[sS] $S/arch/alpha/pci/*.[Ss] \
+	$S/lib/libkern/arch/alpha/*.[sS]
 
 # Directories in which to place alpha tags links
-DALPHA=	tc include
+DALPHA=	alpha eisa isa dev pci tc include
 
 tags:
-	-ctags -dtf ${TALPHA} ${COMM} ${SALPHA}
+	-ctags -wdtf ${TALPHA} ${COMM} ${SALPHA}
 	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AALPHA} | \
 	    sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
 		>> ${TALPHA}
@@ -24,7 +31,7 @@ tags:
 
 links:
 	-for i in ${DALPHA}; do \
-	    (cd $$i && rm -f tags; ln -s ../tags tags); done
+	    (cd $$i && rm -f tags; ln -s ${TALPHA} tags); done
 
 obj: _SUBDIRUSE
 
diff --git a/sys/arch/amiga/Makefile b/sys/arch/amiga/Makefile
index 131a1775c7e..cd765010643 100644
--- a/sys/arch/amiga/Makefile
+++ b/sys/arch/amiga/Makefile
@@ -1,14 +1,14 @@
-#	$OpenBSD: Makefile,v 1.4 1997/10/23 13:14:32 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.5 2002/07/15 21:29:16 mickey Exp $
 #	$NetBSD: Makefile,v 1.11 1997/01/06 12:33:09 is Exp $
 
 #	@(#)Makefile	7.3 (Berkeley) 6/9/91
 
-S=${BSDSRCDIR}/sys
-COMM=	$S/vm/*.[ch] $S/ufs/*.[ch] $S/sys/*.h $S/compat/sunos/*.[ch] \
+S=${.CURDIR}/../..
+COMM=	$S/uvm/*.[ch] $S/ufs/*/*.[ch] $S/sys/*.h $S/compat/sunos/*.[ch] \
 	$S/nfs/*.[ch] $S/netns/*.[ch] $S/netiso/*.[ch] \
-	$S/netiso/xebec/*.[ch] $S/netinet/*.[ch] $S/netccitt/*.[ch] \
+	$S/netinet/*.[ch] $S/netinet6/*.[ch] $S/netccitt/*.[ch] \
 	$S/net/*.[ch] $S/miscfs/*/*.[ch] $S/kern/*.[ch] $S/dev/*.[ch] \
-	$S/scsi/*.[ch] $S/lib/libkern/m68k/*.[ch] $S/lib/libkern/*.[ch]
+	$S/scsi/*.[ch] $S/lib/libkern/arch/m68k/*.[sS] $S/lib/libkern/*.[ch]
 
 # Makefile for amiga tags file
 
@@ -23,14 +23,8 @@ AAMIGA=	$S/arch/m68k/m68k/*.s $S/arch/amiga/amiga/*.s
 # Directories in which to place amiga tags links
 DAMIGA=	amiga dev include
 
-TAGS:
-	-etags -dt ${COMM} ${SAMIGA} ${AAMIGA}
-	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AAMIGA} | \
-	    sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
-	    >> ${TAMIGA}/tags
-
 tags:
-	-ctags -dtf ${TAMIGA} ${COMM} ${SAMIGA}
+	-ctags -wdtf ${TAMIGA} ${COMM} ${SAMIGA}
 	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AAMIGA} | \
 	    sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
 	    >> ${TAMIGA}
@@ -39,7 +33,7 @@ tags:
 links:
 	-for i in ${DAMIGA}; do \
 	    rm -f $$i/tags; rm -f $$i/TAGS ; \
-	    ln -s ../tags $$i/tags; ln -s ../TAGS $$i/TAGS; done
+	    ln -s ${TAMIGA} $$i/tags; done
 
 obj:	_SUBDIRUSE
 
diff --git a/sys/arch/hp300/Makefile b/sys/arch/hp300/Makefile
index 44a87de7a33..e329cc0d36c 100644
--- a/sys/arch/hp300/Makefile
+++ b/sys/arch/hp300/Makefile
@@ -1,24 +1,29 @@
-#	$OpenBSD: Makefile,v 1.5 1997/10/23 13:03:56 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 2002/07/15 21:29:16 mickey Exp $
 #	$NetBSD: Makefile,v 1.5 1995/08/04 07:40:31 thorpej Exp $
 #	@(#)Makefile	7.3 (Berkeley) 6/9/91
 
 # Makefile for hp300 tags file and boot blocks
 
+S=${.CURDIR}/../..
+.include "$S/kern/Make.tags.inc"
+
 NOPROG=	noprog
 NOMAN=	noman
 
 SUBDIR= stand ../m68k
 
-THP300=	../hp300/tags
-SHP300=	../hp300/hp300/*.[ch] ../hp300/include/*.h \
-	../hp300/dev/*.[ch]
-AHP300=	../hp300/hp300/*.s
+THP300=	$S/arch/hp300/tags
+SHP300=	$S/arch/m68k/m68k/*.c $S/arch/m68k/include/*.h \
+	$S/arch/hp300/hp300/*.[ch] $S/arch/hp300/include/*.h \
+	$S/arch/hp300/dev/*.[ch]
+AHP300=	$S/arch/m68k/m68k/*.[Ss] $S/arch/hp300/hp300/*.[Ss] \
+	$S/lib/libkern/arch/m68k/*.[sS]
 
 # Directories in which to place hp300 tags links
 DHP300=	dev hp300 include
 
 tags:
-	-ctags -dtf ${THP300} ${COMM} ${SHP300}
+	-ctags -wdtf ${THP300} ${COMM} ${SHP300}
 	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AHP300} | \
 	    sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
 		>> ${THP300}
@@ -26,7 +31,7 @@ tags:
 
 links:
 	-for i in ${DHP300}; do \
-	    cd $$i && rm -f tags; ln -s ../tags tags; done
+	    cd $$i && rm -f tags; ln -s ${THP300} tags; done
 
 obj: _SUBDIRUSE
 
diff --git a/sys/arch/hppa/Makefile b/sys/arch/hppa/Makefile
index 017cf7e4209..ca16b74ffdc 100644
--- a/sys/arch/hppa/Makefile
+++ b/sys/arch/hppa/Makefile
@@ -1,24 +1,26 @@
-#	$OpenBSD: Makefile,v 1.2 2000/05/31 19:44:57 mickey Exp $
+#	$OpenBSD: Makefile,v 1.3 2002/07/15 21:29:16 mickey Exp $
 
 # Makefile for hppa tags file and boot blocks
 
-.include "../../kern/Make.tags.inc"
+S=${.CURDIR}/../..
+.include "$S/kern/Make.tags.inc"
 
 NOPROG=	noprog
 NOMAN=	noman
 
 SUBDIR=	stand
 
-THPPA=	../hppa/tags
-SHPPA=	../hppa/hppa/*.[ch] ../hppa/include/*.h ../hppa/dev/*.[ch] \
-	../hppa/gsc/*.[ch]
-AHPPA=	../hppa/hppa/*.S
+THPPA=	$S/arch/hppa/tags
+SHPPA=	$S/arch/hppa/hppa/*.[ch] $S/arch/hppa/include/*.h \
+	$S/arch/hppa/dev/*.[ch] $S/arch/hppa/gsc/*.[ch] \
+	$S/arch/hppa/eisa/*.[ch] $S/arch/hppa/isa/*.[ch]
+AHPPA=	$S/arch/hppa/hppa/*.S $S/lib/libkern/arch/hppa/*.[sS]
 
 # Directories in which to place hppa tags links
-DHPPA=	conf dev gsc hppa include
+DHPPA=	conf dev gsc hppa eisa isa include
 
 tags:
-	-ctags -dtf ${THPPA} ${COMM} ${SHPPA}
+	-ctags -wdtf ${THPPA} ${COMM} ${SHPPA}
 	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AHPPA} | \
 	    sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
 		>> ${THPPA}
@@ -26,7 +28,7 @@ tags:
 
 links:
 	-for i in ${DHPPA}; do \
-	    cd $$i && rm -f tags; ln -s ../tags tags; done
+	    cd $$i && rm -f tags; ln -s ${THPPA} tags; done
 
 obj: _SUBDIRUSE
 
diff --git a/sys/arch/i386/Makefile b/sys/arch/i386/Makefile
index 1a0af61271c..042d5ac944e 100644
--- a/sys/arch/i386/Makefile
+++ b/sys/arch/i386/Makefile
@@ -1,21 +1,24 @@
-#	$OpenBSD: Makefile,v 1.12 2001/06/12 21:51:11 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.13 2002/07/15 21:29:16 mickey Exp $
 #	$NetBSD: Makefile,v 1.6 1996/02/01 22:31:28 mycroft Exp $
 #	@(#)Makefile	7.3 (Berkeley) 6/9/91
 
 # Makefile for i386 tags file and boot blocks
 
-.include "../../kern/Make.tags.inc"
+S=${.CURDIR}/../..
+.include "$S/kern/Make.tags.inc"
 
 NOPROG=	noprog
 NOMAN=	noman
 
 SUBDIR=	stand
 
-TI386=	../i386/tags
-SI386=	../i386/eisa/*.[ch] ../i386/i386/*.[ch] ../i386/include/*.h \
-	../i386/include/pc/*.h ../i386/isa/*.[ch] ../i386/pci/*.[ch]
-AI386=	../i386/i386/*.s ../i386/isa/*.s
-GI386= ../../gnu/arch/i386/*/*.[ch]
+TI386=	$S/arch/i386/tags
+SI386=	$S/arch/i386/eisa/*.[ch] $S/arch/i386/i386/*.[ch] \
+	$S/arch/i386/include/*.h $S/arch/i386/include/pc/*.h \
+	$S/arch/i386/isa/*.[ch] $S/arch/i386/pci/*.[ch]
+AI386=	$S/arch/i386/i386/*.[sS] $S/arch/i386/isa/*.[sS] \
+	$S/lib/libkern/arch/i386/*.[sS]
+GI386=	$S/gnu/arch/i386/*/*.[ch]
 
 # Directories in which to place i386 tags links
 DI386=	conf eisa i386 include isa pci
@@ -29,7 +32,7 @@ tags:
 
 links:
 	-for i in ${DI386}; do \
-	    cd $$i && rm -f tags; ln -s ../tags tags; done
+	    cd $$i && rm -f tags; ln -s ${TI386} tags; done
 
 obj:	_SUBDIRUSE
 
diff --git a/sys/arch/mac68k/Makefile b/sys/arch/mac68k/Makefile
index 07872de116e..f54dc324c25 100644
--- a/sys/arch/mac68k/Makefile
+++ b/sys/arch/mac68k/Makefile
@@ -1,18 +1,22 @@
-#	$OpenBSD: Makefile,v 1.4 1997/11/20 07:31:40 gene Exp $
+#	$OpenBSD: Makefile,v 1.5 2002/07/15 21:29:16 mickey Exp $
 #	$NetBSD: Makefile,v 1.3 1996/03/27 03:56:22 scottr Exp $
 
 #	@(#)Makefile	7.3 (Berkeley) 6/9/91
 
 # Makefile for mac68k tags file
 
+S=${.CURDIR}/../..
+.include "$S/kern/Make.tags.inc"
+
 NOPROG=	noprog
 NOMAN=	noman
 
-TMAC68K=	../mac68k/tags
-SMAC68K=	../m68k/m68k/*.c ../m68k/include/*.h \
-		../mac68k/mac68k/*.[ch] ../mac68k/include/*.h \
-		../mac68k/dev/*.[ch]
-AMAC68K=	../m68k/m68k/*.s ../mac68k/mac68k/*.s
+TMAC68K=$S/arch/mac68k/tags
+SMAC68K=$S/arch/m68k/m68k/*.c $S/arch/m68k/include/*.h \
+	$S/arch/mac68k/mac68k/*.[ch] $S/arch/mac68k/include/*.h \
+	$S/arch/mac68k/dev/*.[ch]
+AMAC68K=$S/arch/m68k/m68k/*.s $S/arch/mac68k/mac68k/*.s \
+	$S/lib/libkern/arch/m68k/*.[sS]
 
 SUBDIR=../m68k
 
@@ -20,7 +24,7 @@ SUBDIR=../m68k
 DMAC68K=	mac68k dev include
 
 tags:
-	-ctags -dtf ${TMAC68K} ${COMM} ${SMAC68K}
+	-ctags -wdtf ${TMAC68K} ${COMM} ${SMAC68K}
 	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AMAC68K} | \
 	    sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
 	    >> ${TMAC68K}
@@ -28,9 +32,8 @@ tags:
 
 links:
 	-for i in ${DMAC68K}; do \
-	    cd $$i && rm -f tags; ln -s ../tags tags; done
+	    cd $$i && rm -f tags; ln -s ${TMAC68K} tags; done
 
 obj:	_SUBDIRUSE
 
 .include <bsd.prog.mk>
-.include <bsd.subdir.mk>
diff --git a/sys/arch/mvme68k/Makefile b/sys/arch/mvme68k/Makefile
index 830a257e05f..b9a28405a83 100644
--- a/sys/arch/mvme68k/Makefile
+++ b/sys/arch/mvme68k/Makefile
@@ -1,14 +1,17 @@
-#	$OpenBSD: Makefile,v 1.8 1997/10/19 22:35:57 etheisen Exp $
+#	$OpenBSD: Makefile,v 1.9 2002/07/15 21:29:16 mickey Exp $
 
 # from: @(#)Makefile	8.1 (Berkeley) 6/11/93
 #
 # Makefile for mvme68k links, tags file
 
+S=${.CURDIR}/../..
+.include "$S/kern/Make.tags.inc"
+
 NOPROG=	noprog
 NOMAN=	noman
 NOOBJ=	noobj
 
-SYSTAGS= ${.CURDIR}/tags
+TMVEM68K= $S/arch/mvme68k/tags
 SUBDIR=	stand ../m68k
 DIRS=	conf dev include mvme68k
 
@@ -18,18 +21,17 @@ links::
 		cd ${.CURDIR} ; \
 	    (cd $$i && { rm -f tags; ln -s ${SYSTAGS} tags; }) done
 
-MVME68K=/sys/arch/mvme68k/dev/*.[ch] /sys/arch/mvme68k/include/*.[ch] \
-	/sys/arch/mvme68k/mvme68k/*.[ch]
-AMVME68K=/sys/arch/mvme68k/mvme68k/*.s
+SMVME68K=$S/arch/mvme68k/dev/*.[ch] $S/arch/mvme68k/include/*.[ch] \
+	$S/arch/mvme68k/mvme68k/*.[ch]
+AMVME68K=$S/arch/mvme68k/mvme68k/*.s $S/lib/libkern/arch/m68k/*.[sS]
 
 tags:
-	-ctags -wdt ${COMM} ${MVME68K}
+	-ctags -wdtf ${TMVEM68K} ${COMM} ${SMVME68K}
 	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AMVME68K} | \
 	    sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
 		>> tags
-	sort -o tags tags
+	sort -o ${TMVEM68K} ${TMVEM68K}
 
 obj:	_SUBDIRUSE
 
 .include <bsd.prog.mk>
-.include <bsd.subdir.mk>
diff --git a/sys/arch/mvme88k/Makefile b/sys/arch/mvme88k/Makefile
index b9c798e2c36..f9ea3c1b68d 100644
--- a/sys/arch/mvme88k/Makefile
+++ b/sys/arch/mvme88k/Makefile
@@ -1,14 +1,17 @@
-#	$OpenBSD: Makefile,v 1.4 2000/12/28 21:21:23 smurph Exp $
+#	$OpenBSD: Makefile,v 1.5 2002/07/15 21:29:16 mickey Exp $
 
 # from: @(#)Makefile	8.1 (Berkeley) 6/11/93
 #
 # Makefile for mvme88k links, tags file
 
+S=${.CURDIR}/../..
+.include "$S/kern/Make.tags.inc"
+
 NOPROG=	noprog
 NOMAN=	noman
 NOOBJ=	noobj
 
-SYSTAGS= ${.CURDIR}/tags
+TMVME88K=${.CURDIR}/tags
 SUBDIR=	stand 
 DIRS=	conf dev include mvme88k
 
@@ -16,20 +19,19 @@ links::
 	-for i in ${DIRS}; do \
 		echo $$i ; \
 		cd ${.CURDIR} ; \
-	    (cd $$i && { rm -f tags; ln -s ${SYSTAGS} tags; }) done
+	    (cd $$i && { rm -f tags; ln -s ${TMVME88K} tags; }) done
 
-MVME88K=/sys/arch/mvme88k/dev/*.[ch] /sys/arch/mvme88k/include/*.[ch] \
-	/sys/arch/mvme88k/mvme88k/*.[ch]
-AMVME88K=/sys/arch/mvme88k/mvme88k/*.s
+SMVME88K=$S/arch/mvme88k/dev/*.[ch] $S/arch/mvme88k/include/*.[ch] \
+	$S/arch/mvme88k/mvme88k/*.[ch]
+AMVME88K=$S/arch/mvme88k/mvme88k/*.[sS]
 
 tags:
-	-ctags -wdt ${COMM} ${MVME88K}
+	-ctags -wdtf ${TMVME88K} ${COMM} ${SMVME88K}
 	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AMVME88K} | \
 	    sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
-		>> tags
-	sort -o tags tags
+		>> ${TMVME88K}
+	sort -o ${TMVME88K} ${TMVME88K}
 
 obj:	_SUBDIRUSE
 
 .include <bsd.prog.mk>
-.include <bsd.subdir.mk>
diff --git a/sys/arch/sparc/Makefile b/sys/arch/sparc/Makefile
index 700e220cf1b..7203ff63353 100644
--- a/sys/arch/sparc/Makefile
+++ b/sys/arch/sparc/Makefile
@@ -1,31 +1,34 @@
-#	$OpenBSD: Makefile,v 1.7 2001/07/04 08:43:28 niklas Exp $
+#	$OpenBSD: Makefile,v 1.8 2002/07/15 21:29:16 mickey Exp $
 #	$NetBSD: Makefile,v 1.4 1996/03/25 22:48:09 mrg Exp $
 
 #
 # Makefile for sparc links, tags file
 
+S=${.CURDIR}/../..
+.include "$S/kern/Make.tags.inc"
+
 SUBDIR= stand
 
 NOPROG=	noprog
 NOMAN=	noman
 
+TSPARC=	$S/arch/sparc/tags
 DIRS=	conf dev fpu include rcons sbus sparc
 
 links::
 	-for i in ${DIRS}; do \
-	    (cd $$i && { rm -f tags; ln -s ${SYSTAGS} tags; }) done
+	    (cd $$i && { rm -f tags; ln -s ${TSPARC} tags; }) done
 
-SPARC=	/sys/arch/sparc/dev/*.[ch] /sys/arch/sparc/fpu/*.[ch] \
-	/sys/arch/sparc/include/*.[ch] /sys/arch/sparc/rcons/*.[ch] \
-	/sys/arch/sparc/sbus/*.[ch] /sys/arch/sparc/sparc/*.[ch]
-ASPARC=	/sys/arch/sparc/sparc/*.s
+SPARC=	$S/arch/sparc/dev/*.[ch] $S/arch/sparc/fpu/*.[ch] \
+	$S/arch/sparc/include/*.[ch] $S/arch/sparc/sparc/*.[ch]
+ASPARC=	$S/arch/sparc/sparc/*.[sS] $S/lib/libkern/arch/sparc/*.[sS]
 
 tags:
-	-ctags -wdt ${COMM} ${SPARC}
+	-ctags -wdtf ${TSPARC} ${COMM} ${SPARC}
 	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ASPARC} | \
 	    sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
-		>> tags
-	sort -o tags tags
+		>> ${TSPARC}
+	sort -o ${TSPARC} ${TSPARC}
 
 obj:   _SUBDIRUSE
 
diff --git a/sys/arch/sparc64/Makefile b/sys/arch/sparc64/Makefile
index b29f50a5245..8e66ded9d8e 100644
--- a/sys/arch/sparc64/Makefile
+++ b/sys/arch/sparc64/Makefile
@@ -1,19 +1,24 @@
-#	$OpenBSD: Makefile,v 1.1 2001/08/31 10:55:43 art Exp $
+#	$OpenBSD: Makefile,v 1.2 2002/07/15 21:29:16 mickey Exp $
+
+
+S=${.CURDIR}/../..
+.include "$S/kern/Make.tags.inc"
 
 NOPROG=	noprog
 NOMAN=	noman
 
 SUBDIR=	stand
 
-TSPARC64=	../sparc64/tags
-SSPARC64=	../sparc64/sparc64/*.[ch] ../sparc64/include/*.h ../sparc64/tc/*.[ch]
-ASPARC64=	../sparc64/sparc64/*.S
+TSPARC64=	$S/arch/sparc64/tags
+SSPARC64=	$S/arch/sparc64/sparc64/*.[ch] $S/arch/sparc64/include/*.h \
+		$S/arch/sparc64/dev/*.[ch] $S/arch/sparc64/fpu/*.[ch]
+ASPARC64=	$S/arch/sparc64/sparc64/*.S $S/lib/libkern/arch/sparc64/*.[sS]
 
 # Directories in which to place sparc64 tags links
-DSPARC64=	tc include
+DSPARC64=	sparc64 dev fpu include
 
 tags:
-	-ctags -dtf ${TSPARC64} ${COMM} ${SSPARC64}
+	-ctags -wdtf ${TSPARC64} ${COMM} ${SSPARC64}
 	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ASPARC64} | \
 	    sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
 		>> ${TSPARC64}
@@ -21,7 +26,7 @@ tags:
 
 links:
 	-for i in ${DSPARC64}; do \
-	    (cd $$i && rm -f tags; ln -s ../tags tags); done
+	    (cd $$i && rm -f tags; ln -s ${TSPARC64} tags); done
 
 obj: _SUBDIRUSE
 
diff --git a/sys/kern/Make.tags.inc b/sys/kern/Make.tags.inc
index 61f52c2215f..25fc120cb56 100644
--- a/sys/kern/Make.tags.inc
+++ b/sys/kern/Make.tags.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Make.tags.inc,v 1.6 2001/06/12 21:51:10 deraadt Exp $
+#	$OpenBSD: Make.tags.inc,v 1.7 2002/07/15 21:29:16 mickey Exp $
 
 # Common files for "make tags".
 # Included by the Makefile for each architecture.
@@ -7,22 +7,29 @@
 # there is a struct tag with the same name (eg., vmmeter).  The real
 # solution would probably be for ctags to generate "struct vmmeter" tags.
 
-COMM=	/sys/adosfs/*.[ch] \
-	/sys/compat/*/*.[ch] \
-	/sys/conf/*.[ch] \
-	/sys/ddb/*.[ch] \
-	/sys/dev/*.[ch] /sys/dev/*/*.[ch] \
-	/sys/isofs/*/*.[ch] \
-	/sys/kern/*.[ch] \
-	/sys/lib/libkern/*.[ch] \
-	/sys/miscfs/*/*.[ch] \
-	/sys/net/*.[ch] \
-	/sys/netccitt/*.[ch] \
-	/sys/netinet/*.[ch] \
-	/sys/netiso/*.[ch] \
-	/sys/netns/*.[ch] \
-	/sys/nfs/*.[ch] \
-	/sys/scsi/*.[ch] \
-	/sys/ufs/*/*.[ch] \
-	/sys/vm/*.[ch] \
-	/sys/sys/*.[ch]
+COMM=	$S/adosfs/*.[ch] \
+	$S/altq/*.[ch] \
+	$S/compat/*/*.[ch] \
+	$S/conf/*.[ch] \
+	$S/crypto/*.[ch] \
+	$S/ddb/*.[ch] \
+	$S/dev/*.[ch] $S/dev/*/*.[ch] $S/dev/*/*/*.[ch] \
+	$S/isofs/*/*.[ch] \
+	$S/kern/*.[ch] \
+	$S/lib/libkern/*.[ch] \
+	$S/miscfs/*/*.[ch] \
+	$S/msdosfs/*.[ch] \
+	$S/net/*.[ch] \
+	$S/netatalk/*.[ch] \
+	$S/netccitt/*.[ch] \
+	$S/netinet/*.[ch] \
+	$S/netinet6/*.[ch] \
+	$S/netipx/*.[ch] \
+	$S/netiso/*.[ch] \
+	$S/netnatm/*.[ch] \
+	$S/netns/*.[ch] \
+	$S/nfs/*.[ch] \
+	$S/scsi/*.[ch] \
+	$S/ufs/*/*.[ch] \
+	$S/uvm/*.[ch] \
+	$S/sys/*.[ch]
diff --git a/sys/kern/Makefile b/sys/kern/Makefile
index 8d0f21f1b62..ec6e05ceaac 100644
--- a/sys/kern/Makefile
+++ b/sys/kern/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.8 2000/04/08 05:50:52 aaron Exp $
+#	$OpenBSD: Makefile,v 1.9 2002/07/15 21:29:16 mickey Exp $
 
 # Makefile for kernel tags files, init_sysent, etc.
 
-ARCH=	alpha amiga atari hp300 i386 m68k mac68k mvme68k mvme88k pc532 \
-	pica pmax sparc sun3 vax
+ARCH=	alpha amiga hp300 hppa i386 m68k mac68k mvme68k mvme88k \
+	mvmeppc powerpc sparc sparc64 sun3 vax
 
 all:	init_sysent.c vnode_if.c