Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cscope and mkid targets so that they work even when the kernel 

compile directory is not under /usr/src/sys (i.e. when 'S' is not
'../../../..'). Pointed out by Robert Elz in PR 17384.

Thanks again to Andrew Brown for figuring out how to rip .depend apart.
This commit is contained in:
wrstuden 2002-07-02 19:52:16 +00:00
parent d566a58b5e
commit a7f2b918d3
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sys/conf/Makefile.kern.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.kern.inc,v 1.17 2002/06/18 23:46:52 wrstuden Exp $
# $NetBSD: Makefile.kern.inc,v 1.18 2002/07/02 19:52:16 wrstuden Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}. There are
@ -298,14 +298,10 @@ EXTRA_CLEAN+= cscope.out
#
cscope.out: Makefile
@echo Building cscope.out source database
@${MAKE} LIBKERNSRC="`${KERNMAKE} showsources`" \
LIBCOMPATSRC="`${COMPATMAKE} showsources`" cscope.out1
.PHONY: cscope.out1
cscope.out1:
@echo ${SRCS} ${LIBKERNSRC:S|^|${KERNDST}/|} \
${LIBCOMPATSRC:S|^|${COMPATDST}/|} \
| ${CSCOPE} -k -i - -b `echo ${INCLUDES} | sed s/-nostdinc//`
@echo ${SRCS} `sed 's/[^:]*://;s/^ *//;s/ *\\\\ *$$//;' \
lib/kern/.depend lib/compat/.depend | tr ' ' '\n' | \
sed "s|^../../||" | sort -u` \
| ${CSCOPE} -k -i - -b `echo ${INCLUDES} | sed s/-nostdinc//`
# cscope doesn't write cscope.out if it's uptodate, so ensure
# make doesn't keep calling cscope when not needed.
@touch cscope.out
@ -324,17 +320,11 @@ mkid: ID
ID: Makefile depend
# Same dance as cscope.out/cscope.out1
@echo Building mkid database
@${MAKE} LIBKERNSRC="`${KERNMAKE} showsources`" \
LIBCOMPATSRC="`${COMPATMAKE} showsources`" \
LIBKERNDEPEND="`sed 's/[^:]*://;s/^ *//;s/ *\\\\ *$$//;' lib/kern//.depend | tr ' ' '\n' | sort -u`" \
LIBCOMPDEPEND="`sed 's/[^:]*://;s/^ *//;s/ *\\\\ *$$//;' lib/compat/.depend | tr ' ' '\n' | sort -u`" ID1
@${MKID} `sed 's/[^:]*://;s/^ *//;s/ *\\\\ *$$//;' lib/kern/.depend \
lib/compat/.depend | tr ' ' '\n' | sed "s|^../../||" | sort -u` \
`sed 's/[^:]*://;s/^ *//;s/ *\\\\ *$$//;' .depend | tr ' ' '\n' \
| sort -u`
.PHONY: ID1
ID1:
@${MKID} ${SRCS} ${LIBKERNSRC:S|^|${KERNDST}/|} \
${LIBCOMPATSRC:S|^|${COMPATDST}/|} \
${LIBKERNDEPEND:S|^../../||} ${LIBCOMPDEPEND:S|^../../||} \
`sed 's/[^:]*://;s/^ *//;s/ *\\\\ *$$//;' .depend | tr ' ' '\n' | sort -u`
.endif
##