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

diff --git a/Makefile b/Makefile
index a435d07..e9c0de3 100644
--- a/Makefile
+++ b/Makefile
@@ -24,76 +24,76 @@
 #
 # 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)
 	LIBS=-lrt
 endif
 
-OBJS=main.o init.o actions.o score.o misc.o saveresume.o common.o
-CHEAT_OBJS=cheat.o init.o actions.o score.o misc.o saveresume.o common.o
-SOURCES=$(OBJS:.o=.c) dungeon.c advent.h common.h adventure.text Makefile control linenoise/linenoise.[ch] newdungeon.py
+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.yaml Makefile control linenoise/linenoise.[ch] make_dungeon.py
 
 .c.o:
 	$(CC) $(CCFLAGS) $(DBX) -c $<
 
-advent:	$(OBJS) linenoise.o newdb.o
-	$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) newdb.o linenoise.o $(LDFLAGS) $(LIBS)
-
-main.o:	 	advent.h database.h common.h newdb.h
+advent:	$(OBJS) linenoise.o dungeon.o
+	$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) dungeon.o linenoise.o $(LDFLAGS) $(LIBS)
 
-init.o:	 	advent.h database.h common.h newdb.h
+main.o:	 	linenoise-gitmodule advent.h dungeon.h
 
-actions.o:	advent.h database.h common.h newdb.h
+init.o:	 	advent.h dungeon.h
 
-score.o:	advent.h database.h common.h newdb.h
+actions.o:	advent.h dungeon.h
 
-misc.o:		advent.h database.h common.h newdb.h
+score.o:	advent.h dungeon.h
 
-cheat.o:	advent.h database.h common.h newdb.h
+misc.o:		advent.h dungeon.h
 
-saveresume.o:	advent.h database.h common.h newdb.h
+cheat.o:	linenoise-gitmodule advent.h dungeon.h
 
-common.o:	common.h
+saveresume.o:	advent.h dungeon.h
 
-dungeon.o:	common.h newdb.h
+dungeon.o:	dungeon.c dungeon.h
+	$(CC) $(CCFLAGS) $(DBX) -c dungeon.c
 
-newdb.o:	newdb.c newdb.h
-	$(CC) $(CCFLAGS) $(DBX) -c newdb.c
+dungeon.c dungeon.h: make_dungeon.py adventure.yaml
+	python3 make_dungeon.py
 
-database.h: dungeon
-	./dungeon
+linenoise-gitmodule: 
+	test -s linenoise/linenoise.h || { echo "\nlinenoise not present. Try: \n\n\tgit submodule update --recursive --remote --init\n"; exit 1; }
 
-newdb.c newdb.h: newdungeon.py adventure.yaml
-	python3 newdungeon.py
-
-linenoise.o:	linenoise/linenoise.h
+linenoise.o:	linenoise-gitmodule linenoise/linenoise.h
 	$(CC) -c linenoise/linenoise.c
 
-dungeon: dungeon.o common.o
-	$(CC) $(CCFLAGS) -o $@ dungeon.o common.o
+linenoise-dbg:	linenoise-gitmodule linenoise/linenoise.h
+	$(CC) $(CCFLAGS) -c linenoise/linenoise.c
 
 clean:
-	rm -f *.o advent *.html database.h dungeon *.gcno *.gcda
-	rm -f newdb.c newdb.h
+	rm -f *.o advent cheat *.html *.gcno *.gcda
+	rm -f dungeon.c dungeon.h
 	rm -f README advent.6 MANIFEST *.tar.gz
 	rm -f *~
 	rm -f .*~
+	rm -rf coverage advent.info
 	cd tests; $(MAKE) --quiet clean
 
 
-cheat: $(CHEAT_OBJS) linenoise.o newdb.o 
-	$(CC) $(CCFLAGS) $(DBX) -o cheat $(CHEAT_OBJS) linenoise.o newdb.o $(LDFLAGS) $(LIBS)
+cheat: $(CHEAT_OBJS) linenoise.o dungeon.o 
+	$(CC) $(CCFLAGS) $(DBX) -o cheat $(CHEAT_OBJS) linenoise.o dungeon.o $(LDFLAGS) $(LIBS)
 
 check: advent cheat
 	cd tests; $(MAKE) --quiet
 
+coverage: debug cheat
+	cd tests; $(MAKE) coverage --quiet
+
 .SUFFIXES: .adoc .html .6
 
 # Requires asciidoc and xsltproc/docbook stylesheets.
@@ -152,3 +152,5 @@ linty: advent
 debug: CCFLAGS += -O0 --coverage -ggdb
 debug: linty
 debug: cheat
+
+debug-ln: linenoise-dbg debug