X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=Makefile;h=43f1f9514caa1c1286ec093cbb47e5147d92d307;hp=d1d3fd453e946e0fae68fc4e9f73dbcb3929e676;hb=ab94051da166ca2be050c0d5725774f2edf3e7ee;hpb=be2ada4d9387e389bf7ef115b298226370b5752a

diff --git a/Makefile b/Makefile
index d1d3fd4..43f1f95 100644
--- a/Makefile
+++ b/Makefile
@@ -10,68 +10,92 @@
 # git submodule update --recursive --remote
 #
 # but this should seldom be necessary as that library is pretty stable.
+#
+# You will also need Python 3 YAML.  Under Debian or ubuntu:
+#
+# apt-get install python3-yaml
+#
+# 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=$(shell sed -n <NEWS '/^[0-9]/s/:.*//p' | head -1)
 
-VERS=1.0
+.PHONY: debug indent release refresh dist linty html clean
+.PHONY: check coverage
 
 CC?=gcc
-CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -Wall -Wpedantic -g
+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
-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) database.o linenoise.o newdb.o
-	$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) database.o newdb.o linenoise.o $(LDFLAGS) $(LIBS)
+advent:	$(OBJS) linenoise.o dungeon.o
+	$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) dungeon.o linenoise.o $(LDFLAGS) $(LIBS)
 
-main.o:	 	advent.h database.h database.c common.h newdb.h
+main.o:	 	advent.h dungeon.h linenoise.o
 
-init.o:	 	advent.h database.h database.c common.h newdb.h
+init.o:	 	advent.h dungeon.h
 
-actions.o:	advent.h database.h database.c common.h
+actions.o:	advent.h dungeon.h
 
-score.o:	advent.h database.h database.c common.h newdb.h
+score.o:	advent.h dungeon.h
 
-misc.o:		advent.h database.h database.c common.h newdb.h
+misc.o:		advent.h dungeon.h
 
-saveresume.o:	advent.h database.h database.c common.h
+cheat.o:	advent.h dungeon.h linenoise.o
 
-common.o:	common.h
+saveresume.o:	advent.h dungeon.h
 
-database.o:     database.c database.h common.h
-	$(CC) $(CCFLAGS) $(DBX) -c database.c
+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.c database.h: dungeon
-	./dungeon
-
-newdb.c newdb.h:
-	python3 newdungeon.py
-
-linenoise.o:	linenoise/linenoise.h
+linenoise.o: linenoise/linenoise.h
+	@test -s linenoise/linenoise.h || { echo -e "linenoise not present. Try:\n\
+		git submodule update --recursive --remote --init"; exit 1; }
 	$(CC) -c linenoise/linenoise.c
 
-dungeon: dungeon.o common.o
-	$(CC) $(CCFLAGS) -o $@ dungeon.o common.o
+linenoise-dbg: linenoise/linenoise.h
+	@test -s linenoise/linenoise.h || { echo -e "linenoise not present. Try:\n\
+		git submodule update --recursive --remote --init"; exit 1; }
+	$(CC) $(CCFLAGS) -c linenoise/linenoise.c
 
 clean:
-	rm -f *.o advent *.html database.[ch] 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
 
-check: advent
+
+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.
@@ -96,13 +120,39 @@ 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
+
+debug-ln: linenoise-dbg debug