diff options
| author | lukem <lukem@NetBSD.org> | 2003-08-01 17:03:41 +0000 |
|---|---|---|
| committer | lukem <lukem@NetBSD.org> | 2003-08-01 17:03:41 +0000 |
| commit | a93ea220fcb3e34cdfdcd4d7a5d391e0b2b4f2ba (patch) | |
| tree | c9adfc000f1b3f310cf2f812f02823dbff7766ca /usr.bin | |
| parent | 5aa077f5cfe13c86bb3596f0e709337147ffc49c (diff) | |
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".
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/mkcsmapper/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/mkesdb/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/mklocale/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/tn3270/mset/Makefile | 3 | ||||
| -rw-r--r-- | usr.bin/tn3270/tn3270/Makefile | 10 | ||||
| -rw-r--r-- | usr.bin/tn3270/tools/prt3270/Makefile | 8 | ||||
| -rw-r--r-- | usr.bin/top/Makefile | 3 | ||||
| -rw-r--r-- | usr.bin/xlint/lint1/Makefile | 4 |
8 files changed, 21 insertions, 25 deletions
diff --git a/usr.bin/mkcsmapper/Makefile b/usr.bin/mkcsmapper/Makefile index d27f776087c..e3bac4c157d 100644 --- a/usr.bin/mkcsmapper/Makefile +++ b/usr.bin/mkcsmapper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2003/06/26 06:30:13 tshiozak Exp $ +# $NetBSD: Makefile,v 1.2 2003/08/01 17:04:03 lukem Exp $ .ifndef HOSTPROG .include <bsd.own.mk> @@ -15,11 +15,9 @@ CPPFLAGS+= -I. -I${.CURDIR} -I${NETBSDSRCDIR}/lib/libc \ -I${NETBSDSRCDIR}/lib/libc/citrus \ -I${NETBSDSRCDIR}/lib/libc/citrus/modules \ -DHOSTPROG -YHEADER= +YHEADER= 1 MKMAN= no -lex.o: yacc.h # for parallel make. - .ifndef HOSTPROG .include <bsd.prog.mk> .endif diff --git a/usr.bin/mkesdb/Makefile b/usr.bin/mkesdb/Makefile index 12183036bf5..1f244a4805d 100644 --- a/usr.bin/mkesdb/Makefile +++ b/usr.bin/mkesdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2003/06/26 06:30:16 tshiozak Exp $ +# $NetBSD: Makefile,v 1.2 2003/08/01 17:04:04 lukem Exp $ .ifndef HOSTPROG .include <bsd.own.mk> @@ -14,11 +14,9 @@ SRCS= yacc.y lex.l \ CPPFLAGS+= -I. -I${.CURDIR} -I${NETBSDSRCDIR}/lib/libc \ -I${NETBSDSRCDIR}/lib/libc/citrus \ -DHOSTPROG -YHEADER= +YHEADER= 1 MKMAN= no -lex.o: yacc.h # for parallel make. - .ifndef HOSTPROG .include <bsd.prog.mk> .endif diff --git a/usr.bin/mklocale/Makefile b/usr.bin/mklocale/Makefile index 53bfca0819b..eeeb2fbf9c0 100644 --- a/usr.bin/mklocale/Makefile +++ b/usr.bin/mklocale/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2003/05/18 07:57:36 lukem Exp $ +# $NetBSD: Makefile,v 1.11 2003/08/01 17:04:04 lukem Exp $ .include <bsd.own.mk> @@ -6,8 +6,6 @@ WARNS?= 2 PROG= mklocale SRCS= yacc.y lex.l CPPFLAGS+= -I. -I${.CURDIR} -I${NETBSDSRCDIR}/lib/libc -YHEADER= - -lex.o: yacc.h # for parallel make. +YHEADER= 1 .include <bsd.prog.mk> diff --git a/usr.bin/tn3270/mset/Makefile b/usr.bin/tn3270/mset/Makefile index 82b8e1f6ef2..38bd8bf7d63 100644 --- a/usr.bin/tn3270/mset/Makefile +++ b/usr.bin/tn3270/mset/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2000/12/30 14:54:41 sommerfeld Exp $ +# $NetBSD: Makefile,v 1.24 2003/08/01 17:04:04 lukem Exp $ .include <bsd.own.mk> @@ -13,6 +13,7 @@ MKASTOSC=${MKASTOSCDIR}/mkastosc ${MKASTOSC}: cd ${.CURDIR}/../tools/mkastosc; ${MAKE} +CLEANFILES+= astosc.out astosc.out: ${.CURDIR}/../ctlr/hostctlr.h ${.CURDIR}/../ctlr/function.h \ ${.CURDIR}/../ctlr/${KBD} ${MKASTOSC} ${MKASTOSC} \ diff --git a/usr.bin/tn3270/tn3270/Makefile b/usr.bin/tn3270/tn3270/Makefile index 49222033fa5..e98e3f4187f 100644 --- a/usr.bin/tn3270/tn3270/Makefile +++ b/usr.bin/tn3270/tn3270/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2002/09/18 20:55:24 lha Exp $ +# $NetBSD: Makefile,v 1.34 2003/08/01 17:04:05 lukem Exp $ .include <bsd.own.mk> @@ -44,17 +44,17 @@ astosc.out: ${.CURDIR}/../ctlr/hostctlr.h ${.CURDIR}/../ctlr/function.h \ ${.CURDIR}/../ctlr/hostctlr.h ${.CURDIR}/../ctlr/function.h \ < ${.CURDIR}/../ctlr/${KBD} > astosc.tmp mv -f astosc.tmp ${.TARGET} -CLEANFILES+= astosc.tmp +CLEANFILES+= astosc.tmp astosc.out asc_disp.out: ${MKASTODS} ${MKASTODS} > asc_disp.tmp mv -f asc_disp.tmp ${.TARGET} -CLEANFILES+= asc_disp.tmp +CLEANFILES+= asc_disp.tmp asc_disp.out disp_asc.out: ${MKDSTOAS} ${MKDSTOAS} > disp_asc.tmp mv -f disp_asc.tmp ${.TARGET} -CLEANFILES+= disp_asc.tmp +CLEANFILES+= disp_asc.tmp disp_asc.out kbd.out: ${.CURDIR}/../ctlr/hostctlr.h ${.CURDIR}/../ctlr/${KBD} ${MKHITS} ${CC} ${CPPFLAGS} -E ${.CURDIR}/../ctlr/function.c > TMPfunc.out @@ -63,7 +63,7 @@ kbd.out: ${.CURDIR}/../ctlr/hostctlr.h ${.CURDIR}/../ctlr/${KBD} ${MKHITS} < ${.CURDIR}/../ctlr/${KBD} > kbd.tmp rm -f TMPFunc.out mv -f kbd.tmp ${.TARGET} -CLEANFILES+= TMPfunc.out kbd.tmp +CLEANFILES+= TMPfunc.out kbd.tmp kbd.out .include <bsd.prog.mk> diff --git a/usr.bin/tn3270/tools/prt3270/Makefile b/usr.bin/tn3270/tools/prt3270/Makefile index 0b978e78f8c..3f233cd5a5a 100644 --- a/usr.bin/tn3270/tools/prt3270/Makefile +++ b/usr.bin/tn3270/tools/prt3270/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/12/30 14:54:41 sommerfeld Exp $ +# $NetBSD: Makefile,v 1.9 2003/08/01 17:04:05 lukem Exp $ .include <bsd.own.mk> @@ -20,6 +20,7 @@ kbd.out: ${.CURDIR}/../../ctlr/hostctlr.h ${.CURDIR}/../../ctlr/${KBD} ${MKHITS} < ${.CURDIR}/../../ctlr/${KBD} > kbd.tmp rm -f TMPfunc.out mv -f kbd.tmp ${.TARGET} +CLEANFILES+= TMPfunc.out kbd.tmp kbd.out MKASTOSCDIR!=cd ${.CURDIR}/../mkastosc && ${PRINTOBJDIR} MKASTOSC= ${MKASTOSCDIR}/mkastosc @@ -31,8 +32,9 @@ astosc.out: ${.CURDIR}/../../ctlr/hostctlr.h ${.CURDIR}/../../ctlr/function.h \ ${.CURDIR}/../../ctlr/${KBD} ${MKASTOSC} ${MKASTOSC} \ ${.CURDIR}/../../ctlr/hostctlr.h ${.CURDIR}/../../ctlr/function.h \ - < ${.CURDIR}/../../ctlr/${KBD} > tmp - mv -f tmp ${.TARGET} + < ${.CURDIR}/../../ctlr/${KBD} > astosc.tmp + mv -f astosc.tmp ${.TARGET} +CLEANFILES+= astosc.tmp astosc.out .include <bsd.hostprog.mk> diff --git a/usr.bin/top/Makefile b/usr.bin/top/Makefile index ed890cf0dd5..d8ed313568d 100644 --- a/usr.bin/top/Makefile +++ b/usr.bin/top/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/03/14 22:56:14 lukem Exp $ +# $NetBSD: Makefile,v 1.6 2003/08/01 17:04:05 lukem Exp $ PROG= top @@ -15,6 +15,7 @@ DPADD+= ${LIBTERMCAP} ${LIBM} ${LIBKVM} sigdesc.h: ${.CURDIR}/sigconv.awk ${DESTDIR}/usr/include/sys/signal.h awk -f ${.CURDIR}/sigconv.awk ${DESTDIR}/usr/include/sys/signal.h > \ ${.TARGET} +CLEANFILES+= sigdesc.h commands.c: sigdesc.h diff --git a/usr.bin/xlint/lint1/Makefile b/usr.bin/xlint/lint1/Makefile index 513ac37deff..99bf53abc4c 100644 --- a/usr.bin/xlint/lint1/Makefile +++ b/usr.bin/xlint/lint1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2003/05/30 13:38:09 christos Exp $ +# $NetBSD: Makefile,v 1.32 2003/08/01 17:04:06 lukem Exp $ .include <bsd.own.mk> @@ -26,8 +26,6 @@ LINTFLAGS= -aehpz WFORMAT=1 #hopeless BINDIR= /usr/libexec -scan.c: cgram.h - CLEANFILES+= ${MAN} .if ${USETOOLS} == "yes" |
