Module Name:    src
Committed By:   dyoung
Date:           Mon Apr  4 19:47:50 UTC 2011

Modified Files:
        src/sys/arch/mips: Makefile.inc
        src/sys/arch/prep: Makefile
        src/sys/arch/sandpoint: Makefile

Log Message:
Fix target 'tags'.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/prep/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sandpoint/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/mips/Makefile.inc
diff -u src/sys/arch/mips/Makefile.inc:1.6 src/sys/arch/mips/Makefile.inc:1.7
--- src/sys/arch/mips/Makefile.inc:1.6	Tue Mar 20 08:52:04 2007
+++ src/sys/arch/mips/Makefile.inc	Mon Apr  4 19:47:50 2011
@@ -1,7 +1,9 @@
-#	$NetBSD: Makefile.inc,v 1.6 2007/03/20 08:52:04 dyoung Exp $
+#	$NetBSD: Makefile.inc,v 1.7 2011/04/04 19:47:50 dyoung Exp $
 
 AMIPS=	${SYSDIR}/arch/mips/mips/*.S
-SMIPS=	${SYSDIR}/arch/mips/mips/*.[ch] ${SYSDIR}/arch/mips/include/*.h
+AMIPS+=	${SYSDIR}/arch/mips/rmi/*.S
+SMIPS=	${SYSDIR}/arch/mips/mips/*.[ch]
+SMIPS+=	${SYSDIR}/arch/mips/include/*.h
 SMIPS+=	${SYSDIR}/arch/mips/adm5120/*.[ch]
 SMIPS+=	${SYSDIR}/arch/mips/adm5120/dev/*.[ch]
 SMIPS+=	${SYSDIR}/arch/mips/adm5120/include/*.h
@@ -12,3 +14,8 @@
 SMIPS+=	${SYSDIR}/arch/mips/atheros/dev/*.[ch]
 SMIPS+=	${SYSDIR}/arch/mips/atheros/include/*.h
 SMIPS+=	${SYSDIR}/arch/mips/bonito/*.[ch]
+SMIPS+=	${SYSDIR}/arch/mips/cfe/*.[ch]
+SMIPS+=	${SYSDIR}/arch/mips/rmi/*.[ch]
+SMIPS+=	${SYSDIR}/arch/mips/sibyte/dev/*.[ch]
+SMIPS+=	${SYSDIR}/arch/mips/sibyte/include/*.[ch]
+SMIPS+=	${SYSDIR}/arch/mips/sibyte/pci/*.[ch]

Index: src/sys/arch/prep/Makefile
diff -u src/sys/arch/prep/Makefile:1.3 src/sys/arch/prep/Makefile:1.4
--- src/sys/arch/prep/Makefile:1.3	Sat Oct 25 22:27:38 2008
+++ src/sys/arch/prep/Makefile	Mon Apr  4 19:47:49 2011
@@ -1,22 +1,25 @@
-#	$NetBSD: Makefile,v 1.3 2008/10/25 22:27:38 apb Exp $
+#	$NetBSD: Makefile,v 1.4 2011/04/04 19:47:49 dyoung Exp $
 
-# Makefile for tags file
+.include <../powerpc/Makefile.inc>
 
-TPREP=	../prep/tags
-SPREP=	../prep/prep/*.[ch] ../prep/include/*.h ../prep/isa/*.[ch] \
-	../prep/pci/*.[ch]
-APREP=	../prep/prep/*.[sS]
+TPREP=	${SYSDIR}/arch/prep/tags
+SPREP=	${SYSDIR}/arch/prep/prep/*.[ch] \
+	${SYSDIR}/arch/prep/isa/*.[ch] \
+	${SYSDIR}/arch/prep/pci/*.[ch] \
+	${SYSDIR}/arch/prep/include/*.h
+APREP=	${SYSDIR}/arch/prep/prep/*.S
 
-# Directories in which to place tags links
-DPREP=       include
+DPREP=	include
 
 .include "../../kern/Make.tags.inc"
 
 tags:
-	-ctags -wdtf ${TPREP} ${SPREP} ${COMM}
-	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${APREP} | \
+	-rm -f ${TPREP}
+	-echo ${SPREP} ${SPPC} | xargs ctags -wadtf ${TPREP}
+	-${FINDCOMM} | xargs ctags -wadtf ${TPREP}
+	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${APREP} ${APPC} | \
 	    ${TOOL_SED} -e \
-		"s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
+		"s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3	\1	/^\2(\3\4$$/;" \
 	    >> ${TPREP}
 	sort -o ${TPREP} ${TPREP}
 

Index: src/sys/arch/sandpoint/Makefile
diff -u src/sys/arch/sandpoint/Makefile:1.3 src/sys/arch/sandpoint/Makefile:1.4
--- src/sys/arch/sandpoint/Makefile:1.3	Fri Jan 28 22:15:36 2011
+++ src/sys/arch/sandpoint/Makefile	Mon Apr  4 19:47:50 2011
@@ -1,4 +1,32 @@
-#	$NetBSD: Makefile,v 1.3 2011/01/28 22:15:36 phx Exp $
+#	$NetBSD: Makefile,v 1.4 2011/04/04 19:47:50 dyoung Exp $
+
+.include <../powerpc/Makefile.inc>
+
+TSANDPOINT=	${SYSDIR}/arch/sandpoint/tags
+SSANDPOINT=	${SYSDIR}/arch/sandpoint/sandpoint/*.[ch] \
+		${SYSDIR}/arch/sandpoint/isa/*.[ch] \
+		${SYSDIR}/arch/sandpoint/pci/*.[ch] \
+		${SYSDIR}/arch/sandpoint/include/*.h
+ASANDPOINT=	${SYSDIR}/arch/sandpoint/sandpoint/*.S
+
+DSANDPOINT=	include
+
+.include "../../kern/Make.tags.inc"
+
+tags:
+	-rm -f ${TSANDPOINT}
+	-echo ${SSANDPOINT} ${SPPC} | xargs ctags -wadtf ${TSANDPOINT}
+	-${FINDCOMM} | xargs ctags -wadtf ${TSANDPOINT}
+	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ASANDPOINT} ${APPC} | \
+	    ${TOOL_SED} -e \
+		"s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3	\1	/^\2(\3\4$$/;" \
+	    >> ${TSANDPOINT}
+	sort -o ${TSANDPOINT} ${TSANDPOINT}
+
+links:
+	-for i in ${DSANDPOINT}; do \
+	    cd $$i && rm -f tags; ln -s ../tags tags; done
+
 
 SUBDIR=	compile include stand
 

Reply via email to