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". --- lib/libedit/Makefile | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'lib/libedit') diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile index f1f18d663c4..36835256fb7 100644 --- a/lib/libedit/Makefile +++ b/lib/libedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2003/07/31 12:46:00 lukem Exp $ +# $NetBSD: Makefile,v 1.28 2003/08/01 17:03:58 lukem Exp $ # @(#)Makefile 8.1 (Berkeley) 6/4/93 USE_SHLIBDIR= yes @@ -28,7 +28,7 @@ LIBEDITDIR?=${.CURDIR} INCS= histedit.h INCSDIR=/usr/include -CLEANFILES+=editline.c fcns.c help.c ${OSRCS:.c=.d} +CLEANFILES+=editline.c CLEANFILES+=common.h.tmp editline.c.tmp emacs.h.tmp fcns.c.tmp fcns.h.tmp CLEANFILES+=help.c.tmp help.h.tmp vi.h.tmp CPPFLAGS+=-I. -I${LIBEDITDIR} @@ -39,8 +39,8 @@ CPPFLAGS+=#-DDEBUG_PASTE -DDEBUG_EDIT AHDR=vi.h emacs.h common.h ASRC=${LIBEDITDIR}/vi.c ${LIBEDITDIR}/emacs.c ${LIBEDITDIR}/common.c -DPHDRS= ${AHDR} fcns.h help.h -DPSRCS+=${DPHDRS} +DPSRCS+= ${AHDR} fcns.h help.h fcns.c help.c +CLEANFILES+= ${AHDR} fcns.h help.h fcns.c help.c SUBDIR= readline @@ -86,9 +86,3 @@ test: libedit.a test.o .include .include - -# minimal dependency to make "make depend" optional -editline.o editline.po editline.so editline.ln: ${DPHDRS} fcns.c help.c -readline.o readline.po readline.so readline.ln: ${DPHDRS} - -${DEPENDSRCS} ${OSRCS:.c=.d}: ${DPHDRS} -- cgit