nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

'make' => 'make all'

Browse Source 
In sys/unix/Makefile.{top,src}, move the 'all' target first so that
it's the default if no target is specified.  Recent lua handling
unintentionally broke that for Makefile.top by putting 'lua_support'
target in front of 'all'.
This commit is contained in:
PatR
2019-12-09 15:02:30 -08:00
parent 2fe31eec46
commit 1c30c437c3
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/unix/Makefile.src
+5 -3
View File
@@ -1,5 +1,5 @@
# NetHack Makefile. # NetHack Makefile.
# NetHack 3.6 Makefile.src $NHDT-Date: 1575917700 2019/12/09 18:55:00 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.86 $ # NetHack 3.6 Makefile.src $NHDT-Date: 1575932543 2019/12/09 23:02:23 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.87 $
# Copyright (c) 2018 by Pasi Kallinen # Copyright (c) 2018 by Pasi Kallinen
# NetHack may be freely redistributed. See license for details. # NetHack may be freely redistributed. See license for details.
@@ -527,6 +527,10 @@ HOBJ = $(FIRSTOBJ) allmain.o alloc.o apply.o artifact.o attrib.o ball.o \
$(REGEXOBJ) $(RANDOBJ) $(SYSOBJ) $(WINOBJ) $(HINTOBJ) version.o $(REGEXOBJ) $(RANDOBJ) $(SYSOBJ) $(WINOBJ) $(HINTOBJ) version.o
# the .o files from the HACKCSRC, SYSSRC, and WINSRC lists # the .o files from the HACKCSRC, SYSSRC, and WINSRC lists
# first target is also the default target for 'make' without any arguments
all: $(GAME)
@echo ""
$(GAME): $(SYSTEM) $(GAME): $(SYSTEM)
@echo "$(GAME) is up to date." @echo "$(GAME) is up to date."
@@ -582,8 +586,6 @@ DUMB.Setup: ../include/extern.h
cp ../include/extern.DUMB ../include/extern.h cp ../include/extern.DUMB ../include/extern.h
@touch DUMB.Setup @touch DUMB.Setup
all: $(GAME)
../lib/lua/liblua.a ../include/nhlua.h: ../lib/lua/liblua.a ../include/nhlua.h:
@( cd .. ; $(MAKE) lua_support ) @( cd .. ; $(MAKE) lua_support )
sys/unix/Makefile.top
+9 -8
View File
@@ -1,5 +1,5 @@
# NetHack Top-level Makefile. # NetHack Top-level Makefile.
# NetHack 3.6 Makefile.top $NHDT-Date: 1574825215 2019/11/27 03:26:55 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.43 $ # NetHack 3.6 Makefile.top $NHDT-Date: 1575932543 2019/12/09 23:02:23 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.44 $
# Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland # Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland
# NetHack may be freely redistributed. See license for details. # NetHack may be freely redistributed. See license for details.
@@ -94,6 +94,14 @@ DATNODLB = $(VARDATND) license symbols
DATDLB = $(DATHELP) dungeon.lua tribute $(SPEC_LEVS) $(QUEST_LEVS) $(VARDATD) DATDLB = $(DATHELP) dungeon.lua tribute $(SPEC_LEVS) $(QUEST_LEVS) $(VARDATD)
DAT = $(DATNODLB) $(DATDLB) DAT = $(DATNODLB) $(DATDLB)
# first target is also the default target for 'make' without any arguments
all: $(GAME) recover Guidebook $(VARDAT) spec_levs check-dlb
true; $(MOREALL)
@echo "Done."
$(GAME): lua_support
( cd src ; $(MAKE) $(GAME) )
lua_support: lib/lua/liblua.a include/nhlua.h lua_support: lib/lua/liblua.a include/nhlua.h
@true @true
lib/lua-$(LUA_VERSION)/src/liblua.a: lib/lua-$(LUA_VERSION)/src/lua.h lib/lua-$(LUA_VERSION)/src/liblua.a: lib/lua-$(LUA_VERSION)/src/lua.h
@@ -110,13 +118,6 @@ include/nhlua.h: lib/lua/liblua.a
@echo '#include "../lib/lua-$(LUA_VERSION)/src/lauxlib.h"' >> $@ @echo '#include "../lib/lua-$(LUA_VERSION)/src/lauxlib.h"' >> $@
@echo '/*nhlua.h*/' >> $@ @echo '/*nhlua.h*/' >> $@
$(GAME): lua_support
( cd src ; $(MAKE) )
all: $(GAME) recover Guidebook $(VARDAT) spec_levs check-dlb
true; $(MOREALL)
@echo "Done."
# Note: many of the dependencies below are here to allow parallel make # Note: many of the dependencies below are here to allow parallel make
# to generate valid output # to generate valid output