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.sbin | |
| 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.sbin')
| -rw-r--r-- | usr.sbin/amd/amd/Makefile | 7 | ||||
| -rw-r--r-- | usr.sbin/amd/fsinfo/Makefile | 7 | ||||
| -rw-r--r-- | usr.sbin/bind/named/Makefile | 10 | ||||
| -rw-r--r-- | usr.sbin/gspa/gspa/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/rpc.pcnfsd/Makefile.clnt | 7 |
5 files changed, 11 insertions, 24 deletions
diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile index 6f29f16b39d..6d5164f5007 100644 --- a/usr.sbin/amd/amd/Makefile +++ b/usr.sbin/amd/amd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2002/11/29 23:25:06 christos Exp $ +# $NetBSD: Makefile,v 1.22 2003/08/01 17:04:06 lukem Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -17,7 +17,7 @@ SRCS= am_ops.c amd.c amfs_auto.c amfs_direct.c amfs_error.c amfs_host.c \ ops_mfs.c ops_nfs.c ops_nfs3.c ops_nullfs.c ops_pcfs.c \ ops_tfs.c ops_tmpfs.c ops_ufs.c ops_umapfs.c ops_unionfs.c \ opts.c restart.c rpc_fwd.c sched.c srvr_amfs_auto.c srvr_nfs.c \ - conf_parse.c conf_tok.c + conf_parse.y conf_tok.l .if (${USE_HESIOD} != "no") SRCS+= info_hesiod.c @@ -37,8 +37,5 @@ CPPFLAGS+= -I${DIST} -I${AMDOBJDIR} LDADD+= ${LIBAMU} -lrpcsvc DPADD+= ${LIBRPCSVC} YHEADER= 1 -CLEANFILES+= conf_tok.c conf_parse.c conf_parse.h - -conf_tok.o: conf_parse.h .include <bsd.prog.mk> diff --git a/usr.sbin/amd/fsinfo/Makefile b/usr.sbin/amd/fsinfo/Makefile index c24e6d7ad03..8b9277eca0c 100644 --- a/usr.sbin/amd/fsinfo/Makefile +++ b/usr.sbin/amd/fsinfo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/01/07 08:00:56 enami Exp $ +# $NetBSD: Makefile,v 1.18 2003/08/01 17:04:06 lukem Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -7,7 +7,7 @@ PROG= fsinfo DIST= ${IDIST}/fsinfo .PATH: ${DIST} -SRCS= fsi_analyze.c fsi_dict.c fsi_gram.c fsi_lex.c fsi_util.c fsinfo.c \ +SRCS= fsi_analyze.c fsi_dict.c fsi_gram.y fsi_lex.l fsi_util.c fsinfo.c \ wr_atab.c wr_bparam.c wr_dumpset.c wr_exportfs.c wr_fstab.c MAN+= fsinfo.8 @@ -16,8 +16,5 @@ FSINFOOBJDIR!=cd ${.CURDIR} && ${PRINTOBJDIR} CPPFLAGS+= -I${DIST} -I${FSINFOOBJDIR} YHEADER= 1 -CLEANFILES+= fsi_lex.c fsi_gram.c fsi_gram.h - -fsi_lex.o fsinfo.o: fsi_gram.h .include <bsd.prog.mk> 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 <bsd.prog.mk> - -${OBJS}: pathnames.h diff --git a/usr.sbin/gspa/gspa/Makefile b/usr.sbin/gspa/gspa/Makefile index acc7b25f01b..18b4a3015a7 100644 --- a/usr.sbin/gspa/gspa/Makefile +++ b/usr.sbin/gspa/gspa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/05/27 21:12:54 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2003/08/01 17:04:07 lukem Exp $ PROG= gspa MAN= gspa.8 @@ -8,6 +8,4 @@ SRCS= gspa.c gsp_out.c gsp_sym.c gsp_lex.c gsp_act.c gsp_eval.c \ gsp_inst.c gsp_pseu.c gsp_gram.y YHEADER=1 -gsp_eval.o gsp_lex.o gspa.o: gsp_gram.h - .include <bsd.prog.mk> diff --git a/usr.sbin/rpc.pcnfsd/Makefile.clnt b/usr.sbin/rpc.pcnfsd/Makefile.clnt index f4996ac0c13..2d3cd5b2cdd 100644 --- a/usr.sbin/rpc.pcnfsd/Makefile.clnt +++ b/usr.sbin/rpc.pcnfsd/Makefile.clnt @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.clnt,v 1.12 2003/07/28 15:25:07 lukem Exp $ +# $NetBSD: Makefile.clnt,v 1.13 2003/08/01 17:04:07 lukem Exp $ # This Makefile builds a client used for testing. @@ -36,8 +36,7 @@ pcnfsd_xdr.c: pcnfsd.x ${XRPCGEN} pcnfsd.h: pcnfsd.x ${XRPCGEN} ${TOOL_RPCGEN} -h ${.CURDIR}/pcnfsd.x -o $@ -CLEANFILES += pcnfsd_clnt.c pcnfsd_xdr.c pcnfsd.h +DPSRCS+= pcnfsd.h +CLEANFILES+= pcnfsd_clnt.c pcnfsd_xdr.c pcnfsd.h .include <bsd.prog.mk> - -${DEPENDSRCS} ${OBJS}: pcnfsd.h |
