X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=e9c0de38748c06354386d324043636b3d04772a7;hb=31f27b672c05df602fa1cc9cb5f64f0ef7cb3d80;hp=758408ab571a1d0ade40024445de83117d0ea7c5;hpb=1ee0e5c7b0cc469a2d10a7a83b638409a206dee9;p=open-adventure.git

diff --git a/Makefile b/Makefile
index 758408a..e9c0de3 100644
--- a/Makefile
+++ b/Makefile
@@ -24,12 +24,12 @@
 #
 # To build with save/resume disabled, pass CCFLAGS="-D ADVENT_NOSAVE"
 
-.PHONY: debug indent release refresh dist linty html clean
+VERS=$(shell sed -n <NEWS '/^[0-9]/s/:.*//p' | head -1)
 
-VERS=1.0
+.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)
@@ -38,7 +38,7 @@ endif
 
 OBJS=main.o init.o actions.o score.o misc.o saveresume.o
 CHEAT_OBJS=cheat.o init.o actions.o score.o misc.o saveresume.o
-SOURCES=$(OBJS:.o=.c) advent.h adventure.text adventure.yaml Makefile control linenoise/linenoise.[ch] make_dungeon.py
+SOURCES=$(OBJS:.o=.c) advent.h adventure.yaml Makefile control linenoise/linenoise.[ch] make_dungeon.py
 
 .c.o:
 	$(CC) $(CCFLAGS) $(DBX) -c $<
@@ -46,7 +46,7 @@ SOURCES=$(OBJS:.o=.c) advent.h adventure.text adventure.yaml Makefile control li
 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,7 +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-gitmodule linenoise/linenoise.h
 	$(CC) $(CCFLAGS) -c linenoise/linenoise.c
 
 clean:
@@ -147,4 +153,4 @@ debug: CCFLAGS += -O0 --coverage -ggdb
 debug: linty
 debug: cheat
 
-
+debug-ln: linenoise-dbg debug