adopt some integration suggestions

sys/lib -> sys/libnh
sys/lib/libnethackmain.c -> sys/libnh/libnhmain.c
libnethack.a -> libnh.a
This commit is contained in:
nhmall
2020-10-11 13:33:51 -04:00
parent 0adb64e384
commit 6806c30a59
17 changed files with 19 additions and 19 deletions

View File

@@ -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$@ $<