X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=Makefile;h=3c15a52abcaafe7b62af840e1657c1b17e0ae82d;hb=88da6e72a5e4b568eacd9b21bb47f4ffc02fbd95;hp=f9cbb85413a548dc98e23192611e10123af7d19b;hpb=1b167e5e72e0b4ea4b991293abaf9b8ff1eac599;p=open-adventure.git

diff --git a/Makefile b/Makefile
index f9cbb85..3c15a52 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@
 VERS=1.0
 
 CC?=gcc
-CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -g
+CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -Wall -Wpedantic -g
 LIBS=
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Linux)
@@ -22,7 +22,7 @@ ifeq ($(UNAME_S),Linux)
 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]
+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,7 +30,7 @@ SOURCES=$(OBJS:.o=.c) dungeon.c advent.h common.h adventure.text Makefile contro
 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 common.h
+main.o:	 	advent.h database.h database.c common.h newdb.h
 
 init.o:	 	advent.h database.h database.c common.h
 
@@ -47,19 +47,24 @@ 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
 	./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 newdb.c newdb.h
 	rm -f README advent.6 MANIFEST *.tar.gz
 	rm -f *~
 	cd tests; $(MAKE) --quiet clean
@@ -99,5 +104,5 @@ refresh: advent.html
 
 dist: advent-$(VERS).tar.gz
 
-debug: CCFLAGS += -O0 --coverage
+debug: CCFLAGS += -O0 --coverage -g
 debug: advent