From: nhmall <nhmall@nethack.org>
Date: Mon, 5 Oct 2020 01:12:03 +0000 (-0400)
Subject: placement of libnethack targets required adjusting
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac493aa455b9790f5b653fd7f9d04e158825717e;p=nethack

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 c8312452c..b9119d5c0 100755
--- 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 31673dded..44a1106bc 100755
--- 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
 ###