'make depend' fix

The gone but still referenced state of amiconf.h broke 'make depend'.
Fixing that turns it into a comment in the generated dependencies
but that ran into a problem with it being followed by fnamesiz.h
instead of being last in the list containing it.  So in addition to
the depend fix, move #include "fnamesiz.h" from config.h to global.h
in order to have it come before amiconf.h.

diff --git a/include/config.h b/include/config.h
index d9e4fbb25a54568db47217363cf6c4d4a5980902..9aa89d5c7b6bb3cc1a5c4c8323368367b2642961 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -1,4 +1,4 @@
-/* NetHack 3.7 config.h        $NHDT-Date: 1608933417 2020/12/25 21:56:57 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.146 $ */
+/* NetHack 3.7 config.h        $NHDT-Date: 1610141601 2021/01/08 21:33:21 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.148 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2016. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -608,6 +608,5 @@ typedef unsigned char uchar;
 #endif
 
 #include "global.h" /* Define everything else according to choices above */
-#include "fnamesiz.h" /* Define file sizes shared between nethack and recover */
 
 #endif /* CONFIG_H */

diff --git a/include/global.h b/include/global.h
index c1b9ae14dbe9dff0bb33fdd05891962d7b23b2d6..9f9efe376d2641d7642f3b5ac24fe4ce621c9ee3 100644 (file)
--- a/include/global.h
+++ b/include/global.h
@@ -1,4 +1,4 @@
-/* NetHack 3.7 global.h        $NHDT-Date: 1594032649 2020/07/06 10:50:49 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.104 $ */
+/* NetHack 3.7 global.h        $NHDT-Date: 1610141601 2021/01/08 21:33:21 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.117 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Michael Allison, 2006. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -110,6 +110,8 @@ typedef uchar nhsym;
 
 #include "coord.h"
 
+#include "fnamesiz.h" /* file sizes shared between nethack and recover */
+
 #if defined(CROSSCOMPILE)
 struct cross_target_s {
     const char *build_date;

diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src
index b2d1b9b1cba3acd06c935d2d5ac193f5dd1e313f..4782b3bc365c47d50d18659e50c5b2d35d7c8034 100644 (file)
--- a/sys/unix/Makefile.src
+++ b/sys/unix/Makefile.src
@@ -1,5 +1,5 @@
 #      NetHack Makefile.
-# NetHack 3.7  Makefile.src    $NHDT-Date: 1609702027 2021/01/03 19:27:07 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.117 $
+# NetHack 3.7  Makefile.src    $NHDT-Date: 1610141602 2021/01/08 21:33:22 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.118 $
 # Copyright (c) 2018 by Pasi Kallinen
 # NetHack may be freely redistributed.  See license for details.
 
@@ -831,9 +831,9 @@ depend: ../sys/unix/depend.awk \
 # config.h timestamp
 $(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/fnamesiz.h ../include/vmsconf.h ../include/system.h \
+               ../include/nhlua.h ../include/unixconf.h ../include/pcconf.h \
+               ../include/micro.h ../include/ntconf.h #../include/amiconf.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 a488c5457f7e67ee694fc32d865f93fb60d27da9..b78deede10eedf6d8280ed9244526b7d09b6dbfe 100644 (file)
--- 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: 1575916941 2019/12/09 18:42:21 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.10 $
+# $NHDT-Date: 1610141602 2021/01/08 21:33:22 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.12 $
 #
 # usage:
 #   cd src ; nawk -f depend.awk ../include/*.h list-of-.c/.cpp-files
@@ -31,6 +31,7 @@ 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