X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=Makefile;h=d16b12b8f0cfb36814af8d3d332b8d6a23da2835;hb=db281a96d70a43c6a6d5b516eceb6e4f67637c57;hp=d9436e0d7633ec0acb01977cdb4644b8b5ac385f;hpb=a4de450bfaf2c600dccd9a5b3625c5a3ca279e7c;p=open-adventure.git

diff --git a/Makefile b/Makefile
index d9436e0..d16b12b 100644
--- a/Makefile
+++ b/Makefile
@@ -36,9 +36,9 @@ ifeq ($(UNAME_S),Linux)
 	LIBS=-lrt
 endif
 
-OBJS=main.o init.o actions.o score.o misc.o saveresume.o common.o
-CHEAT_OBJS=cheat.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 adventure.yaml Makefile control linenoise/linenoise.[ch] newdungeon.py
+OBJS=main.o init.o actions.o score.o misc.o saveresume.o
+CHEAT_OBJS=cheat.o init.o actions.o score.o misc.o saveresume.o
+SOURCES=$(OBJS:.o=.c) advent.h adventure.text adventure.yaml Makefile control linenoise/linenoise.[ch] newdungeon.py
 
 .c.o:
 	$(CC) $(CCFLAGS) $(DBX) -c $<
@@ -46,45 +46,36 @@ SOURCES=$(OBJS:.o=.c) dungeon.c advent.h common.h adventure.text adventure.yaml
 advent:	$(OBJS) linenoise.o newdb.o
 	$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) newdb.o linenoise.o $(LDFLAGS) $(LIBS)
 
-main.o:	 	advent.h database.h common.h newdb.h
+main.o:	 	advent.h newdb.h
 
-init.o:	 	advent.h database.h common.h newdb.h
+init.o:	 	advent.h newdb.h
 
-actions.o:	advent.h database.h common.h newdb.h
+actions.o:	advent.h newdb.h
 
-score.o:	advent.h database.h common.h newdb.h
+score.o:	advent.h newdb.h
 
-misc.o:		advent.h database.h common.h newdb.h
+misc.o:		advent.h newdb.h
 
-cheat.o:	advent.h database.h common.h newdb.h
+cheat.o:	advent.h newdb.h
 
-saveresume.o:	advent.h database.h common.h newdb.h
-
-common.o:	common.h
-
-dungeon.o:	common.h newdb.h
+saveresume.o:	advent.h newdb.h
 
 newdb.o:	newdb.c newdb.h
 	$(CC) $(CCFLAGS) $(DBX) -c newdb.c
 
-database.h: dungeon
-	./dungeon
-
 newdb.c newdb.h: newdungeon.py adventure.yaml
 	python3 newdungeon.py
 
 linenoise.o:	linenoise/linenoise.h
 	$(CC) $(CCFLAGS) -c linenoise/linenoise.c
 
-dungeon: dungeon.o common.o
-	$(CC) $(CCFLAGS) -o $@ dungeon.o common.o
-
 clean:
-	rm -f *.o advent cheat *.html database.h dungeon *.gcno *.gcda
+	rm -f *.o advent cheat *.html *.gcno *.gcda
 	rm -f newdb.c newdb.h
 	rm -f README advent.6 MANIFEST *.tar.gz
 	rm -f *~
 	rm -f .*~
+	rm -rf coverage advent.info
 	cd tests; $(MAKE) --quiet clean
 
 
@@ -94,6 +85,9 @@ cheat: $(CHEAT_OBJS) linenoise.o newdb.o
 check: advent cheat
 	cd tests; $(MAKE) --quiet
 
+coverage: debug cheat
+	cd tests; $(MAKE) coverage --quiet
+
 .SUFFIXES: .adoc .html .6
 
 # Requires asciidoc and xsltproc/docbook stylesheets.
@@ -153,7 +147,4 @@ debug: CCFLAGS += -O0 --coverage -ggdb
 debug: linty
 debug: cheat
 
-coverage: debug check
-	lcov -t "advent" -o advent.info -c -d .
-	genhtml -o coverage/ advent.info