X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=Makefile;h=08a0fbbd2b4ad3d6f7bc533f913f4aff9cb548de;hp=a0b1c70f00662e17dd08c3ecc50234274e4adf90;hb=60126c3dac4788cd5c01f5da6bb50986aeaac0d3;hpb=dd9bbe1f00367bce08cdd5d77ced9f4f8d9fddc0

diff --git a/Makefile b/Makefile
index a0b1c70..08a0fbb 100644
--- a/Makefile
+++ b/Makefile
@@ -14,15 +14,15 @@
 VERS=1.0
 
 CC?=gcc
-CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE
+CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -Wall -Wpedantic -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
-SOURCES=$(OBJS:.o=.c) dungeon.c advent.h sizes.h adventure.text Makefile control linenoise/linenoise.[ch]
+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] newdungeon.py
 
 .c.o:
 	$(CC) $(CCFLAGS) $(DBX) -c $<
@@ -30,30 +30,41 @@ SOURCES=$(OBJS:.o=.c) dungeon.c advent.h sizes.h adventure.text Makefile control
 advent:	$(OBJS) database.o linenoise.o
 	$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) database.o linenoise.o $(LDFLAGS) $(LIBS)
 
-main.o:	 	advent.h database.h database.c sizes.h
+main.o:	 	advent.h database.h database.c common.h newdb.h
 
-init.o:	 	advent.h database.h database.c sizes.h
+init.o:	 	advent.h database.h database.c common.h
 
-actions.o:	advent.h database.h database.c sizes.h
+actions.o:	advent.h database.h database.c common.h
 
-score.o:	advent.h database.h database.c sizes.h
+score.o:	advent.h database.h database.c common.h
 
-misc.o:	 advent.h database.h database.c sizes.h
+misc.o:		advent.h database.h database.c common.h newdb.h
 
-database.o:     database.c database.h sizes.h
+saveresume.o:	advent.h database.h database.c common.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
 	./dungeon
 
+newdb.c newdb.h:
+	./newdungeon.py
+
 linenoise.o:	linenoise/linenoise.h
-	$(CC) $(CCFLAGS) $(DBX) -c linenoise/linenoise.c
+	$(CC) -c linenoise/linenoise.c
 
-dungeon: dungeon.c
-	$(CC) $(CCFLAGS) -o $@ $<
+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 newdb.c newdb.h
 	rm -f README advent.6 MANIFEST *.tar.gz
 	rm -f *~
 	cd tests; $(MAKE) --quiet clean
@@ -74,7 +85,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.
@@ -85,7 +96,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
@@ -93,5 +104,5 @@ refresh: advent.html
 
 dist: advent-$(VERS).tar.gz
 
-debug: CCFLAGS += -O0 --coverage
+debug: CCFLAGS += -O0 --coverage -g
 debug: advent