From e6dd2bf0d9cd42a64f883c87f8ae2e3355419e32 Mon Sep 17 00:00:00 2001 From: dsl Date: Mon, 10 Nov 2003 18:21:55 +0000 Subject: [PATCH] Use modified mkdep(1) (not cat) to merge '*.d' into '.depend'. Allows some of the postprocessing to be done there instead of a separate sed script called from 'afterdepend'. --- share/mk/bsd.dep.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk index d5fd4cb740ba..b3a3daa66f28 100644 --- a/share/mk/bsd.dep.mk +++ b/share/mk/bsd.dep.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.dep.mk,v 1.62 2003/10/28 01:25:33 mrg Exp $ +# $NetBSD: bsd.dep.mk,v 1.63 2003/11/10 18:21:55 dsl Exp $ ##### Basic targets .PHONY: cleandepend @@ -9,7 +9,8 @@ realdepend: beforedepend .depend afterdepend beforedepend .depend afterdepend: # ensure existence ##### Default values -MKDEP?= mkdep +MKDEP?= mkdep +MKDEP_SUFFIXES?= .o ##### Build rules # some of the rules involve .h sources, so remove them from mkdep line @@ -32,7 +33,7 @@ ${__DPSRCS.d}: ${__DPSRCS.notd} ${DPSRCS} .depend: ${__DPSRCS.d} ${_MKTARGET_CREATE} rm -f .depend - cat ${__DPSRCS.d} /dev/null > .depend + ${MKDEP} -d -f ${.TARGET} -s ${MKDEP_SUFFIXES:Q} ${__DPSRCS.d} .SUFFIXES: .d .s .S .c .C .cc .cpp .cxx .m