diff options
| author | lukem <lukem@NetBSD.org> | 2003-10-19 04:45:01 +0000 |
|---|---|---|
| committer | lukem <lukem@NetBSD.org> | 2003-10-19 04:45:01 +0000 |
| commit | ddff99b7f4b0a48b78f478be4e28eda1e433d3d9 (patch) | |
| tree | 0d9869a2a1f23510eaaea5fbbf8ebc04b10eb063 | |
| parent | c545cc169de3f0de8dcdc54d692f0933d0e3927f (diff) | |
rework to use the newer _MKMSGCREATE (et al) macros
| -rw-r--r-- | bin/csh/Makefile | 6 | ||||
| -rw-r--r-- | bin/ksh/Makefile | 8 | ||||
| -rw-r--r-- | bin/sh/Makefile | 20 | ||||
| -rw-r--r-- | games/adventure/Makefile | 6 | ||||
| -rw-r--r-- | games/boggle/Makefile | 6 | ||||
| -rw-r--r-- | games/fortune/datfiles/Makefile | 24 | ||||
| -rw-r--r-- | games/hack/Makefile | 10 | ||||
| -rw-r--r-- | games/monop/Makefile | 6 | ||||
| -rw-r--r-- | games/phantasia/Makefile | 6 | ||||
| -rw-r--r-- | libexec/ld.aout_so/Makefile | 4 | ||||
| -rw-r--r-- | libexec/ld.elf_so/Makefile | 4 | ||||
| -rw-r--r-- | sbin/wsconsctl/Makefile | 4 | ||||
| -rw-r--r-- | tools/Makefile.host | 6 |
13 files changed, 55 insertions, 55 deletions
diff --git a/bin/csh/Makefile b/bin/csh/Makefile index daf47baeb7b..a861d18dcec 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2003/10/19 00:14:16 lukem Exp $ +# $NetBSD: Makefile,v 1.25 2003/10/19 04:45:01 lukem Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -25,7 +25,7 @@ DPSRCS+= errnum.h const.h CLEANFILES+= errnum.h const.h errnum.h: err.c - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ rm -f ${.TARGET} ${_MKCMD}\ @@ -39,7 +39,7 @@ errnum.h: err.c const.c: errnum.h const.h: const.c - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ rm -f ${.TARGET} ${_MKCMD}\ diff --git a/bin/ksh/Makefile b/bin/ksh/Makefile index 3065fb8834a..fac3ef46a43 100644 --- a/bin/ksh/Makefile +++ b/bin/ksh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2003/10/19 00:18:53 lukem Exp $ +# $NetBSD: Makefile,v 1.19 2003/10/19 04:45:01 lukem Exp $ .include <bsd.own.mk> @@ -21,7 +21,7 @@ USETBL= 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 - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ sh $(.CURDIR)/siglist.sh "$(CC) -E $(CPPFLAGS) $(DEFS) -I. -I$(.CURDIR)" < $(.CURDIR)/siglist.in > siglist.out.tmp \ && mv siglist.out.tmp siglist.out @@ -29,14 +29,14 @@ siglist.out: config.h sh.h siglist.in siglist.sh # two steps to prevent the creation of a bogus emacs.out CLEANFILES+= emacs.out emacs.out.tmp emacs.out: emacs.c - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ 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 - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ sh $(.CURDIR)/mkman ksh $(.CURDIR)/ksh.Man >ksh.1.tmp \ && mv ksh.1.tmp ksh.1 diff --git a/bin/sh/Makefile b/bin/sh/Makefile index e238a3b7ef0..814207f36f1 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2003/10/19 00:43:02 lukem Exp $ +# $NetBSD: Makefile,v 1.71 2003/10/19 04:45:01 lukem Exp $ # @(#)Makefile 8.4 (Berkeley) 5/5/95 .include <bsd.own.mk> @@ -45,30 +45,30 @@ CLEANFILES+= ${GENSRCS} ${GENHDRS} y.tab.h CLEANFILES+= trace token.h: mktokens - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ ${HOST_SH} ${.ALLSRC} builtins.h: builtins.c - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} builtins.c: mkbuiltins shell.h builtins.def - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ ${HOST_SH} ${.ALLSRC} ${.OBJDIR} ${_MKCMD}\ [ -f builtins.h ] init.c: mkinit ${SHSRCS} - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ ./${.ALLSRC} nodes.h: nodes.c nodes.c: mknodes nodetypes nodes.c.pat - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ ./${.ALLSRC} ${_MKCMD}\ @@ -77,7 +77,7 @@ nodes.c: mknodes nodetypes nodes.c.pat syntax.h: syntax.c syntax.c: mksyntax - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ ./${.ALLSRC} ${_MKCMD}\ @@ -89,12 +89,12 @@ NBCOMPATLIB= -L${COMPATOBJDIR} -lnbcompat .endif mkinit: mkinit.c - ${_MKMSG} "compile ${.TARGET}" + ${_MKMSGLINK} ${_MKCMD}\ ${HOST_LINK.c} -o mkinit ${.IMPSRC} ${NBCOMPATLIB} mknodes: mknodes.c - ${_MKMSG} "compile ${.TARGET}" + ${_MKMSGLINK} ${_MKCMD}\ ${HOST_LINK.c} -o mknodes ${.IMPSRC} ${NBCOMPATLIB} @@ -106,7 +106,7 @@ TARGET_CHARFLAG?= -DTARGET_CHAR="signed char" .endif mksyntax: mksyntax.c - ${_MKMSG} "compile ${.TARGET}" + ${_MKMSGLINK} ${_MKCMD}\ ${HOST_LINK.c} ${TARGET_CHARFLAG} -o mksyntax ${.IMPSRC} ${NBCOMPATLIB} diff --git a/games/adventure/Makefile b/games/adventure/Makefile index 5f14446618c..b6c99d3e63f 100644 --- a/games/adventure/Makefile +++ b/games/adventure/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2003/10/19 01:01:44 lukem Exp $ +# $NetBSD: Makefile,v 1.11 2003/10/19 04:45:01 lukem Exp $ # @(#)Makefile 8.1 (Berkeley) 6/12/93 PROG= adventure @@ -8,12 +8,12 @@ HIDEGAME=hidegame CLEANFILES+=setup data.c data.c: glorkz setup - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ ./setup ${.CURDIR}/glorkz > data.c setup: setup.c hdr.h - ${_MKMSG} "compile ${.TARGET}" + ${_MKMSGLINK} ${_MKCMD}\ ${HOST_LINK.c} -o setup ${.CURDIR}/setup.c diff --git a/games/boggle/Makefile b/games/boggle/Makefile index bb12f31ffee..1a7c38476f7 100644 --- a/games/boggle/Makefile +++ b/games/boggle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2003/10/19 01:01:44 lukem Exp $ +# $NetBSD: Makefile,v 1.21 2003/10/19 04:45:01 lukem Exp $ # @(#)Makefile 8.1 (Berkeley) 6/11/93 .include <bsd.own.mk> @@ -26,14 +26,14 @@ ${MKINDEX}: @cd ${.CURDIR}/mkindex && ${MAKE} dictionary: ${WORDS} ${MKDICT} - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ rm -f ${.TARGET} ${_MKCMD}\ ${MKDICT} < ${WORDS} > ${.TARGET} dictindex: dictionary ${MKINDEX} - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ rm -f ${.TARGET} ${_MKCMD}\ diff --git a/games/fortune/datfiles/Makefile b/games/fortune/datfiles/Makefile index 2491870c0c6..6866aa18429 100644 --- a/games/fortune/datfiles/Makefile +++ b/games/fortune/datfiles/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2003/10/19 01:01:44 lukem Exp $ +# $NetBSD: Makefile,v 1.35 2003/10/19 04:45:01 lukem Exp $ # @(#)Makefile 8.2 (Berkeley) 4/19/94 .include <bsd.own.mk> # for INSTALL_OFFENSIVE_FORTUNES @@ -37,7 +37,7 @@ realall: ${DATFILES} # Normal fortunes: build directly from data files. fortunes.dat fortunes2.dat startrek.dat zippy.dat limerick.dat netbsd.dat farber.dat: - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ ${STRFILE} -rs ${.CURDIR}/${.TARGET:R} ${.TARGET} fortunes.dat: fortunes @@ -51,47 +51,47 @@ farber.dat: farber # Obscene fortunes: we have to build source and data files fortunes-o: fortunes-o.${TYPE} - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ tr 'a-zA-Z' 'n-za-mN-ZA-M' < ${.ALLSRC} > ${.TARGET} fortunes-o.dat: fortunes-o - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ ${STRFILE} -rsx ${.ALLSRC} ${.TARGET} fortunes2-o: fortunes2-o.${TYPE} - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ tr 'a-zA-Z' 'n-za-mN-ZA-M' < ${.ALLSRC} > ${.TARGET} fortunes2-o.dat: fortunes2-o - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ ${STRFILE} -rsx ${.ALLSRC} ${.TARGET} limerick-o: limerick-o.${TYPE} - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ tr 'a-zA-Z' 'n-za-mN-ZA-M' < ${.ALLSRC} > ${.TARGET} limerick-o.dat: limerick-o - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ ${STRFILE} -rsx ${.ALLSRC} ${.TARGET} unamerican-o: unamerican-o.${TYPE} - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ tr 'a-zA-Z' 'n-za-mN-ZA-M' < ${.ALLSRC} > ${.TARGET} unamerican-o.dat: unamerican-o - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ ${STRFILE} -rsx ${.ALLSRC} ${.TARGET} netbsd-o: netbsd-o.${TYPE} - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ tr 'a-zA-Z' 'n-za-mN-ZA-M' < ${.ALLSRC} > ${.TARGET} netbsd-o.dat: netbsd-o - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ ${STRFILE} -rsx ${.ALLSRC} ${.TARGET} diff --git a/games/hack/Makefile b/games/hack/Makefile index 61e862369e2..699963805af 100644 --- a/games/hack/Makefile +++ b/games/hack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2003/10/19 01:01:44 lukem Exp $ +# $NetBSD: Makefile,v 1.37 2003/10/19 04:45:01 lukem Exp $ # @(#)Makefile 8.2 (Berkeley) 4/27/95 .include <bsd.own.mk> @@ -28,12 +28,12 @@ FILESDIR=/var/games/hackdir CLEANFILES+=hack.onames.h hack.onames.h: makedefs def.objects.h - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ ./makedefs ${.CURDIR}/def.objects.h > hack.onames.h makedefs: makedefs.c - ${_MKMSG} "compile ${.TARGET}" + ${_MKMSGLINK} ${_MKCMD}\ ${HOST_LINK.c} -o makedefs ${.CURDIR}/makedefs.c @@ -44,11 +44,11 @@ afterinstall: clobber .endif clobber: - ${_MKMSG} "install ${DESTDIR}/var/games/hackdir/perm" + ${_MKMSGINSTALL.m} ${DESTDIR}/var/games/hackdir/perm ${_MKCMD}\ ${INSTALL_FILE} -o games -g games -m 660 /dev/null \ ${DESTDIR}/var/games/hackdir/perm - ${_MKMSG} "install ${DESTDIR}/var/games/hackdir/record" + ${_MKMSGINSTALL.m} ${DESTDIR}/var/games/hackdir/record ${_MKCMD}\ ${INSTALL_FILE} -o games -g games -m 660 /dev/null \ ${DESTDIR}/var/games/hackdir/record diff --git a/games/monop/Makefile b/games/monop/Makefile index bc9bcb7e806..77dd527bbaf 100644 --- a/games/monop/Makefile +++ b/games/monop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2003/10/19 01:01:44 lukem Exp $ +# $NetBSD: Makefile,v 1.25 2003/10/19 04:45:01 lukem Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 .include <bsd.own.mk> @@ -17,12 +17,12 @@ FILESDIR=/usr/share/games realall: ${FILES} initdeck: initdeck.c - ${_MKMSG} "compile ${.TARGET}" + ${_MKMSGLINK} ${_MKCMD}\ ${HOST_LINK.c} -o initdeck ${.CURDIR}/initdeck.c cards.pck: initdeck - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ ./initdeck ${.CURDIR}/cards.inp diff --git a/games/phantasia/Makefile b/games/phantasia/Makefile index 4916c625a02..250aad23403 100644 --- a/games/phantasia/Makefile +++ b/games/phantasia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2003/10/19 01:01:44 lukem Exp $ +# $NetBSD: Makefile,v 1.30 2003/10/19 04:45:01 lukem Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 .include <bsd.own.mk> @@ -31,12 +31,12 @@ CLEANFILES+=map setup setup.lo host_phantglobs.lo ${ALLFILES} realall: ${FILES} ${FILES}: setup - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ ./setup -m ${.CURDIR}/monsters.asc setup: host_phantglobs.lo setup.lo monsters.asc ${LIBM} - ${_MKMSG} "compile ${.TARGET}" + ${_MKMSGLINK} ${_MKCMD}\ ${HOST_LINK.c} host_phantglobs.lo setup.lo -o ${.TARGET} -lm diff --git a/libexec/ld.aout_so/Makefile b/libexec/ld.aout_so/Makefile index 0d7975bca06..1686bb40297 100644 --- a/libexec/ld.aout_so/Makefile +++ b/libexec/ld.aout_so/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2003/10/19 01:19:10 lukem Exp $ +# $NetBSD: Makefile,v 1.43 2003/10/19 04:45:01 lukem Exp $ .include <bsd.own.mk> # for OBJECT_FMT definition .include <bsd.shlib.mk> # for SHLINKINSTALLDIR definition @@ -53,7 +53,7 @@ CLEANFILES+= ld.so all dependall: ${FILES} ld.so: ${.CURDIR}/ld.so.${MACHINE_ARCH}.uue - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ ${TOOL_UUDECODE} ${.ALLSRC} diff --git a/libexec/ld.elf_so/Makefile b/libexec/ld.elf_so/Makefile index 1248afa5fcc..5733220f930 100644 --- a/libexec/ld.elf_so/Makefile +++ b/libexec/ld.elf_so/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2003/10/19 01:19:10 lukem Exp $ +# $NetBSD: Makefile,v 1.63 2003/10/19 04:45:01 lukem Exp $ .include <bsd.own.mk> # for OBJECT_FMT definition .include <bsd.shlib.mk> # for SHLINKINSTALLDIR definition @@ -61,7 +61,7 @@ STRIPFLAG= .PATH: $M ${PROG}: ${OBJS} ${DPADD} - ${_MKMSG} " link ${PROG}" + ${_MKMSGLINK.m} ${PROG} ${_MKCMD}\ ${LD} ${LDFLAGS} -o ${PROG} ${OBJS} ${LDADD} diff --git a/sbin/wsconsctl/Makefile b/sbin/wsconsctl/Makefile index 54a0492f5db..08b377ffd68 100644 --- a/sbin/wsconsctl/Makefile +++ b/sbin/wsconsctl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/10/19 01:23:27 lukem Exp $ +# $NetBSD: Makefile,v 1.9 2003/10/19 04:45:01 lukem Exp $ PROG= wsconsctl SRCS= display.c keyboard.c keysym.c map_parse.y map_scan.l \ @@ -13,7 +13,7 @@ CLEANFILES+= keysym.h .include <bsd.prog.mk> keysym.h: mkkeysym.sh ${DESTDIR}/usr/include/dev/wscons/wsksymdef.h - ${_MKMSG} " create ${.TARGET}" + ${_MKMSGCREATE} ${_MKCMD}\ ${HOST_SH} ${.CURDIR}/mkkeysym.sh \ ${DESTDIR}/usr/include/dev/wscons/wsksymdef.h > keysym.h diff --git a/tools/Makefile.host b/tools/Makefile.host index 65d56aec914..e4a4c7a4c5a 100644 --- a/tools/Makefile.host +++ b/tools/Makefile.host @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.host,v 1.20 2003/10/18 16:33:58 lukem Exp $ +# $NetBSD: Makefile.host,v 1.21 2003/10/19 04:45:01 lukem Exp $ NOLINT= # defined NOMAN= # defined @@ -52,7 +52,7 @@ SRCS+= ${HOST_SRCS} realinstall: install.host install.files install.host: ${HOST_BINDIR}/${HOSTPROGNAME} ${HOST_BINDIR}/${HOSTPROGNAME}:: ${HOSTPROG} - ${_MKMSG} "install ${.TARGET}" + ${_MKMSGINSTALL} ${_MKCMD}\ mkdir -p ${HOST_BINDIR} ${_MKCMD}\ @@ -66,7 +66,7 @@ install.files: .for F in ${HOSTFILES} install.files: ${HOST_FILESDIR}/${F} ${HOST_FILESDIR}/${F}: ${F} - ${_MKMSG} "install ${.TARGET}" + ${_MKMSGINSTALL} ${_MKCMD}\ mkdir -p ${HOST_FILESDIR} ${_MKCMD}\ |
