From: nhmall Date: Fri, 9 Oct 2020 13:18:51 +0000 (-0400) Subject: more wasm dependency order tinkering X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e399848771d4d525b81ab57c4905d9ba3580f6c;p=nethack more wasm dependency order tinkering --- diff --git a/sys/unix/hints/include/cross-post.2020 b/sys/unix/hints/include/cross-post.2020 index f36c11bf2..f7fda70ab 100644 --- a/sys/unix/hints/include/cross-post.2020 +++ b/sys/unix/hints/include/cross-post.2020 @@ -132,7 +132,7 @@ $(WASM_DATA_DIR): $(WASM_DATA_DIR)/nhdat touch $(WASM_DATA_DIR)/xlogfile cp ../sys/lib/sysconf $(WASM_DATA_DIR)/sysconf -$(WASM_DATA_DIR)/nhdat: $(WASM_DAT) +$(WASM_DATA_DIR)/nhdat: ( cd ..; $(MAKE) INSTDIR='$(WASM_DATA_DIR)' dlb ) ( cd ..; $(MAKE) INSTDIR='$(WASM_DATA_DIR)' dofiles-dlb ) diff --git a/sys/unix/hints/include/cross-pre.2020 b/sys/unix/hints/include/cross-pre.2020 index fd279b4ee..05f1b15a5 100644 --- a/sys/unix/hints/include/cross-pre.2020 +++ b/sys/unix/hints/include/cross-pre.2020 @@ -381,7 +381,7 @@ override WINOBJ= override GAME= # the real VARDAT hasn't been defined yet for use in ALLDEP override WASM_DAT = bogusmon data engrave epitaph oracles options quest.lua rumors -override ALLDEP = include/nhlua.h $(WASM_DAT) wasm spec_levs check-dlb +override ALLDEP = include/nhlua.h $(WASM_DAT) spec_levs check-dlb wasm override PREGAME += mkdir -p $(TARGETDIR)/wasm-data ; override CLEANMORE += rm -rf $(TARGETDIR) ; RANLIB=$(EMRANLIB)