PR/55695: Andreas Gustafsson: factor(6) -h option doesn't always work

[bsdgames-darwin.git] / hack / Makefile

diff --git a/hack/Makefile b/hack/Makefile
index 2bd3103259624bcf2ae50b617e16b804dfd69699..ec9a65219c6824b321ba50e6a17ff667cd5c6869 100644 (file)
--- a/hack/Makefile
+++ b/hack/Makefile
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.35 2003/08/01 17:03:43 lukem Exp $
+#      $NetBSD: Makefile,v 1.47 2020/02/08 00:59:55 fox Exp $

 #      @(#)Makefile    8.2 (Berkeley) 4/27/95
 
 .include <bsd.own.mk>
 #      @(#)Makefile    8.2 (Berkeley) 4/27/95
 
 .include <bsd.own.mk>


@@ -13,37 +13,49 @@ SRCS+=      alloc.c hack.Decl.c hack.apply.c hack.bones.c hack.c hack.cmd.c \
        hack.mkmaze.c hack.mkobj.c hack.mkshop.c hack.mon.c hack.monst.c \
        hack.o_init.c hack.objnam.c hack.options.c hack.pager.c hack.potion.c \
        hack.pri.c hack.read.c hack.rip.c hack.rumors.c hack.save.c \
        hack.mkmaze.c hack.mkobj.c hack.mkshop.c hack.mon.c hack.monst.c \
        hack.o_init.c hack.objnam.c hack.options.c hack.pager.c hack.potion.c \
        hack.pri.c hack.read.c hack.rip.c hack.rumors.c hack.save.c \

-       hack.search.c hack.shk.c hack.shknam.c hack.steal.c hack.termcap.c \
+       hack.search.c hack.shk.c hack.shknam.c hack.steal.c hack.terminfo.c \

        hack.timeout.c hack.topl.c hack.track.c hack.trap.c hack.tty.c \
        hack.u_init.c hack.unix.c hack.vault.c hack.version.c hack.wield.c \
        hack.wizard.c hack.worm.c hack.worn.c hack.zap.c rnd.c
 MAN=   hack.6
        hack.timeout.c hack.topl.c hack.track.c hack.trap.c hack.tty.c \
        hack.u_init.c hack.unix.c hack.vault.c hack.version.c hack.wield.c \
        hack.wizard.c hack.worm.c hack.worn.c hack.zap.c rnd.c
 MAN=   hack.6

-DPADD+=        ${LIBTERM} ${LIBCOMPAT}
-LDADD+=        -ltermcap
+DPADD+=        ${LIBTERMINFO}
+LDADD+=        -lterminfo

 HIDEGAME=hidegame
 SETGIDGAME=yes
 HIDEGAME=hidegame
 SETGIDGAME=yes

-CLEANFILES+=makedefs
+CLEANFILES+=makedefs makedefs.lo

 FILES=help hh data
 FILESDIR=/var/games/hackdir
 
 CLEANFILES+=hack.onames.h
 hack.onames.h: makedefs def.objects.h
 FILES=help hh data
 FILESDIR=/var/games/hackdir
 
 CLEANFILES+=hack.onames.h
 hack.onames.h: makedefs def.objects.h

+       ${_MKTARGET_CREATE}

        ./makedefs ${.CURDIR}/def.objects.h > hack.onames.h
 
        ./makedefs ${.CURDIR}/def.objects.h > hack.onames.h
 

-makedefs: makedefs.c
-       ${HOST_LINK.c} -o makedefs ${.CURDIR}/makedefs.c
+makedefs: makedefs.lo
+       ${_MKTARGET_LINK}
+       ${HOST_LINK.c} -o ${.TARGET} ${.ALLSRC}

 
 hack.h:        hack.onames.h
 
 
 hack.h:        hack.onames.h
 

+COPTS.hack.mon.c+=     -Wno-format-nonliteral
+COPTS.hack.rip.c+=     -Wno-format-nonliteral
+COPTS.hack.end.c+=     ${GCC_NO_STRINGOP_TRUNCATION}
+

 .if !exists(${DESTDIR}${FILESDIR}/perm)
 afterinstall: clobber
 .endif
 
 clobber: 
 .if !exists(${DESTDIR}${FILESDIR}/perm)
 afterinstall: clobber
 .endif
 
 clobber: 

+       ${_MKMSG_INSTALL} ${DESTDIR}/var/games/hackdir/perm

        ${INSTALL_FILE} -o games -g games -m 660 /dev/null \
            ${DESTDIR}/var/games/hackdir/perm
        ${INSTALL_FILE} -o games -g games -m 660 /dev/null \
            ${DESTDIR}/var/games/hackdir/perm

+       ${_MKMSG_INSTALL} ${DESTDIR}/var/games/hackdir/record

        ${INSTALL_FILE} -o games -g games -m 660 /dev/null \
            ${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*"

        rm -f ${DESTDIR}/var/games/hackdir/bones*
 
        rm -f ${DESTDIR}/var/games/hackdir/bones*
 

+COPTS.hack.objnam.c+=  ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.hack.pager.c+=   ${GCC_NO_STRINGOP_TRUNCATION}
+

 .include <bsd.prog.mk>
 .include <bsd.prog.mk>