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

diff --git a/Makefile b/Makefile
index 3c15a52..88fd807 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,14 @@
 # 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
 
@@ -21,36 +29,33 @@ ifeq ($(UNAME_S),Linux)
 	LIBS=-lrt
 endif
 
-OBJS=main.o init.o actions.o score.o misc.o saveresume.o common.o newdb.o
+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 newdb.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.c newdb.h
 	$(CC) $(CCFLAGS) $(DBX) -c newdb.c
 
-database.c database.h: dungeon
+database.h: dungeon
 	./dungeon
 
 newdb.c newdb.h:
@@ -63,7 +68,7 @@ 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 *~