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". --- sys/lkm/compat/Makefile.inc | 5 +++-- sys/lkm/exec/ultrix_ecoff/Makefile | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'sys') diff --git a/sys/lkm/compat/Makefile.inc b/sys/lkm/compat/Makefile.inc index eb8225733fe..b4bc50e6cdb 100644 --- a/sys/lkm/compat/Makefile.inc +++ b/sys/lkm/compat/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.13 2003/04/22 17:23:20 jdolecek Exp $ +# $NetBSD: Makefile.inc,v 1.14 2003/08/01 17:04:02 lukem Exp $ .if !target(assym.h) S!= cd ${.CURDIR}/../../..;pwd @@ -7,7 +7,8 @@ NOMAN= # defined .include -DPSRCS+= assym.h +DPSRCS+= assym.h +CLEANFILES+= assym.h .if (${MACHINE_ARCH} == "powerpc") .if (${MACHINE} == "macppc" || ${MACHINE} == "ofppc" || ${MACHINE} == "prep") diff --git a/sys/lkm/exec/ultrix_ecoff/Makefile b/sys/lkm/exec/ultrix_ecoff/Makefile index 3aa13fdbf71..4b51864faf4 100644 --- a/sys/lkm/exec/ultrix_ecoff/Makefile +++ b/sys/lkm/exec/ultrix_ecoff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/05/04 06:36:37 lukem Exp $ +# $NetBSD: Makefile,v 1.6 2003/08/01 17:04:02 lukem Exp $ .include "../Makefile.inc" @@ -11,7 +11,8 @@ KMOD= exec_ultrix_ecoff SRCS= lkminit_exec.c SRCS+= ultrix_exec_ecoff.c -DPSRCS+= mips +DPSRCS+= mips +CLEANFILES+= mips .PHONY: mips mips: -rm -f $@ -- cgit