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

diff --git a/Makefile b/Makefile
index d1d3fd4..62a4ee4 100644
--- a/Makefile
+++ b/Makefile
@@ -10,11 +10,22 @@
 # 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.
 
 VERS=1.0
 
 CC?=gcc
-CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -Wall -Wpedantic -g
+CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -Wpedantic 
 LIBS=
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Linux)
@@ -27,30 +38,27 @@ SOURCES=$(OBJS:.o=.c) dungeon.c advent.h common.h adventure.text Makefile contro
 .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 newdb.o
+	$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) newdb.o linenoise.o $(LDFLAGS) $(LIBS)
 
-main.o:	 	advent.h database.h database.c common.h newdb.h
+main.o:	 	advent.h database.h common.h newdb.h
 
-init.o:	 	advent.h database.h database.c common.h newdb.h
+init.o:	 	advent.h database.h common.h newdb.h
 
-actions.o:	advent.h database.h database.c common.h
+actions.o:	advent.h database.h common.h newdb.h
 
-score.o:	advent.h database.h database.c common.h newdb.h
+score.o:	advent.h database.h common.h newdb.h
 
-misc.o:		advent.h database.h database.c common.h newdb.h
+misc.o:		advent.h database.h common.h newdb.h
 
-saveresume.o:	advent.h database.h database.c common.h
+saveresume.o:	advent.h database.h common.h newdb.h
 
 common.o:	common.h
 
-database.o:     database.c database.h common.h
-	$(CC) $(CCFLAGS) $(DBX) -c database.c
-
 newdb.o:	newdb.c newdb.h
 	$(CC) $(CCFLAGS) $(DBX) -c newdb.c
 
-database.c database.h: dungeon
+database.h: dungeon
 	./dungeon
 
 newdb.c newdb.h:
@@ -63,10 +71,11 @@ dungeon: dungeon.o common.o
 	$(CC) $(CCFLAGS) -o $@ dungeon.o common.o
 
 clean:
-	rm -f *.o advent *.html database.[ch] dungeon *.gcno *.gcda
+	rm -f *.o advent *.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
@@ -96,6 +105,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
 
@@ -104,5 +116,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