Author: jhb
Date: Fri Jan 13 19:13:43 2012
New Revision: 230073
URL: http://svn.freebsd.org/changeset/base/230073

Log:
  MFC 215605,215606,222952,229400:
  Various improvements to the 'cscope' target:
  - Add x86 to ALL_ARCH.
  - Add lex and yacc sources to things cscope'd.
  - Include sys/xen in cscope tag file generation.
  - Improve the cscope target's handling of MD directories.  Automatically
    include the MACHINE_ARCH directory if it differs from MACHINE when
    building an index for a single machine.  Also, include the 'x86'
    directory when building an index for i386, pc98, or amd64.

Modified:
  stable/8/sys/Makefile
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/Makefile
==============================================================================
--- stable/8/sys/Makefile       Fri Jan 13 19:10:53 2012        (r230072)
+++ stable/8/sys/Makefile       Fri Jan 13 19:13:43 2012        (r230073)
@@ -12,11 +12,19 @@ CSCOPEDIRS= boot bsm cam cddl compat con
                geom gnu isa kern libkern modules net net80211 netatalk \
                netgraph netinet netinet6 netipsec netipx netnatm netncp \
                netsmb nfs nfsclient nfsserver nlm opencrypto \
-               pci rpc security sys ufs vm xdr ${CSCOPE_ARCHDIR}
+               pci rpc security sys ufs vm xdr xen ${CSCOPE_ARCHDIR}
+.if !defined(CSCOPE_ARCHDIR)
 .if defined(ALL_ARCH)
-CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v
+CSCOPE_ARCHDIR = amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v x86
 .else
-CSCOPE_ARCHDIR ?= ${MACHINE}
+CSCOPE_ARCHDIR = ${MACHINE} 
+.if ${MACHINE} != ${MACHINE_ARCH}
+CSCOPE_ARCHDIR += ${MACHINE_ARCH}
+.endif
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
+CSCOPE_ARCHDIR += x86
+.endif
+.endif
 .endif
 
 # Loadable kernel modules
@@ -34,7 +42,7 @@ cscope.out: ${.CURDIR}/cscope.files
 
 ${.CURDIR}/cscope.files: .PHONY
        cd ${.CURDIR}; \
-               find ${CSCOPEDIRS} -name "*.[chSs]" -a -type f > ${.TARGET}
+               find ${CSCOPEDIRS} -name "*.[chSsly]" -a -type f > ${.TARGET}
 
 cscope-clean:
        rm -f cscope.files cscope.out cscope.in.out cscope.po.out
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to