diff options
| -rw-r--r-- | adventure/Makefile | 8 | ||||
| -rw-r--r-- | boggle/Makefile | 10 | ||||
| -rw-r--r-- | fortune/datfiles/Makefile | 35 | ||||
| -rw-r--r-- | hack/Makefile | 17 | ||||
| -rw-r--r-- | monop/Makefile | 8 | ||||
| -rw-r--r-- | phantasia/Makefile | 8 |
6 files changed, 30 insertions, 56 deletions
diff --git a/adventure/Makefile b/adventure/Makefile index b6c99d3e..b48a6249 100644 --- a/adventure/Makefile +++ b/adventure/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2003/10/19 04:45:01 lukem Exp $ +# $NetBSD: Makefile,v 1.12 2003/10/21 10:01:19 lukem Exp $ # @(#)Makefile 8.1 (Berkeley) 6/12/93 PROG= adventure @@ -8,13 +8,11 @@ HIDEGAME=hidegame CLEANFILES+=setup data.c data.c: glorkz setup - ${_MKMSGCREATE} - ${_MKCMD}\ + ${_MKTARGET_CREATE} ./setup ${.CURDIR}/glorkz > data.c setup: setup.c hdr.h - ${_MKMSGLINK} - ${_MKCMD}\ + ${_MKTARGET_LINK} ${HOST_LINK.c} -o setup ${.CURDIR}/setup.c .include <bsd.prog.mk> diff --git a/boggle/Makefile b/boggle/Makefile index 1a7c3847..59d2f358 100644 --- a/boggle/Makefile +++ b/boggle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2003/10/19 04:45:01 lukem Exp $ +# $NetBSD: Makefile,v 1.22 2003/10/21 10:01:19 lukem Exp $ # @(#)Makefile 8.1 (Berkeley) 6/11/93 .include <bsd.own.mk> @@ -26,17 +26,13 @@ ${MKINDEX}: @cd ${.CURDIR}/mkindex && ${MAKE} dictionary: ${WORDS} ${MKDICT} - ${_MKMSGCREATE} - ${_MKCMD}\ + ${_MKTARGET_CREATE} rm -f ${.TARGET} - ${_MKCMD}\ ${MKDICT} < ${WORDS} > ${.TARGET} dictindex: dictionary ${MKINDEX} - ${_MKMSGCREATE} - ${_MKCMD}\ + ${_MKTARGET_CREATE} rm -f ${.TARGET} - ${_MKCMD}\ ${MKINDEX} < dictionary > ${.TARGET} .include <bsd.prog.mk> diff --git a/fortune/datfiles/Makefile b/fortune/datfiles/Makefile index 6866aa18..0a3eed0b 100644 --- a/fortune/datfiles/Makefile +++ b/fortune/datfiles/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2003/10/19 04:45:01 lukem Exp $ +# $NetBSD: Makefile,v 1.36 2003/10/21 10:01:19 lukem Exp $ # @(#)Makefile 8.2 (Berkeley) 4/19/94 .include <bsd.own.mk> # for INSTALL_OFFENSIVE_FORTUNES @@ -37,8 +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: - ${_MKMSGCREATE} - ${_MKCMD}\ + ${_MKTARGET_CREATE} ${STRFILE} -rs ${.CURDIR}/${.TARGET:R} ${.TARGET} fortunes.dat: fortunes fortunes2.dat: fortunes2 @@ -51,48 +50,38 @@ farber.dat: farber # Obscene fortunes: we have to build source and data files fortunes-o: fortunes-o.${TYPE} - ${_MKMSGCREATE} - ${_MKCMD}\ + ${_MKTARGET_CREATE} tr 'a-zA-Z' 'n-za-mN-ZA-M' < ${.ALLSRC} > ${.TARGET} fortunes-o.dat: fortunes-o - ${_MKMSGCREATE} - ${_MKCMD}\ + ${_MKTARGET_CREATE} ${STRFILE} -rsx ${.ALLSRC} ${.TARGET} fortunes2-o: fortunes2-o.${TYPE} - ${_MKMSGCREATE} - ${_MKCMD}\ + ${_MKTARGET_CREATE} tr 'a-zA-Z' 'n-za-mN-ZA-M' < ${.ALLSRC} > ${.TARGET} fortunes2-o.dat: fortunes2-o - ${_MKMSGCREATE} - ${_MKCMD}\ + ${_MKTARGET_CREATE} ${STRFILE} -rsx ${.ALLSRC} ${.TARGET} limerick-o: limerick-o.${TYPE} - ${_MKMSGCREATE} - ${_MKCMD}\ + ${_MKTARGET_CREATE} tr 'a-zA-Z' 'n-za-mN-ZA-M' < ${.ALLSRC} > ${.TARGET} limerick-o.dat: limerick-o - ${_MKMSGCREATE} - ${_MKCMD}\ + ${_MKTARGET_CREATE} ${STRFILE} -rsx ${.ALLSRC} ${.TARGET} unamerican-o: unamerican-o.${TYPE} - ${_MKMSGCREATE} - ${_MKCMD}\ + ${_MKTARGET_CREATE} tr 'a-zA-Z' 'n-za-mN-ZA-M' < ${.ALLSRC} > ${.TARGET} unamerican-o.dat: unamerican-o - ${_MKMSGCREATE} - ${_MKCMD}\ + ${_MKTARGET_CREATE} ${STRFILE} -rsx ${.ALLSRC} ${.TARGET} netbsd-o: netbsd-o.${TYPE} - ${_MKMSGCREATE} - ${_MKCMD}\ + ${_MKTARGET_CREATE} tr 'a-zA-Z' 'n-za-mN-ZA-M' < ${.ALLSRC} > ${.TARGET} netbsd-o.dat: netbsd-o - ${_MKMSGCREATE} - ${_MKCMD}\ + ${_MKTARGET_CREATE} ${STRFILE} -rsx ${.ALLSRC} ${.TARGET} diff --git a/hack/Makefile b/hack/Makefile index 69996380..ac9b8d97 100644 --- a/hack/Makefile +++ b/hack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2003/10/19 04:45:01 lukem Exp $ +# $NetBSD: Makefile,v 1.38 2003/10/21 10:01:19 lukem Exp $ # @(#)Makefile 8.2 (Berkeley) 4/27/95 .include <bsd.own.mk> @@ -28,13 +28,11 @@ FILESDIR=/var/games/hackdir CLEANFILES+=hack.onames.h hack.onames.h: makedefs def.objects.h - ${_MKMSGCREATE} - ${_MKCMD}\ + ${_MKTARGET_CREATE} ./makedefs ${.CURDIR}/def.objects.h > hack.onames.h makedefs: makedefs.c - ${_MKMSGLINK} - ${_MKCMD}\ + ${_MKTARGET_LINK} ${HOST_LINK.c} -o makedefs ${.CURDIR}/makedefs.c hack.h: hack.onames.h @@ -44,16 +42,13 @@ afterinstall: clobber .endif clobber: - ${_MKMSGINSTALL.m} ${DESTDIR}/var/games/hackdir/perm - ${_MKCMD}\ + ${_MKMSG_INSTALL} ${DESTDIR}/var/games/hackdir/perm ${INSTALL_FILE} -o games -g games -m 660 /dev/null \ ${DESTDIR}/var/games/hackdir/perm - ${_MKMSGINSTALL.m} ${DESTDIR}/var/games/hackdir/record - ${_MKCMD}\ + ${_MKMSG_INSTALL} ${DESTDIR}/var/games/hackdir/record ${INSTALL_FILE} -o games -g games -m 660 /dev/null \ ${DESTDIR}/var/games/hackdir/record - ${_MKMSG} " remove ${DESTDIR}/var/games/hackdir/bones*" - ${_MKCMD}\ + ${_MKMSG_REMOVE} "${DESTDIR}/var/games/hackdir/bones*" rm -f ${DESTDIR}/var/games/hackdir/bones* .include <bsd.prog.mk> diff --git a/monop/Makefile b/monop/Makefile index 77dd527b..8197de30 100644 --- a/monop/Makefile +++ b/monop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2003/10/19 04:45:01 lukem Exp $ +# $NetBSD: Makefile,v 1.26 2003/10/21 10:01:19 lukem Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 .include <bsd.own.mk> @@ -17,13 +17,11 @@ FILESDIR=/usr/share/games realall: ${FILES} initdeck: initdeck.c - ${_MKMSGLINK} - ${_MKCMD}\ + ${_MKTARGET_LINK} ${HOST_LINK.c} -o initdeck ${.CURDIR}/initdeck.c cards.pck: initdeck - ${_MKMSGCREATE} - ${_MKCMD}\ + ${_MKTARGET_CREATE} ./initdeck ${.CURDIR}/cards.inp .include <bsd.prog.mk> diff --git a/phantasia/Makefile b/phantasia/Makefile index 250aad23..c78605e1 100644 --- a/phantasia/Makefile +++ b/phantasia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2003/10/19 04:45:01 lukem Exp $ +# $NetBSD: Makefile,v 1.31 2003/10/21 10:01:19 lukem Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 .include <bsd.own.mk> @@ -31,13 +31,11 @@ CLEANFILES+=map setup setup.lo host_phantglobs.lo ${ALLFILES} realall: ${FILES} ${FILES}: setup - ${_MKMSGCREATE} - ${_MKCMD}\ + ${_MKTARGET_CREATE} ./setup -m ${.CURDIR}/monsters.asc setup: host_phantglobs.lo setup.lo monsters.asc ${LIBM} - ${_MKMSGLINK} - ${_MKCMD}\ + ${_MKTARGET_LINK} ${HOST_LINK.c} host_phantglobs.lo setup.lo -o ${.TARGET} -lm BUILDSYMLINKS+= phantglobs.c host_phantglobs.c |