diff options
68 files changed, 262 insertions, 266 deletions
diff --git a/bin/csh/Makefile b/bin/csh/Makefile index f8b1597c703..ad6393d859d 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2003/07/29 01:34:16 lukem Exp $ +# $NetBSD: Makefile,v 1.23 2003/08/01 17:03:41 lukem Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -20,9 +20,9 @@ MLINKS= csh.1 limit.1 csh.1 alias.1 csh.1 bg.1 csh.1 dirs.1 csh.1 fg.1 \ csh.1 foreach.1 csh.1 history.1 csh.1 jobs.1 csh.1 popd.1 \ csh.1 pushd.1 csh.1 rehash.1 csh.1 repeat.1 csh.1 suspend.1 \ csh.1 stop.1 csh.1 source.1 -CLEANFILES+=errnum.h const.h -const.h: errnum.h +DPSRCS+= errnum.h const.h +CLEANFILES+= errnum.h const.h errnum.h: err.c @rm -f ${.TARGET} @@ -39,14 +39,9 @@ const.h: const.c sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \ sort >> ${.TARGET} -alloc.o const.o csh.o dir.o dol.o err.o exec.o exp.o file.o func.o glob.o \ - hist.o init.o lex.o misc.o parse.o proc.o sem.o set.o str.o time.o: const.h - .if make(install) SUBDIR+=USD.doc .endif .include <bsd.prog.mk> .include <bsd.subdir.mk> - -${DEPENDSRCS} alloc.o: const.h errnum.h diff --git a/bin/ksh/Makefile b/bin/ksh/Makefile index 6cb57e0aeac..aafddbfc433 100644 --- a/bin/ksh/Makefile +++ b/bin/ksh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/11/03 13:39:25 lukem Exp $ +# $NetBSD: Makefile,v 1.17 2003/08/01 17:03:42 lukem Exp $ .include <bsd.own.mk> @@ -18,23 +18,21 @@ DPSRCS+=ksh.1 # needs tbl for the man page. USETBL= -CLEANFILES+= siglist.out emacs.out - +CLEANFILES+= siglist.out siglist.out.tmp # two steps to prevent the creation of a bogus siglist.out siglist.out: config.h sh.h siglist.in siglist.sh - sh $(.CURDIR)/siglist.sh "$(CC) -E $(CPPFLAGS) $(DEFS) -I. -I$(.CURDIR)" < $(.CURDIR)/siglist.in > tmpsiglist.out - mv tmpsiglist.out siglist.out + sh $(.CURDIR)/siglist.sh "$(CC) -E $(CPPFLAGS) $(DEFS) -I. -I$(.CURDIR)" < $(.CURDIR)/siglist.in > siglist.out.tmp \ + && mv siglist.out.tmp siglist.out # two steps to prevent the creation of a bogus emacs.out +CLEANFILES+= emacs.out emacs.out.tmp emacs.out: emacs.c - sh $(.CURDIR)/emacs-gen.sh $(.CURDIR)/emacs.c > tmpemacs.out - mv tmpemacs.out emacs.out + sh $(.CURDIR)/emacs-gen.sh $(.CURDIR)/emacs.c > emacs.out.tmp \ + && mv emacs.out.tmp emacs.out +CLEANFILES+= ksh.1 ksh.1.tmp ksh.1: ksh.Man mkman - sh $(.CURDIR)/mkman ksh $(.CURDIR)/ksh.Man >tmpksh.1 - mv tmpksh.1 ksh.1 - -emacs.o: emacs.out -trap.o: siglist.out + sh $(.CURDIR)/mkman ksh $(.CURDIR)/ksh.Man >ksh.1.tmp \ + && mv ksh.1.tmp ksh.1 .include <bsd.prog.mk> diff --git a/games/atc/Makefile b/games/atc/Makefile index ad5efc6ea08..5adc5e40261 100644 --- a/games/atc/Makefile +++ b/games/atc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 1999/07/17 19:57:03 hubertf Exp $ +# $NetBSD: Makefile,v 1.23 2003/08/01 17:03:42 lukem Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 .include <bsd.own.mk> @@ -22,6 +22,4 @@ FILESDIR=/usr/share/games/atc FILESMODE=444 .endif -lex.o: grammar.h - .include <bsd.prog.mk> diff --git a/games/hack/Makefile b/games/hack/Makefile index 87ec2fe01fd..2bd31032596 100644 --- a/games/hack/Makefile +++ b/games/hack/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.34 2003/07/31 13:54:30 lukem Exp $ +# $NetBSD: Makefile,v 1.35 2003/08/01 17:03:43 lukem Exp $ # @(#)Makefile 8.2 (Berkeley) 4/27/95 .include <bsd.own.mk> PROG= hack CPPFLAGS+=-I. -DPSRCS+=hack.onames.h +DPSRCS+=hack.onames.h hack.h SRCS+= alloc.c hack.Decl.c hack.apply.c hack.bones.c hack.c hack.cmd.c \ hack.do.c hack.do_name.c hack.do_wear.c hack.dog.c hack.eat.c \ hack.end.c hack.engrave.c hack.fight.c hack.invent.c hack.ioctl.c \ @@ -26,6 +26,7 @@ CLEANFILES+=makedefs FILES=help hh data FILESDIR=/var/games/hackdir +CLEANFILES+=hack.onames.h hack.onames.h: makedefs def.objects.h ./makedefs ${.CURDIR}/def.objects.h > hack.onames.h @@ -46,5 +47,3 @@ clobber: rm -f ${DESTDIR}/var/games/hackdir/bones* .include <bsd.prog.mk> - -${OBJS} ${DEPENDSRCS}: hack.h 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 <bsd.lib.mk> -${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 >$@ diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile index 08c552704a7..41ec69fe914 100644 --- a/gnu/usr.bin/binutils/ld/Makefile +++ b/gnu/usr.bin/binutils/ld/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2003/07/28 15:25:04 lukem Exp $ +# $NetBSD: Makefile,v 1.13 2003/08/01 17:03:44 lukem Exp $ .include <bsd.own.mk> @@ -46,7 +46,6 @@ stringify.sed: ${G_STRINGIFY} .include ".depend.${f}" .endif -${DEPENDSRCS}: .depend.${f} .depend.${f}: ${f}.sh (srcdir=${DIST}/ld . ${>:M*.sh} && \ if [ x"$$TEMPLATE_NAME" != x ]; then \ @@ -62,6 +61,7 @@ ${DEPENDSRCS}: .depend.${f} echo "e${f}.c: $$temp_name $$script" \ ) >$@ +DPSRCS+= .depend.${f} e${f}.c CLEANFILES+= .depend.${f} e${f}.c e${f}.c: ${DIST}/ld/genscripts.sh ${.CURDIR}/Makefile stringify.sed diff --git a/gnu/usr.bin/gcc/backend/Makefile b/gnu/usr.bin/gcc/backend/Makefile index b6652821b2a..a9119ae5395 100644 --- a/gnu/usr.bin/gcc/backend/Makefile +++ b/gnu/usr.bin/gcc/backend/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2003/07/28 15:25:04 lukem Exp $ +# $NetBSD: Makefile,v 1.11 2003/08/01 17:03:44 lukem Exp $ NOLINKLIB= # defined NOLINT= # defined @@ -13,6 +13,8 @@ CPPFLAGS+= -I. -I${GCCARCH} ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*} \ -DTARGET_NAME=\"${MACHINE_GNU_PLATFORM}\" HOST_CPPFLAGS+= -I. -I${GCCARCH} ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*} +DPSRCS+= insn-attr.h insn-codes.h insn-config.h insn-flags.h tree-check.h + .include <bsd.lib.mk> # Independent generation programs. @@ -41,6 +43,5 @@ insn-${f}: genrtl.h gen${f:R}.c obstack.c ${G_md_file} \ insn-attrtab.c: ${G_HOST_RTLANAL:S/^l-//:.o=.c} insn-attrtab.c insn-extract.c: insn-config.h -${OBJS} ${DEPENDSRCS}: insn-attr.h insn-codes.h insn-config.h insn-flags.h tree-check.h .PATH: ${DIST}/gcc ${DIST}/libiberty ${G_out_file:H} diff --git a/gnu/usr.bin/gcc/f771/Makefile b/gnu/usr.bin/gcc/f771/Makefile index c2e622db185..46c73b3f8b5 100644 --- a/gnu/usr.bin/gcc/f771/Makefile +++ b/gnu/usr.bin/gcc/f771/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/07/28 15:25:04 lukem Exp $ +# $NetBSD: Makefile,v 1.6 2003/08/01 17:03:44 lukem Exp $ PROG= f771 SRCS= ${G_F77_OBJS:.o=.c} @@ -8,6 +8,7 @@ HOST_CPPFLAGS+= -I${GCCARCH} -DUSE_HCONFIG= \ ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*} .for f in 1t 2t fo io nq op ot +DPSRCS+= str-${f}.h CLEANFILES+= str-${f}.h str-${f}.j .endfor @@ -21,7 +22,6 @@ CLEANFILES+= fini str-${f}.h str-${f}.j: str-${f}.fin fini ./fini ${>:M*.fin} str-${f}.j str-${f}.h -${OBJS} ${DEPENDSRCS}: str-${f}.h .endfor .PATH: ${DIST}/gcc/f diff --git a/gnu/usr.bin/gcc3/backend/Makefile b/gnu/usr.bin/gcc3/backend/Makefile index bb02f36154e..dbe0c0786f2 100644 --- a/gnu/usr.bin/gcc3/backend/Makefile +++ b/gnu/usr.bin/gcc3/backend/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/07/29 00:16:46 uwe Exp $ +# $NetBSD: Makefile,v 1.5 2003/08/01 17:03:45 lukem Exp $ NOLINKLIB= # defined NOLINT= # defined @@ -12,6 +12,7 @@ SRCS= ${G_OBJS:.o=.c} ${G_out_file:T} CPPFLAGS+= -I. -I${GCCARCH} ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*} \ -DTARGET_NAME=\"${MACHINE_GNU_PLATFORM}\" HOST_CPPFLAGS+= -I. -I${GCCARCH} ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*} +DPSRCS+= insn-attr.h insn-codes.h insn-config.h insn-flags.h tree-check.h .include <bsd.lib.mk> @@ -210,6 +211,5 @@ insn-attrtab.c: ${G_HOST_RTLANAL:.o=.c} insn-attrtab.c insn-extract.c: insn-config.h insn-conditions.c: insn-constants.h tm_p.h tm-preds.h toplev.c: options.h -${OBJS} ${DEPENDSRCS}: insn-attr.h insn-codes.h insn-config.h insn-flags.h tree-check.h .PATH: ${DIST}/gcc ${DIST}/libiberty ${G_out_file:H} diff --git a/gnu/usr.bin/gcc3/f771/Makefile b/gnu/usr.bin/gcc3/f771/Makefile index 943d7c619a7..1ad6c36f054 100644 --- a/gnu/usr.bin/gcc3/f771/Makefile +++ b/gnu/usr.bin/gcc3/f771/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/07/29 23:35:25 uwe Exp $ +# $NetBSD: Makefile,v 1.4 2003/08/01 17:03:45 lukem Exp $ PROG= f771 SRCS= ${G_F77_OBJS:.o=.c} main.c @@ -7,6 +7,10 @@ CPPFLAGS+= -I${DIST}/gcc/f -I. HOST_CPPFLAGS+= -I${GCCARCH} -DUSE_HCONFIG= \ ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*} +.for f in 1t 2t fo io nq op ot +DPSRCS+= str-${f}.h +.endfor + .include "../Makefile.backend" fini: fini.c @@ -18,8 +22,6 @@ CLEANFILES+= str-${f}.h str-${f}.j str-${f}.h str-${f}.j: str-${f}.fin fini ./fini ${>:M*.fin} str-${f}.j str-${f}.h - -${OBJS} ${DEPENDSRCS}: str-${f}.h .endfor CLEANFILES+= main.c diff --git a/gnu/usr.bin/gcc3/frontend/Makefile b/gnu/usr.bin/gcc3/frontend/Makefile index 4489a4ec8b1..584a6cc8ae8 100644 --- a/gnu/usr.bin/gcc3/frontend/Makefile +++ b/gnu/usr.bin/gcc3/frontend/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/07/29 23:31:46 uwe Exp $ +# $NetBSD: Makefile,v 1.4 2003/08/01 17:03:46 lukem Exp $ NOLINKLIB= # defined NOLINT= # defined @@ -16,9 +16,9 @@ CPPFLAGS+= -I${.CURDIR} -I${GCCARCH} -I${BACKENDOBJ} -I. \ -DDEFAULT_TARGET_MACHINE=\"${MACHINE_GNU_PLATFORM}\" HOST_CPPFLAGS+= -I${GCCARCH} ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*} -.include <bsd.lib.mk> +DPSRCS+= multilib.h specs.h -${OBJS} ${DEPENDSRCS}: multilib.h specs.h +.include <bsd.lib.mk> .PATH: ${DIST}/gcc diff --git a/lib/libasn1/Makefile b/lib/libasn1/Makefile index 85b0c676ec3..09336872d6d 100644 --- a/lib/libasn1/Makefile +++ b/lib/libasn1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2003/07/10 10:34:21 lukem Exp $ +# $NetBSD: Makefile,v 1.23 2003/08/01 17:03:46 lukem Exp $ NOLINT= # defined @@ -23,11 +23,12 @@ ${ASN1COMPILEOBJ}/asn1_compile: @cd ${.CURDIR}/asn1_compile && ${MAKE} .endif +DPSRCS+= asn1_err.h +CLEANFILES+= asn1_err.h + asn1_err.h asn1_err.c: asn1_err.et ${TOOL_COMPILE_ET} ${TOOL_COMPILE_ET} ${DIST}/heimdal/lib/asn1/asn1_err.et -DPSRCS= asn1_err.h - INCS= krb5_asn1.h asn1_err.h INCSDIR= /usr/include/krb5 diff --git a/lib/libc/arch/alpha/gen/Makefile.inc b/lib/libc/arch/alpha/gen/Makefile.inc index b79b1a2ebc4..38099670ada 100644 --- a/lib/libc/arch/alpha/gen/Makefile.inc +++ b/lib/libc/arch/alpha/gen/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.12 2003/05/17 15:05:52 thorpej Exp $ +# $NetBSD: Makefile.inc,v 1.13 2003/08/01 17:03:46 lukem Exp $ SRCS+= fabs.S @@ -14,10 +14,10 @@ SRCS+= setjmp.S __setjmp14.S SRCS+= sigsetjmp.S __sigsetjmp14.S SRCS+= byte_swap_2.S byte_swap_4.S bswap64.c -LSRCS+= Lint_bswap16.c Lint_bswap32.c -DPSRCS+= Lint_bswap16.c Lint_bswap32.c +SRCS.alpha.gen= Lint_bswap16.c Lint_bswap32.c Lint_swapcontext.c +LSRCS+= ${SRCS.alpha.gen} +DPSRCS+= ${SRCS.alpha.gen} +CLEANFILES+= ${SRCS.alpha.gen} SRCS+= makecontext.c resumecontext.c swapcontext.S _lwp.c -LSRCS+= Lint_swapcontext.c -DPSRCS+= Lint_swapcontext.c diff --git a/lib/libc/arch/alpha/net/Makefile.inc b/lib/libc/arch/alpha/net/Makefile.inc index 05d86256452..3f3b29e43a8 100644 --- a/lib/libc/arch/alpha/net/Makefile.inc +++ b/lib/libc/arch/alpha/net/Makefile.inc @@ -1,8 +1,10 @@ -# $NetBSD: Makefile.inc,v 1.3 1999/01/15 13:31:16 bouyer Exp $ +# $NetBSD: Makefile.inc,v 1.4 2003/08/01 17:03:46 lukem Exp $ # objects built from assembler sources (need lint stubs) # hton* and nto* functions provided by ../gen/byte_swap_*.S SRCS+= -LSRCS+= Lint_htonl.c Lint_htons.c Lint_ntohl.c Lint_ntohs.c -DPSRCS+= Lint_htonl.c Lint_htons.c Lint_ntohl.c Lint_ntohs.c +SRCS.alpha.net= Lint_htonl.c Lint_htons.c Lint_ntohl.c Lint_ntohs.c +LSRCS+= ${SRCS.alpha.net} +DPSRCS+= ${SRCS.alpha.net} +CLEANFILES+= ${SRCS.alpha.net} diff --git a/lib/libc/arch/arm/gen/Makefile.inc b/lib/libc/arch/arm/gen/Makefile.inc index 65a99767a57..9d0c3e201e6 100644 --- a/lib/libc/arch/arm/gen/Makefile.inc +++ b/lib/libc/arch/arm/gen/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.5 2003/05/17 15:05:52 thorpej Exp $ +# $NetBSD: Makefile.inc,v 1.6 2003/08/01 17:03:47 lukem Exp $ SRCS+= alloca.S byte_swap_2.S byte_swap_4.S bswap64.c divsi3.S \ fabs.c flt_rounds.c \ @@ -17,8 +17,7 @@ SRCS+= makecontext.c resumecontext.c swapcontext.S SRCS+= _lwp.c -LSRCS+= Lint_bswap16.c Lint_bswap32.c -DPSRCS+= Lint_bswap16.c Lint_bswap32.c - -LSRCS+= Lint_swapcontext.c -DPSRCS+= Lint_swapcontext.c +SRCS.arm.gen= Lint_bswap16.c Lint_bswap32.c Lint_swapcontext.c +LSRCS+= ${SRCS.arm.gen} +DPSRCS+= ${SRCS.arm.gen} +CLEANFILES+= ${SRCS.arm.gen} diff --git a/lib/libc/arch/i386/gen/Makefile.inc b/lib/libc/arch/i386/gen/Makefile.inc index b5e477388b7..4ebbcaec179 100644 --- a/lib/libc/arch/i386/gen/Makefile.inc +++ b/lib/libc/arch/i386/gen/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.15 2003/05/17 15:05:53 thorpej Exp $ +# $NetBSD: Makefile.inc,v 1.16 2003/08/01 17:03:47 lukem Exp $ # objects built from assembler sources (need lint stubs) SRCS+= alloca.S byte_swap_2.S byte_swap_4.S fabs.S modf.S \ @@ -23,15 +23,13 @@ SRCS+= isnanl_ieee754.c # "internal" objects (don't provide part of the user-visible API) SRCS+= divsi3.S fixdfsi.S fixunsdfsi.S udivsi3.S -LSRCS+= Lint__setjmp.c Lint_alloca.c Lint_bswap16.c Lint_bswap32.c \ - Lint_fabs.c Lint_modf.c \ - Lint___setjmp14.c Lint___sigsetjmp14.c Lint_flt_rounds.c \ - Lint_fpgetmask.c Lint_fpgetround.c Lint_fpgetsticky.c \ - Lint_fpsetmask.c Lint_fpsetround.c Lint_fpsetsticky.c \ - Lint_resumecontext.c Lint_swapcontext.c -DPSRCS+= Lint__setjmp.c Lint_alloca.c Lint_bswap16.c Lint_bswap32.c \ +SRCS.i386.gen=\ + Lint__setjmp.c Lint_alloca.c Lint_bswap16.c Lint_bswap32.c \ Lint_fabs.c Lint_modf.c \ Lint___setjmp14.c Lint___sigsetjmp14.c Lint_flt_rounds.c \ Lint_fpgetmask.c Lint_fpgetround.c Lint_fpgetsticky.c \ Lint_fpsetmask.c Lint_fpsetround.c Lint_fpsetsticky.c \ Lint_resumecontext.c Lint_swapcontext.c +LSRCS+= ${SRCS.i386.gen} +DPSRCS+= ${SRCS.i386.gen} +CLEANFILES+= ${SRCS.i386.gen} diff --git a/lib/libc/arch/i386/net/Makefile.inc b/lib/libc/arch/i386/net/Makefile.inc index af44b5611b3..ff7a99f0039 100644 --- a/lib/libc/arch/i386/net/Makefile.inc +++ b/lib/libc/arch/i386/net/Makefile.inc @@ -1,8 +1,10 @@ -# $NetBSD: Makefile.inc,v 1.3 1999/01/15 13:31:18 bouyer Exp $ +# $NetBSD: Makefile.inc,v 1.4 2003/08/01 17:03:48 lukem Exp $ # objects built from assembler sources (need lint stubs) # hton* and nto* functions provided by ../gen/byte_swap_*.S SRCS+= -LSRCS+= Lint_htonl.c Lint_htons.c Lint_ntohl.c Lint_ntohs.c -DPSRCS+= Lint_htonl.c Lint_htons.c Lint_ntohl.c Lint_ntohs.c +SRCS.i386.net= Lint_htonl.c Lint_htons.c Lint_ntohl.c Lint_ntohs.c +LSRCS+= ${SRCS.i386.net} +DPSRCS+= ${SRCS.i386.net} +CLEANFILES+= ${SRCS.i386.net} diff --git a/lib/libc/arch/i386/stdlib/Makefile.inc b/lib/libc/arch/i386/stdlib/Makefile.inc index caaee212716..80fbe258c29 100644 --- a/lib/libc/arch/i386/stdlib/Makefile.inc +++ b/lib/libc/arch/i386/stdlib/Makefile.inc @@ -1,7 +1,9 @@ -# $NetBSD: Makefile.inc,v 1.3 2000/03/06 18:32:24 kleink Exp $ +# $NetBSD: Makefile.inc,v 1.4 2003/08/01 17:03:48 lukem Exp $ # objects built from assembler sources (need lint stubs) SRCS+= abs.S div.S labs.S ldiv.S llabs.S -LSRCS+= Lint_abs.c Lint_div.c Lint_labs.c Lint_ldiv.c Lint_llabs.c -DPSRCS+= Lint_abs.c Lint_div.c Lint_labs.c Lint_ldiv.c Lint_llabs.c +SRCS.i386.stdlib=Lint_abs.c Lint_div.c Lint_labs.c Lint_ldiv.c Lint_llabs.c +LSRCS+= ${SRCS.i386.stdlib} +DPSRCS+= ${SRCS.i386.stdlib} +CLEANFILES+= ${SRCS.i386.stdlib} diff --git a/lib/libc/arch/i386/string/Makefile.inc b/lib/libc/arch/i386/string/Makefile.inc index 4f3184b6ae2..f701c8d9f7b 100644 --- a/lib/libc/arch/i386/string/Makefile.inc +++ b/lib/libc/arch/i386/string/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.2 1997/11/05 23:43:16 cgd Exp $ +# $NetBSD: Makefile.inc,v 1.3 2003/08/01 17:03:48 lukem Exp $ # objects built from assembler sources (need lint stubs) SRCS+= bcmp.S bcopy.S bzero.S ffs.S index.S memchr.S memcmp.S \ @@ -9,13 +9,12 @@ SRCS+= bcmp.S bcopy.S bzero.S ffs.S index.S memchr.S memcmp.S \ SRCS+= strcspn.c strncat.c strncpy.c strpbrk.c strsep.c strspn.c \ strstr.c -LSRCS+= Lint_bcmp.c Lint_bcopy.c Lint_bzero.c Lint_ffs.c Lint_index.c \ - Lint_memchr.c Lint_memcmp.c Lint_memcpy.c Lint_memmove.c \ - Lint_memset.c Lint_rindex.c Lint_strcat.c Lint_strchr.c \ - Lint_strcmp.c Lint_strcpy.c Lint_strlen.c Lint_strncmp.c \ - Lint_strrchr.c Lint_swab.c -DPSRCS+= Lint_bcmp.c Lint_bcopy.c Lint_bzero.c Lint_ffs.c Lint_index.c \ +SRCS.i386.string=\ + Lint_bcmp.c Lint_bcopy.c Lint_bzero.c Lint_ffs.c Lint_index.c \ Lint_memchr.c Lint_memcmp.c Lint_memcpy.c Lint_memmove.c \ Lint_memset.c Lint_rindex.c Lint_strcat.c Lint_strchr.c \ Lint_strcmp.c Lint_strcpy.c Lint_strlen.c Lint_strncmp.c \ Lint_strrchr.c Lint_swab.c +LSRCS+= ${SRCS.i386.string} +DPSRCS+= ${SRCS.i386.string} +CLEANFILES+= ${SRCS.i386.string} diff --git a/lib/libc/arch/m68k/gen/Makefile.inc b/lib/libc/arch/m68k/gen/Makefile.inc index 02731c6b0fd..d2f5cc559b7 100644 --- a/lib/libc/arch/m68k/gen/Makefile.inc +++ b/lib/libc/arch/m68k/gen/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.17 2003/05/17 15:05:53 thorpej Exp $ +# $NetBSD: Makefile.inc,v 1.18 2003/08/01 17:03:48 lukem Exp $ SRCS+= alloca.S fabs.S @@ -45,8 +45,9 @@ SRCS+= ldexp_ieee754.c # generic ieee754 version .else SRCS+= ldexp_881.c .endif -LSRCS+= Lint_bswap16.c Lint_bswap32.c Lint_bswap64.c -DPSRCS+= Lint_bswap16.c Lint_bswap32.c Lint_bswap64.c -LSRCS+= Lint_resumecontext.c Lint_swapcontext.c -DPSRCS+= Lint_resumecontext.c Lint_swapcontext.c +SRCS.m68k.gen= Lint_bswap16.c Lint_bswap32.c Lint_bswap64.c \ + Lint_resumecontext.c Lint_swapcontext.c +LSRCS+= ${SRCS.m68k.gen} +DPSRCS+= ${SRCS.m68k.gen} +CLEANFILES+= ${SRCS.m68k.gen} diff --git a/lib/libc/arch/mips/gen/Makefile.inc b/lib/libc/arch/mips/gen/Makefile.inc index d1106246f0a..cd6166ebd21 100644 --- a/lib/libc/arch/mips/gen/Makefile.inc +++ b/lib/libc/arch/mips/gen/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.16 2003/05/17 15:05:53 thorpej Exp $ +# $NetBSD: Makefile.inc,v 1.17 2003/08/01 17:03:49 lukem Exp $ SRCS+= fabs.S ldexp.S modf.S @@ -20,8 +20,7 @@ SRCS+= makecontext.c resumecontext.c _resumecontext.S swapcontext.S _lwp.c # mips abi builtin extensions (used by GCC for lexical-closure trampoline) SRCS+= cacheflush.c -LSRCS+= Lint_bswap16.c Lint_bswap32.c -DPSRCS+= Lint_bswap16.c Lint_bswap32.c - -LSRCS+= Lint_swapcontext.c -DPSRCS+= Lint_swapcontext.c +SRCS.mips.gen= Lint_bswap16.c Lint_bswap32.c Lint_swapcontext.c +LSRCS+= ${SRCS.mips.gen} +DPSRCS+= ${SRCS.mips.gen} +CLEANFILES+= ${SRCS.mips.gen} diff --git a/lib/libc/arch/mips/net/Makefile.inc b/lib/libc/arch/mips/net/Makefile.inc index cdc4458ef4e..bb679933b08 100644 --- a/lib/libc/arch/mips/net/Makefile.inc +++ b/lib/libc/arch/mips/net/Makefile.inc @@ -1,8 +1,10 @@ -# $NetBSD: Makefile.inc,v 1.2 1999/01/15 13:31:19 bouyer Exp $ +# $NetBSD: Makefile.inc,v 1.3 2003/08/01 17:03:51 lukem Exp $ # objects built from assembler sources (need lint stubs) # hton* and nto* functions provided by ../gen/byte_swap_*.S SRCS+= -LSRCS+= Lint_htonl.c Lint_htons.c Lint_ntohl.c Lint_ntohs.c -DPSRCS+= Lint_htonl.c Lint_htons.c Lint_ntohl.c Lint_ntohs.c +SRCS.mips.net= Lint_htonl.c Lint_htons.c Lint_ntohl.c Lint_ntohs.c +LSRCS+= ${SRCS.mips.net} +DPSRCS+= ${SRCS.mips.net} +CLEANFILES+= ${SRCS.mips.net} diff --git a/lib/libc/arch/ns32k/Makefile.inc b/lib/libc/arch/ns32k/Makefile.inc index b7f27daf26a..9b2aa82f86d 100644 --- a/lib/libc/arch/ns32k/Makefile.inc +++ b/lib/libc/arch/ns32k/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.14 2002/07/10 04:29:07 thorpej Exp $ +# $NetBSD: Makefile.inc,v 1.15 2003/08/01 17:03:52 lukem Exp $ KMINCLUDES= arch/ns32k/SYS.h KMSRCS= bcmp.S bcopy.S bzero.S ffs.S \ @@ -8,5 +8,6 @@ KMSRCS= bcmp.S bcopy.S bzero.S ffs.S \ SRCS+= ${ASSRCS} LSRCS+= ${ASSRCS:S/S$/c/g:C/^./Lint_&/g} DPSRCS+=${ASSRCS:S/S$/c/g:C/^./Lint_&/g} +CLEANFILES+=${ASSRCS:S/S$/c/g:C/^./Lint_&/g} SRCS+= __sigaction14_sigtramp.c __sigtramp1.S diff --git a/lib/libc/arch/ns32k/gen/Makefile.inc b/lib/libc/arch/ns32k/gen/Makefile.inc index f9e2d88b4fb..eea990593b6 100644 --- a/lib/libc/arch/ns32k/gen/Makefile.inc +++ b/lib/libc/arch/ns32k/gen/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.17 2003/05/17 15:05:54 thorpej Exp $ +# $NetBSD: Makefile.inc,v 1.18 2003/08/01 17:03:52 lukem Exp $ # objects built from assembler sources (need lint stubs) ASSRCS+=alloca.S fabs.S modf.S @@ -24,5 +24,7 @@ SRCS+= isnanl_ieee754.c ldexp_ieee754.c SRCS+= makecontext.c -LSRCS+= Lint_resumecontext.c Lint_swapcontext.c -DPSRCS+= Lint_resumecontext.c Lint_swapcontext.c +SRCS.ns32k.gen= Lint_resumecontext.c Lint_swapcontext.c +LSRCS+= ${SRCS.ns32k.gen} +DPSRCS+= ${SRCS.ns32k.gen} +CLEANFILES+= ${SRCS.ns32k.gen} diff --git a/lib/libc/arch/powerpc/gen/Makefile.inc b/lib/libc/arch/powerpc/gen/Makefile.inc index 64df7c3a32a..fb5ea20d8a9 100644 --- a/lib/libc/arch/powerpc/gen/Makefile.inc +++ b/lib/libc/arch/powerpc/gen/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.12 2003/05/17 15:05:54 thorpej Exp $ +# $NetBSD: Makefile.inc,v 1.13 2003/08/01 17:03:53 lukem Exp $ SRCS+= _setjmp.S setjmp.S sigsetjmp.S __setjmp14.S __sigsetjmp14.S SRCS+= bswap16.c bswap32.c bswap64.c @@ -13,5 +13,7 @@ SRCS+= infinity_ieee754.c nanf_ieee754.c SRCS+= frexp_ieee754.c isinf_ieee754.c isinfl_ieee754.c isnan_ieee754.c SRCS+= isnanl_ieee754.c ldexp_ieee754.c modf_ieee754.c -LSRCS+= Lint_swapcontext.c -DPSRCS+=Lint_swapcontext.c +SRCS.powerpc.gen=Lint_swapcontext.c +LSRCS+= ${SRCS.powerpc.gen} +DPSRCS+= ${SRCS.powerpc.gen} +CLEANFILES+= ${SRCS.powerpc.gen} diff --git a/lib/libc/arch/sh3/gen/Makefile.inc b/lib/libc/arch/sh3/gen/Makefile.inc index 7cb0b75e4d1..87fc510b2ef 100644 --- a/lib/libc/arch/sh3/gen/Makefile.inc +++ b/lib/libc/arch/sh3/gen/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.10 2003/05/17 15:05:54 thorpej Exp $ +# $NetBSD: Makefile.inc,v 1.11 2003/08/01 17:03:54 lukem Exp $ SRCS+= _setjmp.S setjmp.S sigsetjmp.S __setjmp14.S __sigsetjmp14.S @@ -19,5 +19,7 @@ SRCS+= ashiftrt.S ashlsi3.S ashrsi3.S lshrsi3.S movstr.S movstr_i4.S \ KMSRCS+= ashiftrt.S ashlsi3.S ashrsi3.S lshrsi3.S movstr.S movstr_i4.S \ movstrSI.S mulsi3.S sdivsi3.S udivsi3.S -LSRCS+= Lint_swapcontext.c -DPSRCS+= Lint_swapcontext.c +SRCS.sh3.gen= Lint_swapcontext.c +LSRCS+= ${SRCS.sh3.gen} +DPSRCS+= ${SRCS.sh3.gen} +CLEANFILES+= ${SRCS.sh3.gen} diff --git a/lib/libc/arch/sh5/gen/Makefile.inc b/lib/libc/arch/sh5/gen/Makefile.inc index 7e1ed3bdaa4..a9c4367283b 100644 --- a/lib/libc/arch/sh5/gen/Makefile.inc +++ b/lib/libc/arch/sh5/gen/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.8 2003/05/17 15:05:54 thorpej Exp $ +# $NetBSD: Makefile.inc,v 1.9 2003/08/01 17:03:54 lukem Exp $ SRCS+= __setjmp14.S __sigsetjmp14.S _setjmp.S \ alloca.S \ @@ -14,5 +14,7 @@ SRCS+= fpgetmask.S fpgetround.S fpgetsticky.S \ SRCS+= makecontext.c resumecontext.c swapcontext.S _lwp.c -LSRCS+= Lint_bswap16.c Lint_bswap32.c Lint_bswap64.c Lint_swapcontext.c -DPSRCS+= Lint_bswap16.c Lint_bswap32.c Lint_bswap64.c Lint_swapcontext.c +SRCS.sh5.gen= Lint_bswap16.c Lint_bswap32.c Lint_bswap64.c Lint_swapcontext.c +LSRCS+= ${SRCS.sh5.gen} +DPSRCS+= ${SRCS.sh5.gen} +CLEANFILES+= ${SRCS.sh5.gen} diff --git a/lib/libc/arch/sh5/net/Makefile.inc b/lib/libc/arch/sh5/net/Makefile.inc index 1bedb868d3e..b6c35f2aa06 100644 --- a/lib/libc/arch/sh5/net/Makefile.inc +++ b/lib/libc/arch/sh5/net/Makefile.inc @@ -1,7 +1,9 @@ -# $NetBSD: Makefile.inc,v 1.1 2002/07/05 13:31:31 scw Exp $ +# $NetBSD: Makefile.inc,v 1.2 2003/08/01 17:03:55 lukem Exp $ # hton* and nto* functions provided by ../gen/byte_swap_*.S SRCS+= -LSRCS+= Lint_htonl.c Lint_htons.c Lint_ntohl.c Lint_ntohs.c -DPSRCS+= Lint_htonl.c Lint_htons.c Lint_ntohl.c Lint_ntohs.c +SRCS.sh5.net= Lint_htonl.c Lint_htons.c Lint_ntohl.c Lint_ntohs.c +LSRCS+= ${SRCS.sh5.net} +DPSRCS+= ${SRCS.sh5.net} +CLEANFILES+= ${SRCS.sh5.net} diff --git a/lib/libc/arch/sparc/gen/Makefile.inc b/lib/libc/arch/sparc/gen/Makefile.inc index 346260bb05e..7721a300169 100644 --- a/lib/libc/arch/sparc/gen/Makefile.inc +++ b/lib/libc/arch/sparc/gen/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.11 2003/05/17 15:05:55 thorpej Exp $ +# $NetBSD: Makefile.inc,v 1.12 2003/08/01 17:03:55 lukem Exp $ SRCS+= fabs.S modf.S SRCS+= flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \ @@ -18,5 +18,7 @@ SRCS+= makecontext.c resumecontext.c _lwp.c swapcontext.S SRCS+= fixunsdfsi.S mul.S umul.S saveregs.S SRCS+= bswap16.c bswap32.c bswap64.c -LSRCS+= Lint_swapcontext.c -DPSRCS+=Lint_swapcontext.c +SRCS.sparc.gen= Lint_swapcontext.c +LSRCS+= ${SRCS.sparc.gen} +DPSRCS+= ${SRCS.sparc.gen} +CLEANFILES+= ${SRCS.sparc.gen} diff --git a/lib/libc/arch/sparc64/gen/Makefile.inc b/lib/libc/arch/sparc64/gen/Makefile.inc index 4991caa73a8..5fc0cf6f2a9 100644 --- a/lib/libc/arch/sparc64/gen/Makefile.inc +++ b/lib/libc/arch/sparc64/gen/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.8 2003/05/17 15:05:55 thorpej Exp $ +# $NetBSD: Makefile.inc,v 1.9 2003/08/01 17:03:55 lukem Exp $ SRCS+= fabs.S modf.S SRCS+= flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \ @@ -18,5 +18,7 @@ SRCS+= makecontext.c resumecontext.c _lwp.c swapcontext.S SRCS+= fixunsdfsi.S mul.S umul.S saveregs.S -LSRCS+= Lint_swapcontext.c -DPSRCS+=Lint_swapcontext.c +SRCS.sparc64.gen=Lint_swapcontext.c +LSRCS+= ${SRCS.sparc64.gen} +DPSRCS+= ${SRCS.sparc64.gen} +CLEANFILES+= ${SRCS.sparc64.gen} diff --git a/lib/libc/arch/vax/gen/Makefile.inc b/lib/libc/arch/vax/gen/Makefile.inc index 57d00078497..c8d8c842a17 100644 --- a/lib/libc/arch/vax/gen/Makefile.inc +++ b/lib/libc/arch/vax/gen/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.9 2003/05/17 15:05:55 thorpej Exp $ +# $NetBSD: Makefile.inc,v 1.10 2003/08/01 17:03:56 lukem Exp $ SRCS+= byte_swap_2.S byte_swap_4.S bswap64.S \ fabs.S frexp.c \ @@ -14,5 +14,7 @@ SRCS+= byte_swap_2.S byte_swap_4.S bswap64.S \ SRCS+= setjmp.S sigsetjmp.S .endif -LSRCS+= Lint_bswap16.c Lint_bswap32.c Lint_bswap64.c -DPSRCS+= Lint_bswap16.c Lint_bswap32.c Lint_bswap64.c +SRCS.vax.gen= Lint_bswap16.c Lint_bswap32.c Lint_bswap64.c +LSRCS+= ${SRCS.vax.gen} +DPSRCS+= ${SRCS.vax.gen} +CLEANFILES+= ${SRCS.vax.gen} diff --git a/lib/libc/arch/x86_64/gen/Makefile.inc b/lib/libc/arch/x86_64/gen/Makefile.inc index 7b02ef13f93..b28acd58d31 100644 --- a/lib/libc/arch/x86_64/gen/Makefile.inc +++ b/lib/libc/arch/x86_64/gen/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.5 2003/05/17 15:05:55 thorpej Exp $ +# $NetBSD: Makefile.inc,v 1.6 2003/08/01 17:03:56 lukem Exp $ # objects built from assembler sources (need lint stubs) SRCS+= alloca.S bswap64.S byte_swap_2.S byte_swap_4.S fabs.S modf.S \ @@ -19,13 +19,12 @@ SRCS+= infinity_ieee754.c nanf_ieee754.c SRCS+= frexp_ieee754.c isinf_ieee754.c isinfl_ieee754.c isnan_ieee754.c SRCS+= isnanl_ieee754.c -LSRCS+= Lint__setjmp.c Lint_alloca.c Lint_bswap16.c Lint_bswap32.c \ - Lint_bswap64.c Lint_fabs.c Lint_modf.c \ - Lint___setjmp14.c Lint___sigsetjmp14.c Lint_flt_rounds.c \ - Lint_fpgetmask.c Lint_fpgetround.c Lint_fpgetsticky.c \ - Lint_fpsetmask.c Lint_fpsetround.c Lint_fpsetsticky.c -DPSRCS+= Lint__setjmp.c Lint_alloca.c Lint_bswap16.c Lint_bswap32.c \ +SRCS.x86_64.gen=\ + Lint__setjmp.c Lint_alloca.c Lint_bswap16.c Lint_bswap32.c \ Lint_bswap64.c Lint_fabs.c Lint_modf.c \ Lint___setjmp14.c Lint___sigsetjmp14.c Lint_flt_rounds.c \ Lint_fpgetmask.c Lint_fpgetround.c Lint_fpgetsticky.c \ Lint_fpsetmask.c Lint_fpsetround.c Lint_fpsetsticky.c +LSRCS+= ${SRCS.x86_64.gen} +DPSRCS+= ${SRCS.x86_64.gen} +CLEANFILES+= ${SRCS.x86_64.gen} diff --git a/lib/libc/arch/x86_64/net/Makefile.inc b/lib/libc/arch/x86_64/net/Makefile.inc index 3865c51a0af..36219a0dd85 100644 --- a/lib/libc/arch/x86_64/net/Makefile.inc +++ b/lib/libc/arch/x86_64/net/Makefile.inc @@ -1,8 +1,10 @@ -# $NetBSD: Makefile.inc,v 1.1 2001/06/19 00:25:03 fvdl Exp $ +# $NetBSD: Makefile.inc,v 1.2 2003/08/01 17:03:57 lukem Exp $ # objects built from assembler sources (need lint stubs) # hton* and nto* functions provided by ../gen/byte_swap_*.S SRCS+= -LSRCS+= Lint_htonl.c Lint_htons.c Lint_ntohl.c Lint_ntohs.c -DPSRCS+= Lint_htonl.c Lint_htons.c Lint_ntohl.c Lint_ntohs.c +SRCS.x86_64.net=Lint_htonl.c Lint_htons.c Lint_ntohl.c Lint_ntohs.c +LSRCS+= ${SRCS.x86_64.net} +DPSRCS+= ${SRCS.x86_64.net} +CLEANFILES+= ${SRCS.x86_64.net} diff --git a/lib/libc/arch/x86_64/stdlib/Makefile.inc b/lib/libc/arch/x86_64/stdlib/Makefile.inc index 614b5140364..9a9fbc26784 100644 --- a/lib/libc/arch/x86_64/stdlib/Makefile.inc +++ b/lib/libc/arch/x86_64/stdlib/Makefile.inc @@ -1,7 +1,9 @@ -# $NetBSD: Makefile.inc,v 1.1 2001/06/19 00:25:04 fvdl Exp $ +# $NetBSD: Makefile.inc,v 1.2 2003/08/01 17:03:57 lukem Exp $ # objects built from assembler sources (need lint stubs) SRCS+= abs.S div.S labs.S ldiv.S -LSRCS+= Lint_abs.c Lint_div.c Lint_labs.c Lint_ldiv.c Lint_llabs.c -DPSRCS+= Lint_abs.c Lint_div.c Lint_labs.c Lint_ldiv.c Lint_llabs.c +SRCS.x86_64.stdlib=Lint_abs.c Lint_div.c Lint_labs.c Lint_ldiv.c Lint_llabs.c +LSRCS+= ${SRCS.x86_64.stdlib} +DPSRCS+= ${SRCS.x86_64.stdlib} +CLEANFILES+= ${SRCS.x86_64.stdlib} diff --git a/lib/libc/arch/x86_64/string/Makefile.inc b/lib/libc/arch/x86_64/string/Makefile.inc index faecec24ff0..7cd30855875 100644 --- a/lib/libc/arch/x86_64/string/Makefile.inc +++ b/lib/libc/arch/x86_64/string/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.1 2001/06/19 00:25:04 fvdl Exp $ +# $NetBSD: Makefile.inc,v 1.2 2003/08/01 17:03:57 lukem Exp $ # objects built from assembler sources (need lint stubs) SRCS+= bcmp.S bcopy.S bzero.S ffs.S index.S memchr.S memcmp.S \ @@ -9,13 +9,12 @@ SRCS+= bcmp.S bcopy.S bzero.S ffs.S index.S memchr.S memcmp.S \ SRCS+= strcspn.c strncat.c strncpy.c strpbrk.c strsep.c strspn.c \ strstr.c -LSRCS+= Lint_bcmp.c Lint_bcopy.c Lint_bzero.c Lint_ffs.c Lint_index.c \ - Lint_memchr.c Lint_memcmp.c Lint_memcpy.c Lint_memmove.c \ - Lint_memset.c Lint_rindex.c Lint_strcat.c Lint_strchr.c \ - Lint_strcmp.c Lint_strcpy.c Lint_strlen.c Lint_strncmp.c \ - Lint_strrchr.c Lint_swab.c -DPSRCS+= Lint_bcmp.c Lint_bcopy.c Lint_bzero.c Lint_ffs.c Lint_index.c \ +SRCS.x86_64.string=\ + Lint_bcmp.c Lint_bcopy.c Lint_bzero.c Lint_ffs.c Lint_index.c \ Lint_memchr.c Lint_memcmp.c Lint_memcpy.c Lint_memmove.c \ Lint_memset.c Lint_rindex.c Lint_strcat.c Lint_strchr.c \ Lint_strcmp.c Lint_strcpy.c Lint_strlen.c Lint_strncmp.c \ Lint_strrchr.c Lint_swab.c +LSRCS+= ${SRCS.x86_64.string} +DPSRCS+= ${SRCS.x86_64.string} +CLEANFILES+= ${SRCS.x86_64.string} diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc index 438ff77e303..e4e3d4a08a4 100644 --- a/lib/libc/sys/Makefile.inc +++ b/lib/libc/sys/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.140 2003/05/08 13:19:44 christos Exp $ +# $NetBSD: Makefile.inc,v 1.141 2003/08/01 17:03:58 lukem Exp $ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 # sys sources @@ -18,8 +18,9 @@ _LSRC= Lint_Ovfork.c Lint___clone.c Lint___vfork14.c Lint_brk.c Lint_clone.c \ LintSysNormal.c LintSysNoerr.c LintSysPseudoNoerr.c .if ${MKLINT} != "no" -LSRCS+= ${_LSRC} -DPSRCS+=${_LSRC:MLintSys*.c} +LSRCS+= ${_LSRC} +DPSRCS+= ${_LSRC:MLintSys*.c} +CLEANFILES+= ${_LSRC:MLintSys*.c} .endif # glue to offer userland wrappers for some syscalls 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 <bsd.lib.mk> .include <bsd.subdir.mk> - -# 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} diff --git a/lib/libkadm5srv/Makefile b/lib/libkadm5srv/Makefile index 274d1906c69..8f92daeba40 100644 --- a/lib/libkadm5srv/Makefile +++ b/lib/libkadm5srv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2003/07/29 01:45:33 lukem Exp $ +# $NetBSD: Makefile,v 1.22 2003/08/01 17:03:58 lukem Exp $ NOLINT= # defined @@ -22,6 +22,8 @@ kadm5_err.c kadm5_err.h: kadm5_err.et ${TOOL_COMPILE_ET} ${TOOL_COMPILE_ET} ${DIST}/heimdal/lib/kadm5/kadm5_err.et ERR_FILES= kadm5_err.c +DPSRCS+= kadm5_err.h +CLEANFILES+= kadm5_err.h kadm5_err.c SRCS = \ acl.c \ @@ -87,10 +89,4 @@ CPPFLAGS+= -I. \ CPPFLAGS+= -DNO_DLOPEN .endif -${SRCS:.c=.o}: kadm5_err.h - -CLEANFILES= kadm5_err.h kadm5_err.c - .include <bsd.lib.mk> - -${DEPENDSRCS}: kadm5_err.h diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile index ccf97638b5e..8834c322c7b 100644 --- a/lib/libpcap/Makefile +++ b/lib/libpcap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2002/09/14 14:59:30 thorpej Exp $ +# $NetBSD: Makefile,v 1.24 2003/08/01 17:03:59 lukem Exp $ .include <bsd.own.mk> @@ -27,6 +27,4 @@ SRCS+= bpf_filter.c version.c INCS= pcap-namedb.h pcap.h INCSDIR=/usr/include -scanner.c: grammar.h - .include <bsd.lib.mk> diff --git a/lib/libposix/sys/Makefile.inc b/lib/libposix/sys/Makefile.inc index c629c578bb0..90b3e27a24d 100644 --- a/lib/libposix/sys/Makefile.inc +++ b/lib/libposix/sys/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.17 2003/05/08 13:23:14 christos Exp $ +# $NetBSD: Makefile.inc,v 1.18 2003/08/01 17:03:59 lukem Exp $ # sys sources .PATH: ${.CURDIR}/sys @@ -20,6 +20,7 @@ ${PSEUDO}: ${ASMDEPS} .if ${MKLINT} != "no" LSRCS+= LintSysPseudo.c DPSRCS+= LintSysPseudo.c +CLEANFILES+= LintSysPseudo.c .endif LintSysPseudo.c: ${NETBSDSRCDIR}/lib/libc/sys/makelintstub \ diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile index afb50e7a744..f63bcd3e893 100644 --- a/lib/libpthread/Makefile +++ b/lib/libpthread/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2003/07/24 07:50:24 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2003/08/01 17:03:59 lukem Exp $ # WARNS= 2 @@ -25,6 +25,7 @@ ARCHDIR= ${.CURDIR}/arch/${ARCHSUBDIR} CPPFLAGS+= -I${ARCHDIR} -I${.CURDIR} -I${.OBJDIR} -D_LIBC DPSRCS+= assym.h +CLEANFILES+= assym.h assym.h: genassym.sh ${ARCHDIR}/genassym.cf sh ${.CURDIR}/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \ diff --git a/regress/lib/libc/rpc/xdr/Makefile b/regress/lib/libc/rpc/xdr/Makefile index 8153e95b255..5dcdb0d6a25 100644 --- a/regress/lib/libc/rpc/xdr/Makefile +++ b/regress/lib/libc/rpc/xdr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/07/29 02:45:23 lukem Exp $ +# $NetBSD: Makefile,v 1.10 2003/08/01 17:04:00 lukem Exp $ NOMAN= # defined @@ -6,7 +6,7 @@ PROG= xdrtest RPCSRCS= testbits.x SRCS= ${RPCSRCS:.x=_xdr.c} xdrtest.c DPSRCS= ${RPCSRCS:.x=.h} -CLEANFILES+= ${RPCSRCS:.x=_xdr.c} +CLEANFILES+= ${RPCSRCS:.x=.h} ${RPCSRCS:.x=_xdr.c} CPPFLAGS+= -I. RPC_INCS= ${RPCSRCS:.x=.h} RPC_XDRFILES= ${RPCSRCS:.x=_xdr.c} diff --git a/sbin/wsconsctl/Makefile b/sbin/wsconsctl/Makefile index 0f2eb22def7..66330482ab5 100644 --- a/sbin/wsconsctl/Makefile +++ b/sbin/wsconsctl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/29 01:45:34 lukem Exp $ +# $NetBSD: Makefile,v 1.7 2003/08/01 17:04:00 lukem Exp $ PROG= wsconsctl SRCS= display.c keyboard.c keysym.c map_parse.y map_scan.l \ @@ -7,12 +7,11 @@ MAN= wsconsctl.8 YHEADER= 1 CPPFLAGS+= -I. -I${.CURDIR} +DPSRCS+= keysym.h CLEANFILES+= keysym.h .include <bsd.prog.mk> -${DEPENDSRCS} keysym.c: keysym.h - keysym.h: mkkeysym.sh ${DESTDIR}/usr/include/dev/wscons/wsksymdef.h sh ${.CURDIR}/mkkeysym.sh \ ${DESTDIR}/usr/include/dev/wscons/wsksymdef.h > keysym.h diff --git a/share/doc/standards/xopen/Makefile b/share/doc/standards/xopen/Makefile index 357b7a1a72e..fab35d174f3 100644 --- a/share/doc/standards/xopen/Makefile +++ b/share/doc/standards/xopen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/07/28 15:25:06 lukem Exp $ +# $NetBSD: Makefile,v 1.5 2003/08/01 17:04:01 lukem Exp $ DOCS= xcu5 .for i in ${DOCS} @@ -36,8 +36,4 @@ echosrcs! ${SRCS} echomore! @echo ${.OBJDIR}/${TARG}.more -# make the "afterdepend" rule happy -${DEPENDSRCS}: - @touch $@ - .include <bsd.doc.mk> diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk index 3f1eb602de7..4af60ff2dcb 100644 --- a/share/mk/bsd.dep.mk +++ b/share/mk/bsd.dep.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.dep.mk,v 1.54 2003/08/01 00:55:43 lukem Exp $ +# $NetBSD: bsd.dep.mk,v 1.55 2003/08/01 17:04:01 lukem Exp $ ##### Basic targets .PHONY: cleandepend @@ -17,23 +17,18 @@ MKDEP?= mkdep .if defined(SRCS) # { __acpp_flags= -traditional-cpp -DEPENDSRCS.src= ${SRCS:M*.c} ${DPSRCS:M*.c} \ - ${SRCS:M*.m} ${DPSRCS:M*.m} \ - ${SRCS:M*.[sS]} ${DPSRCS:M*.[sS]} \ - ${SRCS:M*.C} ${DPSRCS:M*.C} \ - ${SRCS:M*.cc} ${DPSRCS:M*.cc} \ - ${SRCS:M*.cpp} ${DPSRCS:M*.cpp} \ - ${SRCS:M*.cxx} ${DPSRCS:M*.cxx} -DEPENDSRCS.d= ${DEPENDSRCS.src:R:S/$/.d/g} -DEPENDSRCS= .depend ${DEPENDSRCS.d} +__DPSRCS.all= ${SRCS:C/\.(c|m|s|S|C|cc|cpp|cxx)$/.d/} \ + ${DPSRCS:C/\.(c|m|s|S|C|cc|cpp|cxx)$/.d/} +__DPSRCS.d= ${__DPSRCS.all:O:u:M*.d} +__DPSRCS.notd= ${__DPSRCS.all:O:u:N*.d} -${DEPENDSRCS.d}: ${DPSRCS} +.NOPATH: .depend ${__DPSRCS.d} -.depend: ${DEPENDSRCS.d} - @rm -f .depend - cat ${DEPENDSRCS.d} > .depend +${__DPSRCS.d}: ${__DPSRCS.notd} ${DPSRCS} -.NOPATH: ${DEPENDSRCS} +.depend: ${__DPSRCS.d} + @rm -f .depend + cat ${__DPSRCS.d} > .depend .SUFFIXES: .d .c .m .s .S .C .cc .cpp .cxx @@ -60,7 +55,7 @@ ${DEPENDSRCS.d}: ${DPSRCS} ##### Clean rules cleandepend: .if defined(SRCS) - rm -f ${DEPENDSRCS} ${.CURDIR}/tags ${CLEANDEPEND} + rm -f .depend ${__DPSRCS.d} ${.CURDIR}/tags ${CLEANDEPEND} .endif ##### Custom rules diff --git a/share/mk/bsd.hostlib.mk b/share/mk/bsd.hostlib.mk index e2136c1eaaa..d9a856159ff 100644 --- a/share/mk/bsd.hostlib.mk +++ b/share/mk/bsd.hostlib.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.hostlib.mk,v 1.6 2003/07/31 13:47:32 lukem Exp $ +# $NetBSD: bsd.hostlib.mk,v 1.7 2003/08/01 17:04:01 lukem Exp $ .include <bsd.init.mk> .include <bsd.sys.mk> @@ -21,7 +21,8 @@ OBJHOSTMACHINE= # set ##### Build rules .if defined(HOSTLIB) DPSRCS+= ${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c} -CLEANFILES+= ${DPSRCS} ${YHEADER:D${SRCS:M*.y:.y=.h}} +CLEANFILES+= ${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c} +CLEANFILES+= ${YHEADER:D${SRCS:M*.y:.y=.h}} .endif # defined(HOSTLIB) .if !empty(SRCS:N*.h:N*.sh) @@ -31,7 +32,9 @@ OBJS+= ${SRCS:N*.h:N*.sh:R:S/$/.lo/g} .if defined(OBJS) && !empty(OBJS) .NOPATH: ${OBJS} ${HOSTPROG} ${SRCS:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS:M*.y:.y=.h}} -lib${HOSTLIB}.a: ${DPSRCS} ${OBJS} ${DPADD} +${OBJS}: ${DPSRCS} + +lib${HOSTLIB}.a: ${OBJS} ${DPADD} -rm -f ${.TARGET} ${HOST_AR} cq ${.TARGET} ${OBJS} @${HOST_RANLIB} ${.TARGET} diff --git a/share/mk/bsd.hostprog.mk b/share/mk/bsd.hostprog.mk index cff924fd887..759f59b48da 100644 --- a/share/mk/bsd.hostprog.mk +++ b/share/mk/bsd.hostprog.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.hostprog.mk,v 1.31 2003/07/28 23:54:24 lukem Exp $ +# $NetBSD: bsd.hostprog.mk,v 1.32 2003/08/01 17:04:01 lukem Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .include <bsd.init.mk> @@ -63,7 +63,8 @@ OBJHOSTMACHINE= # set SRCS?= ${HOSTPROG}.c DPSRCS+= ${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c} -CLEANFILES+= ${DPSRCS} ${YHEADER:D${SRCS:M*.y:.y=.h}} +CLEANFILES+= ${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c} +CLEANFILES+= ${YHEADER:D${SRCS:M*.y:.y=.h}} .if !empty(SRCS:N*.h:N*.sh) OBJS+= ${SRCS:N*.h:N*.sh:R:S/$/.lo/g} @@ -73,7 +74,8 @@ LOBJS+= ${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln} .if defined(OBJS) && !empty(OBJS) .NOPATH: ${OBJS} ${HOSTPROG} ${SRCS:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS:M*.y:.y=.h}} -${HOSTPROG}: ${DPSRCS} ${OBJS} ${DPADD} +${OBJS} ${LOBJS}: ${DPSRCS} +${HOSTPROG}: ${OBJS} ${DPADD} ${HOST_LINK.c} ${HOST_LDSTATIC} -o ${.TARGET} ${OBJS} ${LDADD} .endif # defined(OBJS) && !empty(OBJS) diff --git a/share/mk/bsd.kmod.mk b/share/mk/bsd.kmod.mk index c2c1b9be5b7..e7d51b0da7a 100644 --- a/share/mk/bsd.kmod.mk +++ b/share/mk/bsd.kmod.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.kmod.mk,v 1.66 2003/07/31 13:47:32 lukem Exp $ +# $NetBSD: bsd.kmod.mk,v 1.67 2003/08/01 17:04:01 lukem Exp $ .include <bsd.init.mk> @@ -16,8 +16,9 @@ CPPFLAGS+= -nostdinc -I. -I${.CURDIR} -isystem $S -isystem $S/arch CPPFLAGS+= -D_KERNEL -D_LKM DPSRCS+= ${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c} -CLEANFILES+= ${DPSRCS} ${YHEADER:D${SRCS:M*.y:.y=.h}} \ - machine ${MACHINE_CPU} tmp.o +CLEANFILES+= ${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c} +CLEANFILES+= ${YHEADER:D${SRCS:M*.y:.y=.h}} +CLEANFILES+= machine ${MACHINE_CPU} tmp.o # see below why this is necessary .if ${MACHINE} == "sun2" || ${MACHINE} == "sun3" @@ -40,7 +41,7 @@ MAN?= ${KMOD}.4 ##### Build rules realall: ${PROG} -${OBJS}: ${DPSRCS} +${OBJS} ${LOBJS}: ${DPSRCS} .if ${MACHINE_ARCH} == "powerpc" ${KMOD}_tmp.o: ${OBJS} ${DPADD} diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 89016a65cfc..7d1696b6970 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.lib.mk,v 1.229 2003/07/28 23:54:24 lukem Exp $ +# $NetBSD: bsd.lib.mk,v 1.230 2003/08/01 17:04:01 lukem Exp $ # @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94 .include <bsd.init.mk> @@ -363,7 +363,10 @@ __archivesymlinkpic: .USE ${INSTALL_SYMLINK} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET} DPSRCS+= ${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c} -CLEANFILES+= ${DPSRCS} ${YHEADER:D${SRCS:M*.y:.y=.h}} +CLEANFILES+= ${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c} +CLEANFILES+= ${YHEADER:D${SRCS:M*.y:.y=.h}} + +${OBJS} ${POBJS} ${SOBJS} ${LOBJS}: ${DPSRCS} lib${LIB}.a:: ${OBJS} __archivebuild @echo building standard ${LIB} library diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 2d0a540c18d..f7c3a1932c9 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prog.mk,v 1.181 2003/08/01 13:08:35 lukem Exp $ +# $NetBSD: bsd.prog.mk,v 1.182 2003/08/01 17:04:01 lukem Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .ifndef HOSTPROG @@ -90,7 +90,9 @@ SRCS?= ${PROG}.c .endif DPSRCS+= ${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c} -CLEANFILES+= ${DPSRCS} ${YHEADER:D${SRCS:M*.y:.y=.h}} +DPSRCS+= ${YHEADER:D${SRCS:M*.y:.y=.h}} +CLEANFILES+= ${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c} +CLEANFILES+= ${YHEADER:D${SRCS:M*.y:.y=.h}} .if !empty(SRCS:N*.h:N*.sh:N*.fth) OBJS+= ${SRCS:N*.h:N*.sh:N*.fth:R:S/$/.o/g} @@ -140,7 +142,9 @@ _CCLINK= ${CC} echo "source ${__gdbinit}" >> .gdbinit .endfor -${PROG}: .gdbinit ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} +${OBJS} ${LOBJS}: ${DPSRCS} + +${PROG}: .gdbinit ${LIBCRT0} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} .if !commands(${PROG}) .if defined(DESTDIR) ${_CCLINK} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib ${_PROGLDOPTS} ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -L${_GCC_LIBGCCDIR} -L${DESTDIR}/usr/lib ${_SUPCXX} -lgcc -lc -lgcc ${LIBCRTEND} 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 <bsd.own.mk> -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 $@ diff --git a/tools/compat/Makefile b/tools/compat/Makefile index f1e892d1c7d..48717de0246 100644 --- a/tools/compat/Makefile +++ b/tools/compat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2003/07/29 19:25:02 fredb Exp $ +# $NetBSD: Makefile,v 1.26 2003/08/01 17:04:02 lukem Exp $ HOSTLIB= nbcompat @@ -38,7 +38,8 @@ CPPFLAGS+= -I. -I./include -I${.CURDIR} -DHAVE_CONFIG_H \ ${.CURDIR}/../../usr.bin/lex DPSRCS+= defs.mk -CLEANFILES= config.log config.status configure.lineno confdefs.h *.stamp +CLEANFILES+= defs.mk +CLEANFILES+= config.log config.status configure.lineno confdefs.h *.stamp # Get components of Berkeley DB. _CURDIR:= ${.CURDIR} 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" 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 |
