nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

vis_tab removal for VMS

Browse Source 
Get rid of vis_tab.{c,h}, also the commented out remnants of
{dgn_comp,lev_comp}.*, and put back sfstruct.* that erroneously
got removed along with some other stuff way back when.

Untested, and the lua stuff needs to be modularized.
This commit is contained in:
PatR
2020-12-30 08:58:15 -08:00
parent a7b662e3db
commit 99cc236d4a
3 changed files with 36 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/vms/Makefile.utl
+3 -130
View File
@@ -1,5 +1,5 @@
# NetHack Makefile (VMS) - for utility programs.
# NetHack 3.7 Makefile.utl $NHDT-Date: 1596498303 2020/08/03 23:45:03 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.19 $
# NetHack 3.7 Makefile.utl $NHDT-Date: 1609347482 2020/12/30 16:58:02 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.20 $
# Copyright (c) 2011 by Robert Patrick Rankin
# NetHack may be freely redistributed. See license for details.
@@ -27,8 +27,6 @@ WINSHR = [-.win.share]
WINX11 = [-.win.X11]
# targets, with enough punctuation to keep MCR and DELETE happy
MAKEDEFS= $(UTL)makedefs.exe;
#LEVCOMP = $(UTL)lev_comp.exe;
#DGNCOMP = $(UTL)dgn_comp.exe;
DLB = $(UTL)dlb.exe;
RECOVER = $(UTL)recover.exe;
# used by $(DAT)Makefile for synchronization
@@ -44,39 +42,9 @@ LFLAGS = /noMap
LIBS = $(SRC)crtl.opt/Options,$(SRC)ident.opt/Options # run-time library
LINK = link
# If you don't have yacc, byacc, or bison or just don't want to run any of
# them, then make target "no_yacc" before trying to build lev_comp
# or dgn_comp. You won't be able to modify *_comp.y though.
# If you don't have lex or flex, then make target "no_lex" and leave
# *_comp.l alone. $(VMS)lev_lex.h will be used to work-around some
# suspect code included in the distributed copies of *_lex.c.
# If you do either of the above, the corresponding value of YACC and/or LEX
# below won't matter.
#
# Note: VMS POSIX V1.1 lex and yacc generate code which contains an
# invalid #module directive; it order to prevent warnings for CC or
# choking by GCC, the SEARCH command is used in an attempt to strip
# then out. Otherwise MMS would quit when making the affected targets.
# Each "munged" copy should be identical to its original if no #module
# directives are present.
#
# yacc/lex programs to use to generate *_comp.c, *_comp.h, and *_lex.c.
# choose xxxOUT that matches xxx tool's output
#YACC = bison /Define
#LEX = flex
#YACC = yacc -d
#LEX = lex
#YACC = posix/Run posix$bin:yacc. "-d
#LEX = posix/Run posix$bin:lex. "
# blank means foo.y -> foo_tab.c & foo_tab.h
#YACCOUT = # bison
#YACCOUT = ytab # VMS POSIX
#YACCOUT = y_tab # DEC/Shell
#LEXOUT = lexyy # flex
#LEXOUT = lex_yy # VMS POSIX
# Nothing below this line should have to be changed.
#
# linker options files
LIBOPT = $(SRC)crtl.opt;
@@ -88,8 +56,6 @@ HACK_H = $(SRC)hack.h-t
# utility .c files
MAKESRC = makedefs.c
#SPLEVSRC = lev_yacc.c lev_lex.c lev_main.c
#DGNCOMPSRC = dgn_yacc.c dgn_lex.c dgn_main.c
RECOVSRC = recover.c
DLBSRC = dlb_main.c
UTILSRCS = $(MAKESRC) $(SPLEVSRC) $(DGNCOMPSRC) $(RECOVSRC) $(DLBSRC) panic.c
@@ -104,13 +70,6 @@ NAMEOBJS = $(NAMEOBJ1),$(NAMEOBJ2)
# object files for makedefs
MAKEOBJS = makedefs.obj,$(NAMEOBJ1)
# object files for special levels compiler
#SPLEVOBJS = lev_main.obj,lev_yacc.obj,lev_lex.obj,panic.obj,\
# $(SRC)alloc.obj,$(NAMEOBJS)
# object files for dungeon compiler
#DGNCOMPOBJS = dgn_main.obj,dgn_yacc.obj,dgn_lex.obj,panic.obj,$(SRC)alloc.obj
# object files for recovery utility
RECOVOBJS = recover.obj
@@ -122,26 +81,12 @@ DLBOBJS = dlb_main.obj,panic.obj,$(SRC)alloc.obj,$(SRC)dlb.obj
default :
@ $(ECHO) "Oops! No target(s) specified...."
all : $(MAKEDEFS) $(LEVCOMP) $(DGNCOMP) $(RECOVER) $(DLB)
<all : $(MAKEDEFS) $(LEVCOMP) $(DGNCOMP) $(RECOVER) $(DLB)
@ $(ECHO) "util is up to date."
# special targets for folks without yacc/bison and or lex/flex
no_yacc :
copy $(SYSSHR)%%%_yacc.c $(UTL)
copy $(SYSSHR)%%%_comp.h $(INC)
@ $(ECHO) "distributed yacc output (*_yacc.c) copied into place"
no_lex :
copy $(SYSSHR)%%%_lex.c $(UTL)
copy $(VMS)lev_lex.h $(UTL)
@ $(ECHO) "distributed lex output (*_lex.c) copied into place"
# alternate target names for possible interactive use
makedefs : $(MAKEDEFS)
@ $(ECHO) "makedefs is up to date."
#lev_comp : $(LEVCOMP)
# @ $(ECHO) "lev_comp is up to date."
#dgn_comp : $(DGNCOMP)
# @ $(ECHO) "dgn_comp is up to date."
recover : $(RECOVER)
@ $(ECHO) "recover is up to date."
dlb : $(DLB)
@@ -173,82 +118,15 @@ $(INC)onames.h : $(MAKEDEFS)
$(RUN) $(MAKEDEFS) -o
$(INC)pm.h : $(MAKEDEFS)
$(RUN) $(MAKEDEFS) -p
# both vis_tab.h and vis_tab.c are made at the same time by makedefs -z
$(INC)vis_tab.h : $(SRC)vis_tab.c
$(TOUCH) $(INC)vis_tab.h
$(SRC)vis_tab.c : $(MAKEDEFS)
$(RUN) $(MAKEDEFS) -z
# the src Makefile is responsible for knowing when to call this, since
# it knows all about the main src and include files
$(INC)date.h : $(MAKEDEFS)
$(RUN) $(MAKEDEFS) -v
# dependencies for lev_comp
#
#$(LEVCOMP) : $(SPLEVOBJS) $(VMSOBJS) $(LIBOPT) $(ID_OPT)
# $(LINK)/Exe=$(LEVCOMP) $(LFLAGS) $(SPLEVOBJS),$(VMSOBJS),$(LIBS)
#
#lev_yacc.obj : $(HACK_H) $(INC)sp_lev.h lev_yacc.c
# $(CC) $(CFLAGS) lev_yacc.c
#lev_lex.obj : $(HACK_H) $(INC)lev_comp.h $(INC)sp_lev.h lev_lex.c
# @ if f$search("lev_lex.h").nes."" then $(MOVE) lev_lex.h stdio.h
# $(CC) $(CFLAGS) lev_lex.c
# @ if f$search("stdio.h").nes."" then $(MOVE) stdio.h lev_lex.h
#lev_main.obj : $(HACK_H) $(INC)sp_lev.h $(INC)tcap.h $(INC)date.h lev_main.c
# $(CC) $(CFLAGS) lev_main.c
panic.obj : $(CONFIG_H)
$(CC) $(CFLAGS) panic.c
#$(INC)lev_comp.h : lev_yacc.c
# $(TOUCH) $(INC)lev_comp.h
#lev_yacc.c : lev_comp.y
# $(YACC) lev_comp.y
# $(MUNG) 'f$parse("$(YACCOUT)","lev_comp_tab.c")' "#module" /Outp=lev_yacc.c
# @ if f$search("''f$parse("$(YACCOUT)","lev_comp_tab.c")'").nes."" then \
# $(RM) 'f$parse("$(YACCOUT)","lev_comp_tab.c")'
# $(MOVE) 'f$parse("$(YACCOUT)","lev_comp_tab.h")' $(INC)lev_comp.h
#
#lev_lex.c : lev_comp.l
# $(LEX) lev_comp.l
# $(MUNG) 'f$parse("$(LEXOUT)","lev_comp_lex.c")' "#module" /Outp=lev_lex.c
# @ if f$search("''f$parse("$(LEXOUT)","lev_comp_lex.c")'").nes."" then \
# $(RM) 'f$parse("$(LEXOUT)","lev_comp_lex.c")'
#
#
# dependencies for dgn_comp
#
#$(DGNCOMP) : $(DGNCOMPOBJS) $(VMSOBJS) $(LIBOPT) $(ID_OPT)
# $(LINK)/Exe=$(DGNCOMP) $(LFLAGS) $(DGNCOMPOBJS),$(VMSOBJS),$(LIBS)
#
#dgn_yacc.obj : $(CONFIG_H) $(INC)dgn_file.h $(INC)date.h dgn_yacc.c
# $(CC) $(CFLAGS) dgn_yacc.c
#dgn_lex.obj : $(CONFIG_H) $(INC)dgn_comp.h $(INC)dgn_file.h dgn_lex.c
# @ if f$search("lev_lex.h").nes."" then $(MOVE) lev_lex.h stdio.h
# $(CC) $(CFLAGS) dgn_lex.c
# @ if f$search("stdio.h").nes."" then $(MOVE) stdio.h lev_lex.h
#dgn_main.obj : $(CONFIG_H) dgn_main.c
# $(CC) $(CFLAGS) dgn_main.c
#
#$(INC)dgn_comp.h : dgn_yacc.c
# $(TOUCH) $(INC)dgn_comp.h
#
#dgn_yacc.c : dgn_comp.y
# $(YACC) dgn_comp.y
# $(MUNG) 'f$parse("$(YACCOUT)","dgn_comp_tab.c")' "#module" /Outp=dgn_yacc.c
# @ if f$search("''f$parse("$(YACCOUT)","dgn_comp_tab.c")'").nes."" then \
# $(RM) 'f$parse("$(YACCOUT)","dgn_comp_tab.c")'
# $(MOVE) 'f$parse("$(YACCOUT)","dgn_comp_tab.h")' $(INC)dgn_comp.h
#
#dgn_lex.c : dgn_comp.l
# $(LEX) dgn_comp.l
# $(MUNG) 'f$parse("$(LEXOUT)","dgn_comp_lex.c")' "#module" /Outp=dgn_lex.c
# @ if f$search("''f$parse("$(LEXOUT)","dgn_comp_lex.c")'").nes."" then \
# $(RM) 'f$parse("$(LEXOUT)","dgn_comp_lex.c")'
# dependencies for recover
#
$(RECOVER) : $(RECOVOBJS) $(VMSOBJS) $(LIBOPT) $(ID_OPT)
@@ -363,12 +241,7 @@ clean :
- if f$search("*.obj") .nes."" then $(RM) *.obj;
spotless : clean
# - if f$search("%%%_lex.c") .nes."" then $(RM) %%%_lex.c;
# - if f$search("%%%_yacc.c").nes."" then $(RM) %%%_yacc.c;
# - if f$search("$(INC)%%%_comp.h").nes."" then $(RM) $(INC)%%%_comp.h;*
- if f$search("$(INC)tile.h").nes."" then $(RM) $(INC)tile.h;*
# - if f$search("lev_lex.h") .nes."" then $(RM) lev_lex.h;
- if f$search("*tab.c") .nes."" then $(RM) *tab.c;
- if f$search("*.exe").nes."" then \
$(RM) $(MAKEDEFS),$(RECOVER),$(DLB)
- if f$search("*.exe").nes."" then $(RM) $(TILEUTILS)