Squasgh -Wextra warnings.

[open-adventure.git] / Makefile

diff --git a/Makefile b/Makefile
index b0e1adf74093f9fa339c7ca59798863cc3db3d78..3c0e965e14bace008c5444111b57306bd6966fad 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,56 +10,66 @@
 # 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
 
 VERS=1.0
 
 CC?=gcc
-CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -g
+CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -Wall -Wpedantic -Wextra -g
 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 newdb.o
-SOURCES=$(OBJS:.o=.c) dungeon.c advent.h common.h adventure.text Makefile control linenoise/linenoise.[ch]
+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
 
 .c.o:
        $(CC) $(CCFLAGS) $(DBX) -c $<
 
-advent:        $(OBJS) database.o linenoise.o
-       $(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) database.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
+main.o:                advent.h database.h common.h newdb.h
 
-init.o:                advent.h database.h database.c common.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
 
-score.o:       advent.h database.h database.c common.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
 
 common.o:      common.h
 
-database.o:     database.c database.h common.h
-       $(CC) $(CCFLAGS) $(DBX) -c database.c
-
-newdb.o:       newdb.h
+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:
+       python3 newdungeon.py
+
 linenoise.o:   linenoise/linenoise.h
-       $(CC) $(CCFLAGS) $(DBX) -c linenoise/linenoise.c
+       $(CC) -c linenoise/linenoise.c
 
 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 *~
        cd tests; $(MAKE) --quiet clean
@@ -80,7 +90,7 @@ check: advent
 html: advent.html history.html hints.html
 
 # README.adoc exists because that filename is magic on GitLab.
-DOCS=COPYING NEWS README.adoc TODO advent.adoc history.adoc hints.adoc advent.6
+DOCS=COPYING NEWS README.adoc TODO advent.adoc history.adoc notes.adoc hints.adoc advent.6
 TESTFILES=tests/*.log tests/*.chk tests/README tests/decheck tests/Makefile
 
 # Can't use GNU tar's --transform, needs to build under Alpine Linux.
@@ -91,7 +101,7 @@ advent-$(VERS).tar.gz: $(SOURCES) $(DOCS)
        (tar -T MANIFEST -czvf advent-$(VERS).tar.gz)
        @(rm advent-$(VERS))
 
-release: advent-$(VERS).tar.gz advent.html history.html hints.html
+release: advent-$(VERS).tar.gz advent.html history.html hints.html notes.html
        shipper version=$(VERS) | sh -e -x
 
 refresh: advent.html
@@ -99,5 +109,5 @@ refresh: advent.html
 
 dist: advent-$(VERS).tar.gz
 
-debug: CCFLAGS += -O0 --coverage
+debug: CCFLAGS += -O0 --coverage -g
 debug: advent