X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=Makefile;h=e9c0de38748c06354386d324043636b3d04772a7;hp=c58e6d7b020088cad3cdfb382ad05c710c466048;hb=31f27b672c05df602fa1cc9cb5f64f0ef7cb3d80;hpb=645d00c7114d3cabcb58bee4f7684a4af1ebb2cd

diff --git a/Makefile b/Makefile
index c58e6d7..e9c0de3 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ VERS=$(shell sed -n <NEWS '/^[0-9]/s/:.*//p' | head -1)
 .PHONY: debug indent release refresh dist linty html clean
 
 CC?=gcc
-CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -Wpedantic -O2
+CCFLAGS+=-std=c99 -D_DEFAULT_SOURCE -DVERSION=\"$(VERS)\" -Wpedantic -O2
 LIBS=
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Linux)
@@ -46,7 +46,7 @@ SOURCES=$(OBJS:.o=.c) advent.h adventure.yaml Makefile control linenoise/linenoi
 advent:	$(OBJS) linenoise.o dungeon.o
 	$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) dungeon.o linenoise.o $(LDFLAGS) $(LIBS)
 
-main.o:	 	advent.h dungeon.h
+main.o:	 	linenoise-gitmodule advent.h dungeon.h
 
 init.o:	 	advent.h dungeon.h
 
@@ -56,7 +56,7 @@ score.o:	advent.h dungeon.h
 
 misc.o:		advent.h dungeon.h
 
-cheat.o:	advent.h dungeon.h
+cheat.o:	linenoise-gitmodule advent.h dungeon.h
 
 saveresume.o:	advent.h dungeon.h
 
@@ -66,10 +66,13 @@ dungeon.o:	dungeon.c dungeon.h
 dungeon.c dungeon.h: make_dungeon.py adventure.yaml
 	python3 make_dungeon.py
 
-linenoise.o:	linenoise/linenoise.h
+linenoise-gitmodule: 
+	test -s linenoise/linenoise.h || { echo "\nlinenoise not present. Try: \n\n\tgit submodule update --recursive --remote --init\n"; exit 1; }
+
+linenoise.o:	linenoise-gitmodule linenoise/linenoise.h
 	$(CC) -c linenoise/linenoise.c
 
-linenoise-dbg:	linenoise/linenoise.h
+linenoise-dbg:	linenoise-gitmodule linenoise/linenoise.h
 	$(CC) $(CCFLAGS) -c linenoise/linenoise.c
 
 clean: