From a93ea220fcb3e34cdfdcd4d7a5d391e0b2b4f2ba Mon Sep 17 00:00:00 2001 From: lukem Date: Fri, 1 Aug 2003 17:03:41 +0000 Subject: Rework how dependency generation is performed: * DPSRCS contains extra dependencies, but is _NOT_ added to CLEANFILES. This is a change of behaviour. If a Makefile wants the clean semantics it must specifically append to CLEANFILES. Resolves PR toolchain/5204. * To recap: .d (depend) files are generated for all files in SRCS and DPSRCS that have a suffix of: .c .m .s .S .C .cc .cpp .cxx * If YHEADER is set, automatically add the .y->.h to DPSRCS & CLEANFILES * Ensure that ${OBJS} ${POBJS} ${LOBJS} ${SOBJS} *.d depend upon ${DPSRCS} * Deprecate the (short lived) DEPENDSRCS Update the various Makefiles to these new semantics; generally either adding to CLEANFILES (because DPSRCS doesn't do that anymore), or replacing specific .o dependencies with DPSRCS entries. Tested with "make -j 8 distribution" and "make distribution". --- usr.sbin/bind/named/Makefile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'usr.sbin/bind') diff --git a/usr.sbin/bind/named/Makefile b/usr.sbin/bind/named/Makefile index 52f00f79793..e11c59adc96 100644 --- a/usr.sbin/bind/named/Makefile +++ b/usr.sbin/bind/named/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/06/28 16:27:15 lukem Exp $ +# $NetBSD: Makefile,v 1.12 2003/08/01 17:04:07 lukem Exp $ .include "../Makefile.inc" .PATH: ${BIND_DIST_DIR}/bin/named \ @@ -41,12 +41,8 @@ pathnames.h: ${BIND_DIST_DIR}/bin/named/pathtemplate.h -e "s|%DESTRUN%|/var/run|" -e "s|%DESTEXEC%|/usr/libexec|" \ < ${BIND_DIST_DIR}/bin/named/pathtemplate.h > pathnames.h -CLEANFILES+=pathnames.h - -# mention explicit dependency, so pathnames.h will appear timely -db_dump.c: pathnames.h +DPSRCS+= pathnames.h +CLEANFILES+= pathnames.h .include "../../Makefile.inc" .include - -${OBJS}: pathnames.h -- cgit