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". --- gnu/lib/libgcc3/Makefile | 5 ++--- gnu/lib/libobjc/Makefile | 4 ++-- gnu/lib/libobjc3/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu/lib') diff --git a/gnu/lib/libgcc3/Makefile b/gnu/lib/libgcc3/Makefile index cd3457b2646..206d184e27e 100644 --- a/gnu/lib/libgcc3/Makefile +++ b/gnu/lib/libgcc3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/08/01 13:55:37 mrg Exp $ +# $NetBSD: Makefile,v 1.8 2003/08/01 17:03:43 lukem Exp $ REQUIRETOOLS= yes NOLINT= # defined @@ -28,6 +28,7 @@ LIB2_EH= ${G_LIB2ADDEH:M*.c:T} SRCS+= ${LIB2FUNCS} ${LIB2DIVMOD} ${LIB2_EH} ${G_LIB2ADD:M*.c:T} +DPSRCS+= ${.CURDIR}/${MACHINE_ARCH}.mk tconfig.h CLEANFILES+= ${LIB2FUNCS} tconfig.h ${LIB2FUNCS}: ${.CURDIR}/Makefile @@ -55,8 +56,6 @@ dp-bit.c: ${.CURDIR}/Makefile .include -${OBJS} ${SOBJS} ${POBJS} ${DEPENDSRCS}: ${.CURDIR}/${MACHINE_ARCH}.mk tconfig.h - # XXX /bin/sh tconfig.h: TM_DEFINES="$(G_tm_defines)" \ diff --git a/gnu/lib/libobjc/Makefile b/gnu/lib/libobjc/Makefile index 717abeef2bf..8f06ba1e258 100644 --- a/gnu/lib/libobjc/Makefile +++ b/gnu/lib/libobjc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2003/06/01 02:08:08 thorpej Exp $ +# $NetBSD: Makefile,v 1.23 2003/08/01 17:03:43 lukem Exp $ REQUIRETOOLS= yes NOLINT= # defined @@ -27,7 +27,7 @@ INCS= ${G_OBJC_H} INCSDIR= /usr/include/objc DPSRCS+= runtime-info.h -CLEANFILES+= rtscratch rtscratch.s +CLEANFILES+= rtscratch rtscratch.s runtime-info.h runtime-info.h: @touch rtscratch `${OBJC} --print-prog-name=cc1obj` -print-objc-runtime-info rtscratch >$@ diff --git a/gnu/lib/libobjc3/Makefile b/gnu/lib/libobjc3/Makefile index ee4640e08a7..5dc3e07cc12 100644 --- a/gnu/lib/libobjc3/Makefile +++ b/gnu/lib/libobjc3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/08/01 13:55:38 mrg Exp $ +# $NetBSD: Makefile,v 1.6 2003/08/01 17:03:43 lukem Exp $ REQUIRETOOLS= yes NOLINT= # defined @@ -41,7 +41,7 @@ INCS= ${G_OBJC_H} INCSDIR= /usr/include/objc DPSRCS+= runtime-info.h -CLEANFILES+= rtscratch rtscratch.s +CLEANFILES+= rtscratch rtscratch.s runtime-info.h runtime-info.h: @touch rtscratch `${OBJC} --print-prog-name=cc1obj` -print-objc-runtime-info rtscratch >$@ -- cgit