Module Name: src
Committed By: dyoung
Date: Mon Apr 4 19:46:40 UTC 2011
Modified Files:
src/sys/arch/evbmips: Makefile
src/sys/arch/evbppc: Makefile
src/sys/arch/i386: Makefile
Log Message:
Fix target 'tags'.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbmips/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbppc/Makefile
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/i386/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/evbmips/Makefile
diff -u src/sys/arch/evbmips/Makefile:1.7 src/sys/arch/evbmips/Makefile:1.8
--- src/sys/arch/evbmips/Makefile:1.7 Sat Oct 25 22:27:37 2008
+++ src/sys/arch/evbmips/Makefile Mon Apr 4 19:46:40 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/10/25 22:27:37 apb Exp $
+# $NetBSD: Makefile,v 1.8 2011/04/04 19:46:40 dyoung Exp $
# Makefile for evbmips tags file and boot blocks
@@ -7,9 +7,15 @@
# XXX ! fix this
TEVBMIPS= ${SYSDIR}/arch/evbmips/tags
-SEVBMIPS= ${SYSDIR}/arch/evbmips/evbmips/*.[ch] \
- ${SYSDIR}/arch/evbmips/include/*.h \
- ${SYSDIR}/arch/evbmips/isa/*.[ch]
+SEVBMIPS= ${SYSDIR}/arch/evbmips/adm5120/*.[ch]
+SEVBMIPS+= ${SYSDIR}/arch/evbmips/alchemy/*.[ch]
+SEVBMIPS+= ${SYSDIR}/arch/evbmips/atheros/*.[ch]
+SEVBMIPS+= ${SYSDIR}/arch/evbmips/evbmips/*.[ch]
+SEVBMIPS+= ${SYSDIR}/arch/evbmips/gdium/*.[ch]
+SEVBMIPS+= ${SYSDIR}/arch/evbmips/include/*.h
+SEVBMIPS+= ${SYSDIR}/arch/evbmips/isa/*.[ch]
+SEVBMIPS+= ${SYSDIR}/arch/evbmips/malta/*.[ch]
+SEVBMIPS+= ${SYSDIR}/arch/evbmips/rmixl/*.[ch]
AEVBMIPS= ${SYSDIR}/arch/evbmips/evbmips/*.S
# Directories in which to place tags links
@@ -23,7 +29,7 @@
-${FINDCOMM} | xargs ctags -wadtf ${TEVBMIPS}
egrep "^LEAF(.*)|^[AN]LEAF(.*)|^NON_LEAF(.*)" ${AEVBMIPS} ${AMIPS} | \
${TOOL_SED} -e \
- "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
+ "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
>> ${TEVBMIPS}
sort -o ${TEVBMIPS} ${TEVBMIPS}
Index: src/sys/arch/evbppc/Makefile
diff -u src/sys/arch/evbppc/Makefile:1.2 src/sys/arch/evbppc/Makefile:1.3
--- src/sys/arch/evbppc/Makefile:1.2 Mon Jan 6 17:40:28 2003
+++ src/sys/arch/evbppc/Makefile Mon Apr 4 19:46:40 2011
@@ -1,32 +1,39 @@
-# $NetBSD: Makefile,v 1.2 2003/01/06 17:40:28 lukem Exp $
+# $NetBSD: Makefile,v 1.3 2011/04/04 19:46:40 dyoung Exp $
-ETAGS?= etags
+.include <../powerpc/Makefile.inc>
# XXX Fix this to deal with multiple "evbppc" ports.
-SEVBPPC= evbppc/*.[ch] include/*.h
-AEVBPPC=
+TEVBPPC= ${SYSDIR}/arch/evbppc/tags
+SEVBPPC= ${SYSDIR}/arch/evbppc/evbppc/*.[ch]
+SEVBPPC+= ${SYSDIR}/arch/evbppc/include/*.h
+SEVBPPC+= ${SYSDIR}/arch/evbppc/pmppc/dev/*.[ch]
+SEVBPPC+= ${SYSDIR}/arch/evbppc/pmppc/pci/*.[ch]
+SEVBPPC+= ${SYSDIR}/arch/evbppc/pmppc/*.[ch]
+AEVBPPC= ${SYSDIR}/arch/evbppc/ev64260/*.S \
+ ${SYSDIR}/arch/evbppc/explora/*.S \
+ ${SYSDIR}/arch/evbppc/mpc85xx/*.S \
+ ${SYSDIR}/arch/evbppc/obs405/*.S \
+ ${SYSDIR}/arch/evbppc/pmppc/*.S \
+ ${SYSDIR}/arch/evbppc/virtex/*.S \
+ ${SYSDIR}/arch/evbppc/walnut/*.S
-SPPC= ../powerpc/ibm4xx/*.[ch] ../powerpc/powerpc/*.[ch] \
- ../powerpc/include/*.h ../powerpc/include/ibm4xx/*.h \
- ../powerpc/fpu/*.[ch]
-APPC= ../powerpc/ibm4xx/*.[sS] ../powerpc/powerpc/*.[sS]
-LPPC= ../../lib/libkern/arch/powerpc/*.[chsS] \
- ../../lib/libkern/*.[ch] \
- ../../lib/libsa/*.[ch]
+DEVBPPC= include
-SYSDIR= ../..
.include "../../kern/Make.tags.inc"
-.ifmake TAGS
-COMM!= find ${SYSDIR} -name "arch" -prune -o -name "*.[ch]" -print
-.endif
-
-TAGS: ${SEVBPPC} ${COMM} ${SPPC} ${COMM} ${ASPARC64}
- @echo Making TAGS...
- @${ETAGS} ${SEVBPPC} ${COMM} ${SPPC} ${COMM} "--regex=/^GLOBAL(\(.*\))/\1/" \
- "--regex=/^_C_LABEL(\(.*\)):/\1/" "--regex=/^\(.*\):/\1/" \
- "--regex=/^ENTRY(\(.*\)):/\1/" "--regex=/^ASENTRY(\(.*\)):/\1/" \
- ${APPC} ${AEVBPPC}
+tags:
+ -rm -f ${TEVBPPC}
+ -echo ${SEVBPPC} ${SPPC} | xargs ctags -wadtf ${TEVBPPC}
+ -${FINDCOMM} | xargs ctags -wadtf ${TEVBPPC}
+ egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AEVBPPC} ${APPC} | \
+ ${TOOL_SED} -e \
+ "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
+ >> ${TEVBPPC}
+ sort -o ${TEVBPPC} ${TEVBPPC}
+
+links:
+ -for i in ${DEVBPPC}; do \
+ cd $$i && rm -f tags; ln -s ../tags tags; done
SUBDIR= compile include
Index: src/sys/arch/i386/Makefile
diff -u src/sys/arch/i386/Makefile:1.39 src/sys/arch/i386/Makefile:1.40
--- src/sys/arch/i386/Makefile:1.39 Fri Mar 18 19:48:12 2011
+++ src/sys/arch/i386/Makefile Mon Apr 4 19:46:40 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2011/03/18 19:48:12 dyoung Exp $
+# $NetBSD: Makefile,v 1.40 2011/04/04 19:46:40 dyoung Exp $
# Makefile for i386 tags file and boot blocks
@@ -18,6 +18,11 @@
${SYSDIR}/arch/x86/acpi/*.[ch] \
${SYSDIR}/arch/x86/include/*.h \
${SYSDIR}/arch/x86/isa/*.[ch] \
+ ${SYSDIR}/arch/xen/include/*.h \
+ ${SYSDIR}/arch/xen/i386/*.[ch] \
+ ${SYSDIR}/arch/xen/x86/*.[ch] \
+ ${SYSDIR}/arch/xen/xen/*.[ch] \
+ ${SYSDIR}/arch/xen/xenbus/*.[ch] \
${SYSDIR}/arch/x86/pci/*.[ch]
AI386= ${SYSDIR}/arch/i386/i386/*.S
@@ -29,7 +34,7 @@
tags:
-rm -f ${TI386}
-echo ${SI386} | xargs ctags -wadtf ${TI386}
- -find -H ${SYSDIR}/external/intel-public/acpica/dist/ -name '*.[ch]' | \
+ -find -H ${SYSDIR}/external/bsd/acpica/dist/ -name '*.[ch]' | \
sort -t / -u | xargs ctags -wadtf ${TI386}
-${FINDCOMM} | xargs ctags -wadtf ${TI386}
egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AI386} | \
