From 02d616d8bcd3c180d2bfb4b8795819ddb21b79bf Mon Sep 17 00:00:00 2001 From: PatR Date: Mon, 3 Aug 2020 13:36:40 -0700 Subject: [PATCH] dat/Makefile spotless Testing some hints revisions resulted in some bafflement which turned out to be caused by 'make spotless' in the dat subdirectory not removing 'options'. It wasn't removing several other generated files either. That used to work but got clobbered when the lua special levels replaced levcomp and dgncomp. --- doc/fixes37.0 | 4 +++- sys/unix/Makefile.dat | 17 ++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/doc/fixes37.0 b/doc/fixes37.0 index 9c56556d6..3b76a04f4 100644 --- a/doc/fixes37.0 +++ b/doc/fixes37.0 @@ -1,4 +1,4 @@ -NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.269 $ $NHDT-Date: 1596395887 2020/08/02 19:18:07 $ +NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.270 $ $NHDT-Date: 1596486996 2020/08/03 20:36:36 $ General Fixes and Modified Features ----------------------------------- @@ -318,6 +318,8 @@ tty: redraw unexplored locations as S_unexplored rather than after map has been partially overwritten by popup menu or text display tty: previous change resulted in remnants of previous level being shown on new level after level change when S_unexplored is +Unix: after lua changes to Makefiles, 'make spotless' for dat subdirectory + left some generated data files which should have been deleted X11: was still initializing map to 'stone' instead of 'unexplored' after they became separate glyphs X11: for text map without color, add support for black&white ice; draw it in diff --git a/sys/unix/Makefile.dat b/sys/unix/Makefile.dat index 0508974e9..a264242ae 100644 --- a/sys/unix/Makefile.dat +++ b/sys/unix/Makefile.dat @@ -1,4 +1,4 @@ -# NetHack Datafiles Makefile.dat $NHDT-Date: 1447844574 2018/04/25 19:25:54 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.22 $ +# NetHack Datafiles Makefile.dat $NHDT-Date: 1596486993 2020/08/03 20:36:33 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.32 $ # Copyright (c) 2018 by Pasi Kallinen # NetHack may be freely redistributed. See license for details. @@ -116,18 +116,21 @@ bogusmon: bogusmon.txt ../util/makedefs options: ../util/makedefs ../util/makedefs -v - +# these don't actually do anything useful now that levcomp and dngcomp are gone spec_levs: touch spec_levs - quest_levs: touch quest_levs # gitinfo.txt is optionally made by src/Makefile when creating date.h +# spec_levs and quest_levs are empty marker files to control 'make' actions clean: - -rm -f gitinfo.txt + -rm -f spec_levs quest_levs gitinfo.txt spotless: clean - -rm -f nhdat x11tiles beostiles pet_mark.xbm pilemark.xbm rip.xpm mapbg.xpm - -rm -f rip.img GEM_RSC.RSC title.img nh16.img NetHack.ad - -rm -f nhsplash.xpm nhtiles.bmp + -rm -f nhdat $(VARDAT) \ + x11tiles pet_mark.xbm pilemark.xbm rip.xpm mapbg.xpm \ + rip.img GEM_RSC.RSC title.img nh16.img NetHack.ad \ + nhsplash.xpm nhtiles.bmp beostiles + +#eof#