adopt some integration suggestions

sys/lib -> sys/libnh
sys/lib/libnethackmain.c -> sys/libnh/libnhmain.c
libnethack.a -> libnh.a

diff --git a/sys/lib/README.md b/sys/libnh/README.md
similarity index 100%
rename from sys/lib/README.md
rename to sys/libnh/README.md

diff --git a/sys/lib/libnethackmain.c b/sys/libnh/libnhmain.c
similarity index 99%
rename from sys/lib/libnethackmain.c
rename to sys/libnh/libnhmain.c
index cec8c076e8308601e18ab4415391af0177032a76..200159955377c174f5ec0f6151dad9c8991286bf 100644 (file)
--- a/sys/lib/libnethackmain.c
+++ b/sys/libnh/libnhmain.c
@@ -1,4 +1,4 @@
-/* NetHack 3.7 unixmain.c      $NHDT-Date: 1596498297 2020/08/03 23:44:57 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.87 $ */
+/* NetHack 3.7 libnhmain.c     $NHDT-Date: 1596498297 2020/08/03 23:44:57 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.87 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2011. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -1124,4 +1124,4 @@ EM_JS(void, create_global, (char *name_str, void *ptr, char *type_str), {
 
 #endif
 
-/*libnethack.c*/
+/*libnhmain.c*/

diff --git a/sys/lib/npm-package/LICENSE.md b/sys/libnh/npm-package/LICENSE.md
similarity index 100%
rename from sys/lib/npm-package/LICENSE.md
rename to sys/libnh/npm-package/LICENSE.md

diff --git a/sys/lib/npm-package/README.md b/sys/libnh/npm-package/README.md
similarity index 100%
rename from sys/lib/npm-package/README.md
rename to sys/libnh/npm-package/README.md

diff --git a/sys/lib/npm-package/package-lock.json b/sys/libnh/npm-package/package-lock.json
similarity index 100%
rename from sys/lib/npm-package/package-lock.json
rename to sys/libnh/npm-package/package-lock.json

diff --git a/sys/lib/npm-package/package.json b/sys/libnh/npm-package/package.json
similarity index 100%
rename from sys/lib/npm-package/package.json
rename to sys/libnh/npm-package/package.json

diff --git a/sys/lib/npm-package/src/nethackShim.js b/sys/libnh/npm-package/src/nethackShim.js
similarity index 100%
rename from sys/lib/npm-package/src/nethackShim.js
rename to sys/libnh/npm-package/src/nethackShim.js

diff --git a/sys/lib/npm-package/test/test.js b/sys/libnh/npm-package/test/test.js
similarity index 100%
rename from sys/lib/npm-package/test/test.js
rename to sys/libnh/npm-package/test/test.js

diff --git a/sys/lib/sysconf b/sys/libnh/sysconf
similarity index 100%
rename from sys/lib/sysconf
rename to sys/libnh/sysconf

diff --git a/sys/lib/test/README.md b/sys/libnh/test/README.md
similarity index 100%
rename from sys/lib/test/README.md
rename to sys/libnh/test/README.md

diff --git a/sys/lib/test/libtest.c b/sys/libnh/test/libtest.c
similarity index 100%
rename from sys/lib/test/libtest.c
rename to sys/libnh/test/libtest.c

diff --git a/sys/lib/test/run.sh b/sys/libnh/test/run.sh
similarity index 100%
rename from sys/lib/test/run.sh
rename to sys/libnh/test/run.sh

diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src
index 51b7e06c8f1c7f598261c8f81099a33802ad0635..335d718537c19c65eca6520707fb3175cfc14399 100644 (file)
--- a/sys/unix/Makefile.src
+++ b/sys/unix/Makefile.src
@@ -300,7 +300,7 @@ WINGNOMEOBJ =
 WINGEMSRC =
 WINGEMOBJ =
 
-# Files for Shim windowing interface for libnethack -- doesn't do anything,
+# Files for Shim windowing interface for libnh -- doesn't do anything,
 # just passes along the API calls to the library
 #
 WINSHIMSRC = ../win/shim/winshim.c

diff --git a/sys/unix/hints/include/cross-post.2020 b/sys/unix/hints/include/cross-post.2020
index 9d43248b926cba000e70f191e5aa4a856688ed2e..add7de1d02c83c499ce257e8b1a2ae0a3ad51ec7 100644 (file)
--- a/sys/unix/hints/include/cross-post.2020
+++ b/sys/unix/hints/include/cross-post.2020
@@ -130,7 +130,7 @@ $(WASM_DATA_DIR): $(WASM_DATA_DIR)/nhdat
        touch $(WASM_DATA_DIR)/record
        touch $(WASM_DATA_DIR)/logfile
        touch $(WASM_DATA_DIR)/xlogfile
-       cp ../sys/lib/sysconf $(WASM_DATA_DIR)/sysconf
+       cp ../sys/libnh/sysconf $(WASM_DATA_DIR)/sysconf
 
 $(WASM_DATA_DIR)/nhdat:
        ( cd ..; $(MAKE) INSTDIR='$(WASM_DATA_DIR)' $(WASMDEP) dofiles-dlb )
@@ -142,7 +142,7 @@ $(TARGETPFX)unixunix.o : ../sys/unix/unixunix.c $(HACK_H)
 $(TARGETPFX)ioctl.o : ../sys/share/ioctl.c $(HACK_H)
 $(TARGETPFX)unixtty.o : ../sys/share/unixtty.c $(HACK_H)
 $(TARGETPFX)winshim.o : ../win/shim/winshim.c $(HACK_H)
-$(TARGETPFX)libnethackmain.o : ../sys/lib/libnethackmain.c \
+$(TARGETPFX)libnhmain.o : ../sys/libnh/libnhmain.c \
                $(HACK_H) ../include/date.h
 endif  # CROSS_TO_WASM
 #

diff --git a/sys/unix/hints/include/cross-pre.2020 b/sys/unix/hints/include/cross-pre.2020
index d51a9bdde86246bc3cdd843e63bc2fabff5ff25e..0e9816627c15d36bebdc24287377f393050c7d4a 100644 (file)
--- a/sys/unix/hints/include/cross-pre.2020
+++ b/sys/unix/hints/include/cross-pre.2020
@@ -367,11 +367,11 @@ override TARGET_CFLAGS = $(EMCC_CFLAGS) $(WASM_CFLAGS) $(WASM_TARGET_CFLAGS)
 override TARGET_CXXFLAGS = $(TARGET_CFLAGS)
 override TARGET_LINK = $(TARGET_CC)
 override TARGET_LFLAGS= $(EMCC_LFLAGS)
-override SYSSRC = ../sys/lib/libnethackmain.c \
+override SYSSRC = ../sys/libnh/libnhmain.c \
                ../sys/share/ioctl.c ../sys/share/unixtty.c \
                ../sys/unix/unixunix.c ../sys/unix/unixres.c \
                ../win/shim/winshim.c
-override SYSOBJ= $(TARGETPFX)libnethackmain.o \
+override SYSOBJ= $(TARGETPFX)libnhmain.o \
                $(TARGETPFX)ioctl.o $(TARGETPFX)unixtty.o \
                $(TARGETPFX)unixunix.o $(TARGETPFX)unixres.o \
                $(TARGETPFX)winshim.o
@@ -393,8 +393,8 @@ RANLIB=$(EMRANLIB)
 # Rule for file in sys/unix
 $(TARGETPFX)%.o : ../sys/unix/%.c
        $(TARGET_CC) $(TARGET_CFLAGS) -c -o$@ $<
-# Rule for file in sys/lib
-$(TARGETPFX)%.o : ../sys/lib/%.c
+# Rule for file in sys/libnh
+$(TARGETPFX)%.o : ../sys/libnh/%.c
        $(TARGET_CC) $(TARGET_CFLAGS) -c -o$@ $<
 # Rule for files in win/shim
 $(TARGETPFX)%.o : ../win/shim/%.c

diff --git a/sys/unix/hints/linux.2020 b/sys/unix/hints/linux.2020
index 16941cbf7ece8e2438144776124981f59704dcaf..f730ff6025257d2e49de83430d3589f78004125b 100755 (executable)
--- a/sys/unix/hints/linux.2020
+++ b/sys/unix/hints/linux.2020
@@ -166,16 +166,16 @@ VARDATND += $(sort $(VARDATND0))
 
 ifdef WANT_LIBNH
 CFLAGS += -DSHIM_GRAPHICS -DNOTTYGRAPHICS -DNOSHELL -DLIBNH
-LIBNHSYSSRC = ../sys/lib/libnethackmain.c \
+LIBNHSYSSRC = ../sys/libnh/libnhmain.c \
                ../sys/share/ioctl.c ../sys/share/unixtty.c \
                ../sys/unix/unixunix.c ../sys/unix/unixres.c \
                ../win/shim/winshim.c
-LIBNHSYSOBJ= libnethackmain.o ioctl.o unixtty.o unixunix.o \
+LIBNHSYSOBJ= libnhmain.o ioctl.o unixtty.o unixunix.o \
                 unixres.o winshim.o
 #don't bother building the game executable as it will fail
 #without winshim
 override GAME=
-MOREALL += ( cd src ; $(MAKE) pregame ; $(MAKE) libnethack.a )
+MOREALL += ( cd src ; $(MAKE) pregame ; $(MAKE) libnh.a )
 endif  # WANT_LIBNH
 
 #PREFIX=/usr
@@ -225,10 +225,10 @@ GAMEPERM = 0755
 #-INCLUDE cross-post.2020
 #
 ifdef WANT_LIBNH
-libnethack.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
+libnh.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
        $(AR) rcs $@ $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
        @echo "$@ built."
-libnethackmain.o : ../sys/lib/libnethackmain.c $(HACK_H) ../include/date.h
+libnhmain.o : ../sys/libnh/libnhmain.c $(HACK_H) ../include/date.h
        $(CC) $(CFLAGS) -c -o$@ $<
 winshim.o : ../win/shim/winshim.c $(HACK_H)
        $(CC) $(CFLAGS) -c -o$@ $<

diff --git a/sys/unix/hints/macOS.2020 b/sys/unix/hints/macOS.2020
index f9e3c8f58efa73012b0996a51af864bb1578b3ff..fb739731ee90cfd5bb203c34a4789cd1a84564d0 100755 (executable)
--- a/sys/unix/hints/macOS.2020
+++ b/sys/unix/hints/macOS.2020
@@ -173,16 +173,16 @@ VARDATND += $(sort $(VARDATND0))
 
 ifdef WANT_LIBNH
 CFLAGS += -DSHIM_GRAPHICS -DNOTTYGRAPHICS -DNOSHELL -DLIBNH
-LIBNHSYSSRC = ../sys/lib/libnethackmain.c \
+LIBNHSYSSRC = ../sys/libnh/libnhmain.c \
                ../sys/share/ioctl.c ../sys/share/unixtty.c \
                ../sys/unix/unixunix.c ../sys/unix/unixres.c \
                ../win/shim/winshim.c
-LIBNHSYSOBJ= libnethackmain.o ioctl.o unixtty.o unixunix.o \
+LIBNHSYSOBJ= libnhmain.o ioctl.o unixtty.o unixunix.o \
                 unixres.o winshim.o
 #don't bother building the game executable as it will fail
 #without winshim
 override GAME=
-MOREALL += ( cd src ; $(MAKE) pregame ; $(MAKE) libnethack.a )
+MOREALL += ( cd src ; $(MAKE) pregame ; $(MAKE) libnh.a )
 endif  # WANT_LIBNH
 
 WANT_BUNDLE=1
@@ -295,10 +295,10 @@ VARDIR=$(HACKDIR)
 #
 #-POST
 ifdef WANT_LIBNH
-libnethack.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
+libnh.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
        $(AR) rcs $@ $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
        @echo "$@ built."
-libnethackmain.o : ../sys/lib/libnethackmain.c $(HACK_H) ../include/date.h
+libnhmain.o : ../sys/libnh/libnhmain.c $(HACK_H) ../include/date.h
        $(CC) $(CFLAGS) -c -o$@ $<
 winshim.o : ../win/shim/winshim.c $(HACK_H)
        $(CC) $(CFLAGS) -c -o$@ $<