Module Name:    src
Committed By:   dyoung
Date:           Mon Apr  4 19:44:37 UTC 2011

Modified Files:
        src/sys/arch/cats: Makefile

Log Message:
Fix target 'tags'.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/cats/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/cats/Makefile
diff -u src/sys/arch/cats/Makefile:1.3 src/sys/arch/cats/Makefile:1.4
--- src/sys/arch/cats/Makefile:1.3	Sat Oct 25 22:27:37 2008
+++ src/sys/arch/cats/Makefile	Mon Apr  4 19:44:37 2011
@@ -1,11 +1,13 @@
-#	$NetBSD: Makefile,v 1.3 2008/10/25 22:27:37 apb Exp $
+#	$NetBSD: Makefile,v 1.4 2011/04/04 19:44:37 dyoung Exp $
 
 # Makefile for cats tags file and boot blocks
 
-TCATS=	../cats/tags
-SCATS=	../cats/cats/*.[ch] ../cats/include/*.h \
-		../cats/isa/*.[ch]
-ACATS=	../cats/cats/*.S
+# Find where ARM source files are for inclusion in tags
+.include <../arm/Makefile.inc>
+
+TCATS=	${SYSDIR}/arch/cats/tags
+SCATS=	${SYSDIR}/arch/cats/cats/*.[ch] ${SYSDIR}/arch/cats/include/*.h \
+	${SYSDIR}/arch/cats/pci/*.[ch]
 
 # Directories in which to place tags links
 DCATS=	isa include
@@ -13,10 +15,12 @@
 .include "../../kern/Make.tags.inc"
 
 tags:
-	-ctags -wdtf ${TCATS} ${SCATS} ${COMM}
-	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ACATS} | \
+	-rm -f ${TCATS}
+	-echo ${SCATS} ${SARM} | xargs ctags -wadtf ${TCATS}
+	-${FINDCOMM} | xargs ctags -wadtf ${TCATS}
+	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ACATS} ${AARM} | \
 	    ${TOOL_SED} -e \
-		"s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
+		"s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3	\1	/^\2(\3\4$$/;" \
 	    >> ${TCATS}
 	sort -o ${TCATS} ${TCATS}
 

Reply via email to