summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authordyoung <dyoung@NetBSD.org>2007-06-24 01:03:35 +0000
committerdyoung <dyoung@NetBSD.org>2007-06-24 01:03:35 +0000
commit82cc8fc3512acfdfdfb6bfbdd036a2a9d2cad2ec (patch)
tree3584e07beb96d77f6e0ea878bd04e61f01d6b97d /sys
parent115d8ccfd70547900ad09187eb109c707035cb64 (diff)
In sys/kern/Make.tags.inc, create an intermediate variable FINDCOMM.
FINDCOMM contains the find(1) command that produces the list of NetBSD sources that all architectures share, COMM. For backwards compatibility, evaluate FINDCOMM to produce ${COMM}. In arch/evbmips/Makefile, use FINDCOMM directly, because the command-line 'echo $COMM ...' was too long.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/evbmips/Makefile7
-rw-r--r--sys/kern/Make.tags.inc5
2 files changed, 7 insertions, 5 deletions
diff --git a/sys/arch/evbmips/Makefile b/sys/arch/evbmips/Makefile
index 5d53639fee6..32395c3640e 100644
--- a/sys/arch/evbmips/Makefile
+++ b/sys/arch/evbmips/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/03/14 19:00:57 dyoung Exp $
+# $NetBSD: Makefile,v 1.5 2007/06/24 01:03:35 dyoung Exp $
# Makefile for evbmips tags file and boot blocks
@@ -18,8 +18,9 @@ DEVBMIPS= evbmips include isa pci
.include "../../kern/Make.tags.inc"
tags:
- -rm ${TEVBMIPS}
- -echo ${SEVBMIPS} ${SMIPS} ${COMM} | xargs ctags -wadtf ${TEVBMIPS}
+ -rm -f ${TEVBMIPS}
+ -echo ${SEVBMIPS} ${SMIPS} | xargs ctags -wadtf ${TEVBMIPS}
+ -${FINDCOMM} | xargs ctags -wadtf ${TEVBMIPS}
egrep "^LEAF(.*)|^[AN]LEAF(.*)|^NON_LEAF(.*)" ${AEVBMIPS} ${AMIPS} | \
sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
>> ${TEVBMIPS}
diff --git a/sys/kern/Make.tags.inc b/sys/kern/Make.tags.inc
index 0ed49388811..cb75da6ce2c 100644
--- a/sys/kern/Make.tags.inc
+++ b/sys/kern/Make.tags.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Make.tags.inc,v 1.13 2007/05/26 05:34:04 dyoung Exp $
+# $NetBSD: Make.tags.inc,v 1.14 2007/06/24 01:03:35 dyoung Exp $
#
# from: @(#)Make.tags.inc 8.1 (Berkeley) 6/11/93
@@ -15,6 +15,7 @@
# This promises to be easier to maintain, considering how often the directory
# structure of the kernel sources has been changing recently.
SYSDIR?= ${.CURDIR:H:H}
-COMM!= find -H ${SYSDIR} \( -path '*/dist/ipf' -o -name arch \) -prune -o -type f -name "*.[ch]" \( \! -name 'usb_port.h' \! -name 'midway*' \! -name 'if_lmc.[ch]' \) -print | \
+FINDCOMM= find -H ${SYSDIR} \( -path '*/dist/ipf' -o -name arch \) -prune -o -type f -name "*.[ch]" \( \! -name 'usb_port.h' \! -name 'midway*' \! -name 'if_lmc.[ch]' \) -print | \
sort -t / -u
+COMM!= ${FINDCOMM}
.endif