From: PatR Date: Sun, 31 Jan 2021 21:05:32 +0000 (-0800) Subject: outdated vs Unix 'make depend' X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b1f5ea45efdb5c01fcb7d766b8d22b56b86ff74;p=nethack outdated vs Unix 'make depend' After the most recent round of moving old stuff to 'outdated', src/windows.c contained two references to non-existent files. That broke 'make depend'. Updating it to turn those two into comments seems risky because someone might add an include for some new interface later in the file. So comment them out in the source instead. Also, redo previous 'make depend' update from about three weeks ago to do the same thing. --- diff --git a/include/global.h b/include/global.h index f5d13c78c..787159fb4 100644 --- a/include/global.h +++ b/include/global.h @@ -1,4 +1,4 @@ -/* NetHack 3.7 global.h $NHDT-Date: 1610146765 2021/01/08 22:59:25 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.118 $ */ +/* NetHack 3.7 global.h $NHDT-Date: 1612127119 2021/01/31 21:05:19 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.120 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Michael Allison, 2006. */ /* NetHack may be freely redistributed. See license for details. */ @@ -165,19 +165,10 @@ extern struct cross_target_s cross_target; #include "ntconf.h" #endif -/* - * Note: placing this before amiconf.h is to avoid complications for - * 'make depend' after amiconf.h got moved to the outdated/ sub-tree. - * Inclusion really belongs somewhere after the define for SHORT_FILENAMES - * below, and for that we either need to resurrect amiconf.h or supply - * an empty stub for it in include/amiconf.h. - */ -#include "fnamesiz.h" /* file sizes shared between nethack and recover */ - /* amiconf.h needs to be the last nested #include of config.h because 'make depend' will turn it into a comment, hiding anything after it */ #ifdef AMIGA -#include "amiconf.h" +/*#include "amiconf.h"*/ #endif /* Displayable name of this port; don't redefine if defined in *conf.h */ @@ -235,6 +226,8 @@ extern struct cross_target_s cross_target; #endif #endif +#include "fnamesiz.h" /* file sizes shared between nethack and recover */ + #ifdef VMS /* vms_exit() (sys/vms/vmsmisc.c) expects the non-VMS EXIT_xxx values below. * these definitions allow all systems to be treated uniformly, provided diff --git a/src/windows.c b/src/windows.c index 8ee5e15b2..002d5c54c 100644 --- a/src/windows.c +++ b/src/windows.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 windows.c $NHDT-Date: 1596498228 2020/08/03 23:43:48 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.75 $ */ +/* NetHack 3.7 windows.c $NHDT-Date: 1612127121 2021/01/31 21:05:21 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.82 $ */ /* Copyright (c) D. Cohrs, 1993. */ /* NetHack may be freely redistributed. See license for details. */ @@ -19,7 +19,7 @@ extern void win_X11_init(int); extern struct window_procs Qt_procs; #endif #ifdef GEM_GRAPHICS -#include "wingem.h" +/*#include "wingem.h"*/ #endif #ifdef MAC extern struct window_procs mac_procs; @@ -38,7 +38,7 @@ extern void ami_wininit_data(int); extern struct window_procs win32_procs; #endif #ifdef GNOME_GRAPHICS -#include "winGnome.h" +/*#include "winGnome.h"*/ extern struct window_procs Gnome_procs; #endif #ifdef MSWIN_GRAPHICS diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src index cf0613467..0bfb6421f 100644 --- a/sys/unix/Makefile.src +++ b/sys/unix/Makefile.src @@ -1,5 +1,5 @@ # NetHack Makefile. -# NetHack 3.7 Makefile.src $NHDT-Date: 1610146766 2021/01/08 22:59:26 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.120 $ +# NetHack 3.7 Makefile.src $NHDT-Date: 1612127122 2021/01/31 21:05:22 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.122 $ # Copyright (c) 2018 by Pasi Kallinen # NetHack may be freely redistributed. See license for details. @@ -793,7 +793,7 @@ $(CONFIG_H): ../include/config.h ../include/config1.h ../include/patchlevel.h \ ../include/tradstdc.h ../include/global.h ../include/coord.h \ ../include/vmsconf.h ../include/system.h ../include/nhlua.h \ ../include/unixconf.h ../include/pcconf.h ../include/micro.h \ - ../include/ntconf.h ../include/fnamesiz.h #../include/amiconf.h + ../include/ntconf.h ../include/fnamesiz.h touch $(CONFIG_H) # hack.h timestamp $(HACK_H): ../include/hack.h $(CONFIG_H) ../include/lint.h ../include/align.h \ diff --git a/sys/unix/depend.awk b/sys/unix/depend.awk index b78deede1..8663c5707 100644 --- a/sys/unix/depend.awk +++ b/sys/unix/depend.awk @@ -1,6 +1,6 @@ # depend.awk -- awk script used to construct makefile dependencies # for nethack's source files (`make depend' support for Makefile.src). -# $NHDT-Date: 1610141602 2021/01/08 21:33:22 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.12 $ +# $NHDT-Date: 1612127123 2021/01/31 21:05:23 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.13 $ # # usage: # cd src ; nawk -f depend.awk ../include/*.h list-of-.c/.cpp-files @@ -31,7 +31,6 @@ BEGIN { FS = "\"" #for `#include "X"', $2 is X alt_deps["../include/patchlev.h"] = "" alt_deps["interp.c"] = " #interp.c" #comment it out alt_deps["../include/win32api.h"] = " #../include/win32api.h" - alt_deps["../include/amiconf.h"] = " #../include/amiconf.h" alt_deps["../include/zlib.h"] = " #zlib.h" #comment it out } FNR == 1 { output_dep() #finish previous file