X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=Makefile;h=31f35a96f24a14e57466e4307503a503c71538a0;hb=34621b054adb37028a18411db7df5dee0e9c9f00;hp=0b3e9a75e964fe6abe9715efebe4b2368fc77b20;hpb=1173a9a265a3132688830c26077129e3c624cd13;p=open-adventure.git

diff --git a/Makefile b/Makefile
index 0b3e9a7..31f35a9 100644
--- a/Makefile
+++ b/Makefile
@@ -14,14 +14,14 @@
 VERS=1.0
 
 CC?=gcc
-CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -g
+CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -Wall -Wpedantic
 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
+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]
 
 .c.o:
@@ -38,7 +38,7 @@ actions.o:	advent.h database.h database.c common.h
 
 score.o:	advent.h database.h database.c common.h
 
-misc.o:		advent.h database.h database.c common.h
+misc.o:		advent.h database.h database.c common.h newdb.h
 
 saveresume.o:	advent.h database.h database.c common.h
 
@@ -47,11 +47,13 @@ common.o:	common.h
 database.o:     database.c database.h common.h
 	$(CC) $(CCFLAGS) $(DBX) -c database.c
 
+newdb.o:	newdb.h
+
 database.c database.h: dungeon
 	./dungeon
 
 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
@@ -78,7 +80,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.
@@ -89,7 +91,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
@@ -97,5 +99,5 @@ refresh: advent.html
 
 dist: advent-$(VERS).tar.gz
 
-debug: CCFLAGS += -O0 --coverage
+debug: CCFLAGS += -O0 --coverage -g
 debug: advent