X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=Makefile;h=80f1c121d8bb52da8b147c869670d2597bce2c9d;hb=00514b079380c064b91f7ab95fec7e793a365d46;hp=3c0e965e14bace008c5444111b57306bd6966fad;hpb=eaee02aa09d1db40ea10d3b77e7df1e2e9c6b9ba;p=open-adventure.git

diff --git a/Makefile b/Makefile
index 3c0e965..80f1c12 100644
--- a/Makefile
+++ b/Makefile
@@ -18,11 +18,16 @@
 # 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"
 
 VERS=1.0
 
 CC?=gcc
-CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -Wall -Wpedantic -Wextra -g
+CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -Wpedantic -g
 LIBS=
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Linux)
@@ -42,13 +47,13 @@ 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
+saveresume.o:	advent.h database.h common.h newdb.h
 
 common.o:	common.h
 
@@ -72,6 +77,7 @@ clean:
 	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
@@ -101,6 +107,9 @@ 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
 
@@ -109,5 +118,8 @@ refresh: advent.html
 
 dist: advent-$(VERS).tar.gz
 
+linty: CCFLAGS += -W -Wall -Wextra -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wshadow -Wfloat-equal -Wcast-align -Wwrite-strings -Waggregate-return -Wcast-qual -Wswitch-enum -Wwrite-strings -Wunreachable-code -Winit-self -Wpointer-arith -O2 
+linty: advent
+
 debug: CCFLAGS += -O0 --coverage -g
 debug: advent