placement of libnethack targets required adjusting

From -PRE to -POST section

diff --git a/sys/unix/hints/linux.2020 b/sys/unix/hints/linux.2020
index c8312452ccda11c567e52952fb85c8b92c3504f9..b9119d5c09a5437cfe229509c71065db482729b3 100755 (executable)
--- a/sys/unix/hints/linux.2020
+++ b/sys/unix/hints/linux.2020
@@ -176,14 +176,7 @@ LIBNHSYSOBJ= libnethackmain.o ioctl.o unixtty.o unixunix.o \
 #without winshim
 override GAME=
 MOREALL += ( cd src ; $(MAKE) pregame ; $(MAKE) libnethack.a )
-libnethack.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)
-       $(CC) $(CFLAGS) -c -o$@ $<
-winshim.o : ../win/shim/winshim.c $(HACK_H)
-       $(CC) $(CFLAGS) -c -o$@ $<
-endif  # BUILD_LIBNH
+endif  # WANT_LIBNH
 
 #PREFIX=/usr
 PREFIX=$(wildcard ~)/nh/install
@@ -231,3 +224,13 @@ GAMEPERM = 0755
 #
 #-INCLUDE cross-post.2020
 #
+ifdef WANT_LIBNH
+libnethack.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)
+       $(CC) $(CFLAGS) -c -o$@ $<
+winshim.o : ../win/shim/winshim.c $(HACK_H)
+       $(CC) $(CFLAGS) -c -o$@ $<
+endif  # WANT_LIBNH
+#

diff --git a/sys/unix/hints/macOS.2020 b/sys/unix/hints/macOS.2020
index 31673dded6a6f1375bda25c3c12877edb0017b93..44a1106bc82172bf923c224939bd8314ece0fed1 100755 (executable)
--- a/sys/unix/hints/macOS.2020
+++ b/sys/unix/hints/macOS.2020
@@ -183,13 +183,6 @@ LIBNHSYSOBJ= libnethackmain.o ioctl.o unixtty.o unixunix.o \
 #without winshim
 override GAME=
 MOREALL += ( cd src ; $(MAKE) pregame ; $(MAKE) libnethack.a )
-libnethack.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)
-       $(CC) $(CFLAGS) -c -o$@ $<
-winshim.o : ../win/shim/winshim.c $(HACK_H)
-       $(CC) $(CFLAGS) -c -o$@ $<
 endif  # WANT_LIBNH
 
 WANT_BUNDLE=1
@@ -301,6 +294,15 @@ VARDIR=$(HACKDIR)
 #-INCLUDE cross-pre.2020
 #
 #-POST
+ifdef WANT_LIBNH
+libnethack.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)
+       $(CC) $(CFLAGS) -c -o$@ $<
+winshim.o : ../win/shim/winshim.c $(HACK_H)
+       $(CC) $(CFLAGS) -c -o$@ $<
+endif  # WANT_LIBNH
 
 ifdef MAKEFILE_TOP
 ###