Fri Aug 7 18:28:20 2009 UTC ()
Pull up following revision(s) (requested by sborrill in ticket #904):
	sys/arch/i386/Makefile: revision 1.37 via patch
For the 'tags' target, use the right path to the Atheros HAL sources.


(snj)
diff -r1.35 -r1.35.4.1 src/sys/arch/i386/Makefile
cvs diff -r1.35 -r1.35.4.1 src/sys/arch/i386/Makefile (switch to unified diff)

--- src/sys/arch/i386/Makefile 2008/10/25 22:27:37 1.35
+++ src/sys/arch/i386/Makefile 2009/08/07 18:28:20 1.35.4.1
@@ -1,46 +1,46 @@ @@ -1,46 +1,46 @@
1# $NetBSD: Makefile,v 1.35 2008/10/25 22:27:37 apb Exp $ 1# $NetBSD: Makefile,v 1.35.4.1 2009/08/07 18:28:20 snj Exp $
2 2
3# Makefile for i386 tags file and boot blocks 3# Makefile for i386 tags file and boot blocks
4 4
5TI386= ${SYSDIR}/arch/i386/tags 5TI386= ${SYSDIR}/arch/i386/tags
6SI386= ${SYSDIR}/arch/i386/acpi/*.[ch] \ 6SI386= ${SYSDIR}/arch/i386/acpi/*.[ch] \
7 ${SYSDIR}/arch/i386/eisa/*.[ch] \ 7 ${SYSDIR}/arch/i386/eisa/*.[ch] \
8 ${SYSDIR}/arch/i386/i386/*.[ch] \ 8 ${SYSDIR}/arch/i386/i386/*.[ch] \
9 ${SYSDIR}/arch/i386/include/*.h \ 9 ${SYSDIR}/arch/i386/include/*.h \
10 ${SYSDIR}/arch/i386/isa/*.[ch] \ 10 ${SYSDIR}/arch/i386/isa/*.[ch] \
11 ${SYSDIR}/arch/i386/mca/*.[ch] \ 11 ${SYSDIR}/arch/i386/mca/*.[ch] \
12 ${SYSDIR}/arch/i386/pci/*.[ch] \ 12 ${SYSDIR}/arch/i386/pci/*.[ch] \
13 ${SYSDIR}/arch/i386/pnpbios/*.[ch] \ 13 ${SYSDIR}/arch/i386/pnpbios/*.[ch] \
14 ${SYSDIR}/contrib/dev/ath/*.[ch] \ 14 ${SYSDIR}/external/isc/atheros_hal/dist/*.[ch] \
15 ${SYSDIR}/contrib/dev/ath/netbsd/*.[ch] \ 15 ${SYSDIR}/external/isc/atheros_hal/dist/*/*.[ch] \
16 ${SYSDIR}/contrib/dev/ath/public/*.[ch] 16 ${SYSDIR}/external/isc/atheros_hal/ic/*.[ch]
17SI386+= ${SYSDIR}/arch/x86/x86/*.[ch] \ 17SI386+= ${SYSDIR}/arch/x86/x86/*.[ch] \
18 ${SYSDIR}/arch/x86/acpi/*.[ch] \ 18 ${SYSDIR}/arch/x86/acpi/*.[ch] \
19 ${SYSDIR}/arch/x86/include/*.h \ 19 ${SYSDIR}/arch/x86/include/*.h \
20 ${SYSDIR}/arch/x86/isa/*.[ch] \ 20 ${SYSDIR}/arch/x86/isa/*.[ch] \
21 ${SYSDIR}/arch/x86/pci/*.[ch] 21 ${SYSDIR}/arch/x86/pci/*.[ch]
22AI386= ${SYSDIR}/arch/i386/i386/*.[sS] 22AI386= ${SYSDIR}/arch/i386/i386/*.[sS]
23 23
24# Directories in which to place tags links 24# Directories in which to place tags links
25DI386= i386 eisa isa include pci 25DI386= i386 eisa isa include pci
26 26
27.include "../../kern/Make.tags.inc" 27.include "../../kern/Make.tags.inc"
28 28
29tags: 29tags:
30 -rm -f ${TI386} 30 -rm -f ${TI386}
31 -echo ${SI386} | xargs ctags -wadtf ${TI386} 31 -echo ${SI386} | xargs ctags -wadtf ${TI386}
32 -${FINDCOMM} | xargs ctags -wadtf ${TI386} 32 -${FINDCOMM} | xargs ctags -wadtf ${TI386}
33 egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AI386} | \ 33 egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AI386} | \
34 ${TOOL_SED} -e \ 34 ${TOOL_SED} -e \
35 "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ 35 "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
36 >> ${TI386} 36 >> ${TI386}
37 sort -o ${TI386} ${TI386} 37 sort -o ${TI386} ${TI386}
38 38
39links: 39links:
40 -for i in ${DI386}; do \ 40 -for i in ${DI386}; do \
41 (cd $$i && rm -f tags; ln -s ../tags tags); done 41 (cd $$i && rm -f tags; ln -s ../tags tags); done
42 42
43 43
44SUBDIR= compile include stand ../x86/include ../xen/include 44SUBDIR= compile include stand ../x86/include ../xen/include
45 45
46.include <bsd.subdir.mk> 46.include <bsd.subdir.mk>