X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=Makefile;h=9cb6feb8e03c7ccdd66330197092650d558e6313;hp=3c0e965e14bace008c5444111b57306bd6966fad;hb=6150e3be1fdc8d55ff79f87c014a62a134559799;hpb=eaee02aa09d1db40ea10d3b77e7df1e2e9c6b9ba

diff --git a/Makefile b/Makefile
index 3c0e965..9cb6feb 100644
--- a/Makefile
+++ b/Makefile
@@ -18,11 +18,18 @@
 # If you have pip installed,
 #
 # pip3 install PyYAML
+#
+# If you are using MacPorts on OS X:
+# port install py3{5,6}-yaml as appropriate for your Python 3 version.
+#
+# To build with save/resume disabled, pass CCFLAGS="-D ADVENT_NOSAVE"
+
+.PHONY: debug indent release refresh dist linty html clean
 
 VERS=1.0
 
 CC?=gcc
-CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -Wall -Wpedantic -Wextra -g
+CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -Wpedantic -O2
 LIBS=
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Linux)
@@ -30,6 +37,7 @@ ifeq ($(UNAME_S),Linux)
 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
 
 .c.o:
@@ -42,39 +50,48 @@ main.o:	 	advent.h database.h common.h newdb.h
 
 init.o:	 	advent.h database.h common.h newdb.h
 
-actions.o:	advent.h database.h common.h
+actions.o:	advent.h database.h common.h newdb.h
 
 score.o:	advent.h database.h common.h newdb.h
 
 misc.o:		advent.h database.h common.h newdb.h
 
-saveresume.o:	advent.h database.h common.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 .*~
 	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
 
 .SUFFIXES: .adoc .html .6
@@ -101,13 +118,37 @@ advent-$(VERS).tar.gz: $(SOURCES) $(DOCS)
 	(tar -T MANIFEST -czvf advent-$(VERS).tar.gz)
 	@(rm advent-$(VERS))
 
+indent:
+	astyle -n -A3 --pad-header --min-conditional-indent=1 --pad-oper *.c
+
 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
 
-debug: CCFLAGS += -O0 --coverage -g
-debug: advent
+linty: CCFLAGS += -W
+linty: CCFLAGS += -Wall
+linty: CCFLAGS += -Wextra
+linty: CCFLAGS += -Wundef
+linty: CCFLAGS += -Wstrict-prototypes
+linty: CCFLAGS += -Wmissing-prototypes
+linty: CCFLAGS += -Wmissing-declarations
+linty: CCFLAGS += -Wshadow
+linty: CCFLAGS += -Wfloat-equal
+linty: CCFLAGS += -Wcast-align
+linty: CCFLAGS += -Wwrite-strings
+linty: CCFLAGS += -Waggregate-return
+linty: CCFLAGS += -Wcast-qual
+linty: CCFLAGS += -Wswitch-enum
+linty: CCFLAGS += -Wwrite-strings
+linty: CCFLAGS += -Wunreachable-code
+linty: CCFLAGS += -Winit-self
+linty: CCFLAGS += -Wpointer-arith
+linty: advent
+
+debug: CCFLAGS += -O0 --coverage -ggdb
+debug: linty
+debug: cheat