Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Fix target 'tags'.
details: https://anonhg.NetBSD.org/src/rev/bbe16b031400
branches: trunk
changeset: 763816:bbe16b031400
user: dyoung <dyoung%NetBSD.org@localhost>
date: Mon Apr 04 19:44:16 2011 +0000
description:
Fix target 'tags'.
diffstat:
sys/arch/atari/Makefile | 20 ++++++++---
sys/arch/cats/Makefile | 20 +++++++----
sys/arch/cobalt/Makefile | 16 +++++---
sys/arch/evbarm/Makefile | 76 +++++++++++++++++++++++++++++++++++++-------
sys/arch/evbmips/Makefile | 16 ++++++--
sys/arch/evbppc/Makefile | 49 ++++++++++++++++------------
sys/arch/i386/Makefile | 9 ++++-
sys/arch/mips/Makefile.inc | 11 +++++-
sys/arch/netwinder/Makefile | 23 ++++++++-----
sys/arch/ofppc/Makefile | 30 +++++++++++++++++-
sys/arch/prep/Makefile | 25 ++++++++------
sys/arch/sandpoint/Makefile | 30 +++++++++++++++++-
12 files changed, 240 insertions(+), 85 deletions(-)
diffs (truncated from 519 to 300 lines):
diff -r 4205f066e804 -r bbe16b031400 sys/arch/atari/Makefile
--- a/sys/arch/atari/Makefile Mon Apr 04 19:43:34 2011 +0000
+++ b/sys/arch/atari/Makefile Mon Apr 04 19:44:16 2011 +0000
@@ -1,14 +1,20 @@
-# $NetBSD: Makefile,v 1.7 2008/10/25 22:27:37 apb Exp $
+# $NetBSD: Makefile,v 1.8 2011/04/04 19:44:16 dyoung Exp $
# Makefile for atari tags file and boot blocks
# Find where m68k source files are for inclusion in tags
.include <../m68k/Makefile.inc>
-TATARI= ../atari/tags
-SATARI= ../atari/atari/*.[ch] ../atari/include/*.h \
- ../atari/dev/*.[ch]
-AATARI= ../atari/atari/*.s
+TATARI= ${SYSDIR}/arch/atari/tags
+SATARI= ${SYSDIR}/arch/atari/atari/*.[ch]
+SATARI+= ${SYSDIR}/arch/atari/include/*.h
+SATARI+= ${SYSDIR}/arch/atari/dev/*.[ch]
+SATARI+= ${SYSDIR}/arch/atari/isa/*.[ch]
+SATARI+= ${SYSDIR}/arch/atari/pci/*.[ch]
+SATARI+= ${SYSDIR}/arch/atari/vme/*.[ch]
+
+AATARI= ${SYSDIR}/arch/atari/atari/*.s
+AATARI+= ${SYSDIR}/arch/atari/dev/*.s
# Directories in which to place tags links
DATARI= atari dev include
@@ -16,7 +22,9 @@
.include "../../kern/Make.tags.inc"
tags:
- -ctags -wdtf ${TATARI} ${SATARI} ${SM68K} ${COMM}
+ -rm -f ${TATARI}
+ -echo ${SATARI} ${SM68K} | xargs ctags -wadtf ${TATARI}
+ -${FINDCOMM} | xargs ctags -wadtf ${TATARI}
egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AATARI} ${AM68K} | \
${TOOL_SED} "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
>> ${TATARI}
diff -r 4205f066e804 -r bbe16b031400 sys/arch/cats/Makefile
--- a/sys/arch/cats/Makefile Mon Apr 04 19:43:34 2011 +0000
+++ b/sys/arch/cats/Makefile Mon Apr 04 19:44:16 2011 +0000
@@ -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}
diff -r 4205f066e804 -r bbe16b031400 sys/arch/cobalt/Makefile
--- a/sys/arch/cobalt/Makefile Mon Apr 04 19:43:34 2011 +0000
+++ b/sys/arch/cobalt/Makefile Mon Apr 04 19:44:16 2011 +0000
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.5 2008/10/25 22:27:37 apb Exp $
+# $NetBSD: Makefile,v 1.6 2011/04/04 19:45:00 dyoung Exp $
# Makefile for cobalt tags file
# Find where mips source files are for inclusion in tags
.include <../mips/Makefile.inc>
-TCOBALT= ../cobalt/tags
-SCOBALT= ../cobalt/cobalt/*.[ch] ../cobalt/include/*.h \
- ../cobalt/dev/*.[ch] ../cobalt/pci/*.[ch]
-ACOBALT= ../cobalt/cobalt/*.S
+TCOBALT= ${SYSDIR}/arch/cobalt/tags
+SCOBALT= ${SYSDIR}/arch/cobalt/cobalt/*.[ch] \
+ ${SYSDIR}/arch/cobalt/include/*.h \
+ ${SYSDIR}/arch/cobalt/dev/*.[ch] \
+ ${SYSDIR}/arch/cobalt/pci/*.[ch]
+ACOBALT= ${SYSDIR}/arch/cobalt/cobalt/*.S
# Directories in which to place tags links
DCOBALT= pci include
@@ -16,7 +18,9 @@
.include "../../kern/Make.tags.inc"
tags:
- -ctags -wdtf ${TCOBALT} ${SCOBALT} ${SMIPS} ${COMM}
+ -rm -f ${TCOBALT}
+ -echo ${SCOBALT} ${SMIPS} | xargs ctags -wadtf ${TCOBALT}
+ -${FINDCOMM} | xargs ctags -wadtf ${TCOBALT}
egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ACOBALT} ${AMIPS} | \
${TOOL_SED} -e \
"s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
diff -r 4205f066e804 -r bbe16b031400 sys/arch/evbarm/Makefile
--- a/sys/arch/evbarm/Makefile Mon Apr 04 19:43:34 2011 +0000
+++ b/sys/arch/evbarm/Makefile Mon Apr 04 19:44:16 2011 +0000
@@ -1,17 +1,67 @@
-# $NetBSD: Makefile,v 1.6 2008/10/25 22:27:37 apb Exp $
+# $NetBSD: Makefile,v 1.7 2011/04/04 19:45:24 dyoung Exp $
# Makefile for evbarm tags file and boot blocks
+# Find where ARM source files are for inclusion in tags
+.include <../arm/Makefile.inc>
+
TEVBARM= ${SYSDIR}/arch/evbarm/tags
-SEVBARM= ${SYSDIR}/arch/arm/xscale/*.[ch] \
- ${SYSDIR}/arch/evbarm/dev/*.[ch] \
- ${SYSDIR}/arch/evbarm/ifpga/*.[ch] \
- ${SYSDIR}/arch/evbarm/include/*.h \
- ${SYSDIR}/arch/evbarm/integrator/*.[ch] \
- ${SYSDIR}/arch/evbarm/iq31244/*.[ch] \
- ${SYSDIR}/arch/evbarm/iq80310/*.[ch] \
- ${SYSDIR}/arch/evbarm/iq80321/*.[ch]
-AEVBARM= ${SYSDIR}/arch/evbarm/integrator/*.S
+SEVBARM= ${SYSDIR}/arch/evbarm/adi_brh/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/armadillo/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/beagle/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/cp3100/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/dev/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/devkit8000/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/evbarm/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/g42xxeb/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/gemini/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/gumstix/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/hdl_g/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/ifpga/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/imx31/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/include/*.h
+SEVBARM+= ${SYSDIR}/arch/evbarm/integrator/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/iq31244/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/iq80310/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/iq80321/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/ixdp425/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/ixm1200/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/lubbock/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/marvell/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/mpcsa/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/netwalker/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/npwr_fc/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/nslu2/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/osk5912/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/smdk2xx0/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/tisdp24xx/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/tsarm/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/viper/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/arm/xscale/*.[ch]
+
+AEVBARM= ${SYSDIR}/arch/evbarm/adi_brh/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/armadillo/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/beagle/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/g42xxeb/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/gemini/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/gumstix/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/hdl_g/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/imx31/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/ixdp425/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/ixm1200/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/lubbock/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/marvell/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/mpcsa/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/netwalker/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/nslu2/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/smdk2xx0/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/tisdp24xx/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/tsarm/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/viper/*.S
+AEVBARM+= ${SYSDIR}/arch/arm/xscale/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/integrator/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/iq80310/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/iq80321/*.S
# Directories in which to place tags links
DEVBARM= include
@@ -20,11 +70,11 @@
tags:
-rm -f ${TEVBARM}
- -echo ${SEVBARM} | xargs ctags -wadtf ${TEVBARM}
+ -echo ${SEVBARM} ${SARM} | xargs ctags -wadtf ${TEVBARM}
-${FINDCOMM} | xargs ctags -wadtf ${TEVBARM}
- egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AEVBARM} | \
+ egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AEVBARM} ${AARM} | \
${TOOL_SED} -e \
- "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
+ "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
>> ${TEVBARM}
sort -o ${TEVBARM} ${TEVBARM}
diff -r 4205f066e804 -r bbe16b031400 sys/arch/evbmips/Makefile
--- a/sys/arch/evbmips/Makefile Mon Apr 04 19:43:34 2011 +0000
+++ b/sys/arch/evbmips/Makefile Mon Apr 04 19:44:16 2011 +0000
@@ -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}
diff -r 4205f066e804 -r bbe16b031400 sys/arch/evbppc/Makefile
--- a/sys/arch/evbppc/Makefile Mon Apr 04 19:43:34 2011 +0000
+++ b/sys/arch/evbppc/Makefile Mon Apr 04 19:44:16 2011 +0000
@@ -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:
+ -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}
-TAGS: ${SEVBPPC} ${COMM} ${SPPC} ${COMM} ${ASPARC64}
Home |
Main Index |
Thread Index |
Old Index