make tags and links work, and use all sources

1 files changed, 27 insertions, 18 deletions

diff --git a/sys/arch/zaurus/Makefile b/sys/arch/zaurus/Makefile
index 0c5970b8ea4..466a1bfe5e6 100644
--- a/sys/arch/zaurus/Makefile
+++ b/sys/arch/zaurus/Makefile
@@ -1,30 +1,39 @@
-/* 	$OpenBSD: Makefile,v 1.2 2005/01/10 00:25:45 deraadt Exp $	*/
+# 	$OpenBSD: Makefile,v 1.3 2005/05/06 02:20:24 uwe Exp $
 #	$NetBSD: Makefile,v 1.1 2001/06/12 08:32:46 chris Exp $
 
 # Makefile for zaurus tags file and boot blocks
 
-TCATS=	../zaurus/tags
-SCATS=	../zaurus/zaurus/*.[ch] ../zaurus/include/*.h \
-		../zaurus/isa/*.[ch]
-ACATS=	../zaurus/zaurus/*.S
+S=${.CURDIR}/../..
+.include "$S/kern/Make.tags.inc"
 
-# Directories in which to place tags links
-DCATS=	isa include
+SUBDIR=	stand
+
+NOPROG=	noprog
+NOMAN=	noman
+
+TZAURUS=	$S/arch/zaurus/tags
 
-.include "../../kern/Make.tags.inc"
+SZAURUS=	$S/arch/zaurus/dev/*.[ch] $S/arch/zaurus/include/*.h \
+		$S/arch/zaurus/zaurus/*.[ch] $S/arch/arm/arm/*.[ch] \
+		$S/arch/arm/include/*.h $S/arch/arm/mainbus/*.[ch] \
+		$S/arch/arm/sa11x0/*.[ch] $S/arch/arm/xscale/*.[ch]
+AZAURUS=	$S/arch/zaurus/zaurus/*.S $S/arch/arm/arm/*.S \
+		$S/arch/arm/mainbus/*.S $S/arch/arm/xscale/*.S
+
+# Directories in which to place tags links
+DZAURUS=	dev include zaurus
 
 tags:
-	-ctags -wdtf ${TCATS} ${SCATS} ${COMM}
-	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ACATS} | \
-	    sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
-	    >> ${TCATS}
-	sort -o ${TCATS} ${TCATS}
+	-ctags -wdtf ${TZAURUS} ${SZAURUS} ${COMM}
+	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AZAURUS} | \
+	    sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3	\1	/^\2(\3\4$$/;" \
+	    >> ${TZAURUS}
+	sort -o ${TZAURUS} ${TZAURUS}
 
 links:
-	-for i in ${DCATS}; do \
-	    cd $$i && rm -f tags; ln -s ../tags tags; done
+	-for i in ${DZAURUS}; do \
+	    (cd $$i && { rm -f tags; ln -s ${TZAURUS} tags; }) done
 
+obj:	_SUBDIRUSE
 
-SUBDIR=	stand
-
-.include <bsd.subdir.mk>
+.include <bsd.prog.mk>