X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=Makefile;h=f1e51f366f24106e6ef191d4b81c06b1ec4e0852;hp=11795079fab5059db4464689c51006a790280439;hb=a4341923730d5c04d959acc76244d44ba0c4027f;hpb=04eca720d9a5282b47f51c5d19910a094f3d1882

diff --git a/Makefile b/Makefile
index 1179507..f1e51f3 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@
 VERS=1.0
 
 CC?=gcc
-CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -Wpedantic -g
+CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -Wpedantic -O2
 LIBS=
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Linux)
@@ -37,7 +37,8 @@ ifeq ($(UNAME_S),Linux)
 endif
 
 OBJS=main.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
+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 adventure.yaml Makefile control linenoise/linenoise.[ch] newdungeon.py
 
 .c.o:
 	$(CC) $(CCFLAGS) $(DBX) -c $<
@@ -55,36 +56,48 @@ score.o:	advent.h database.h common.h newdb.h
 
 misc.o:		advent.h database.h common.h newdb.h
 
+cheat.o:	advent.h database.h common.h newdb.h
+
 saveresume.o:	advent.h database.h common.h newdb.h
 
 common.o:	common.h
 
+dungeon.o:	common.h newdb.h
+
 newdb.o:	newdb.c newdb.h
 	$(CC) $(CCFLAGS) $(DBX) -c newdb.c
 
 database.h: dungeon
 	./dungeon
 
-newdb.c newdb.h:
+newdb.c newdb.h: newdungeon.py adventure.yaml
 	python3 newdungeon.py
 
 linenoise.o:	linenoise/linenoise.h
-	$(CC) -c linenoise/linenoise.c
+	$(CC) $(CCFLAGS) -c linenoise/linenoise.c
 
 dungeon: dungeon.o common.o
 	$(CC) $(CCFLAGS) -o $@ dungeon.o common.o
 
 clean:
-	rm -f *.o advent *.html database.h dungeon *.gcno *.gcda
+	rm -f *.o advent cheat *.html database.h dungeon *.gcno *.gcda
 	rm -f newdb.c newdb.h
 	rm -f README advent.6 MANIFEST *.tar.gz
 	rm -f *~
 	rm -f .*~
+	rm -rf coverage advent.info
 	cd tests; $(MAKE) --quiet clean
 
-check: advent
+
+cheat: $(CHEAT_OBJS) linenoise.o newdb.o 
+	$(CC) $(CCFLAGS) $(DBX) -o cheat $(CHEAT_OBJS) linenoise.o newdb.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.
@@ -115,7 +128,7 @@ indent:
 release: advent-$(VERS).tar.gz advent.html history.html hints.html notes.html
 	shipper version=$(VERS) | sh -e -x
 
-refresh: advent.html
+refresh: advent.html notes.html history.html
 	shipper -N -w version=$(VERS) | sh -e -x
 
 dist: advent-$(VERS).tar.gz
@@ -138,8 +151,10 @@ linty: CCFLAGS += -Wwrite-strings
 linty: CCFLAGS += -Wunreachable-code
 linty: CCFLAGS += -Winit-self
 linty: CCFLAGS += -Wpointer-arith
-linty: CCFLAGS +=-O2 
 linty: advent
 
-debug: CCFLAGS += -O0 --coverage -g
-debug: advent
+debug: CCFLAGS += -O0 --coverage -ggdb
+debug: linty
+debug: cheat
+
+