Remove "makedefs -m" and monstr.c from the Unix build.

diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src
index 4f9fa874e664bbc6df8c00444cf026548ff8cfc3..4fac84eecb080320cac6f955fdec1a76d308139c 100644 (file)
--- a/sys/unix/Makefile.src
+++ b/sys/unix/Makefile.src
@@ -1,5 +1,5 @@
 #      NetHack Makefile.
-# NetHack 3.6  Makefile.src    $NHDT-Date: 1526687360 2018/05/18 23:49:20 $  $NHDT-Branch: NetHack-3.6.2 $:$NHDT-Revision: 1.55 $
+# NetHack 3.6  Makefile.src    $NHDT-Date: 1539968067 2018/10/19 16:54:27 $  $NHDT-Branch: keni-makedefsm $:$NHDT-Revision: 1.58 $
 # Copyright (c) 2018 by Pasi Kallinen
 # NetHack may be freely redistributed.  See license for details.
 
@@ -427,7 +427,7 @@ SYSCSRC = ../sys/atari/tos.c ../sys/share/pcmain.c ../sys/share/pcsys.c \
 SYSCXXSRC = ../sys/share/cppregex.cpp
 
 # generated source files (tile.c is handled separately via WINxxxSRC)
-GENCSRC = monstr.c vis_tab.c   #tile.c
+GENCSRC = vis_tab.c    #tile.c
 
 # all windowing-system-dependent .c (for dependencies and such)
 WINCSRC = $(WINTTYSRC) $(WINX11SRC) $(WINGNOMESRC) $(WINGEMSRC)
@@ -474,7 +474,7 @@ HOBJ = $(FIRSTOBJ) allmain.o alloc.o apply.o artifact.o attrib.o ball.o \
        extralev.o files.o fountain.o hack.o hacklib.o invent.o light.o \
        lock.o mail.o makemon.o mapglyph.o mcastu.o mhitm.o mhitu.o \
        minion.o mklev.o mkmap.o \
-       mkmaze.o mkobj.o mkroom.o mon.o mondata.o monmove.o monstr.o \
+       mkmaze.o mkobj.o mkroom.o mon.o mondata.o monmove.o \
        mplayer.o mthrowu.o muse.o music.o o_init.o objnam.o options.o \
        pager.o pickup.o pline.o polyself.o potion.o pray.o priest.o \
        quest.o questpgr.o read.o rect.o region.o restore.o rip.o rnd.o \
@@ -609,9 +609,7 @@ $(MAKEDEFS): $(FIRSTOBJ) \
        @( cd ../util ; $(MAKE) ../include/onames.h )
 ../include/pm.h: $(MAKEDEFS) ../include/onames.h
        @( cd ../util ; $(MAKE) ../include/pm.h )
-monstr.c: $(MAKEDEFS) ../include/pm.h
-       @( cd ../util ; $(MAKE) ../src/monstr.c )
-../include/vis_tab.h: $(MAKEDEFS) monstr.c
+../include/vis_tab.h: $(MAKEDEFS) ../include/pm.h
        @( cd ../util ; $(MAKE) ../include/vis_tab.h )
 # makedefs -z makes both vis_tab.h and vis_tab.c, but writes the .h first
 vis_tab.c: ../include/vis_tab.h
@@ -659,7 +657,7 @@ clean:
 spotless: clean
        -rm -f a.out core $(GAME) Sys*
        -rm -f ../include/date.h ../include/onames.h ../include/pm.h
-       -rm -f monstr.c ../include/vis_tab.h vis_tab.c tile.c *.moc
+       -rm -f ../include/vis_tab.h vis_tab.c tile.c *.moc
        -rm -f ../win/gnome/gn_rip.h
 
 
@@ -886,7 +884,6 @@ wc_chainout.o: ../win/chain/wc_chainout.c $(HACK_H)
        $(CC) $(CFLAGS) -c ../win/chain/wc_chainout.c
 wc_trace.o: ../win/chain/wc_trace.c $(HACK_H) ../include/func_tab.h
        $(CC) $(CFLAGS) -c ../win/chain/wc_trace.c
-monstr.o: monstr.c $(CONFIG_H)
 vis_tab.o: vis_tab.c $(CONFIG_H) ../include/vis_tab.h
 allmain.o: allmain.c $(HACK_H)
 alloc.o: alloc.c $(CONFIG_H)

diff --git a/sys/unix/Makefile.utl b/sys/unix/Makefile.utl
index 78deeb23e4be2c3a730023dc295451738c23db6d..33316ed56ec5a110460b15b905b611a9eb60f2b2 100644 (file)
--- a/sys/unix/Makefile.utl
+++ b/sys/unix/Makefile.utl
@@ -1,5 +1,5 @@
 #      Makefile for NetHack's utility programs.
-# NetHack 3.6  Makefile.utl    $NHDT-Date: 1526687364 2018/05/18 23:49:24 $  $NHDT-Branch: NetHack-3.6.2 $:$NHDT-Revision: 1.36 $
+# NetHack 3.6  Makefile.utl    $NHDT-Date: 1539968067 2018/10/19 16:54:27 $  $NHDT-Branch: keni-makedefsm $:$NHDT-Revision: 1.38 $
 # Copyright (c) 2018 by Robert Patrick Rankin
 # NetHack may be freely redistributed.  See license for details.
 
@@ -242,8 +242,6 @@ mdgreph: mdgrep.pl
        ./makedefs -o
 ../include/pm.h: makedefs
        ./makedefs -p
-../src/monstr.c: makedefs
-       ./makedefs -m
 ../include/vis_tab.h: makedefs
        ./makedefs -z
 # makedefs -z makes both vis_tab.h and vis_tab.c, but writes the .h first
@@ -447,7 +445,7 @@ tileedit: tileedit.cpp $(TEXT_IO)
 #      ../src/foo::
 #              @( cd ../src ; $(MAKE) foo )
 # would always force foo to be up-to-date according to the src Makefile
-# when it's needed here.  unfortunately, some makes believe this syntax
+# when it's needed here.  Unfortunately, some makes believe this syntax
 # means foo always changes, instead of foo should always be checked.
 # therefore, approximate via config.h dependencies, and hope that anybody
 # changing anything other than basic configuration also knows when not