X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=Makefile;h=3c0e965e14bace008c5444111b57306bd6966fad;hb=d4fc7a88b4aac2f72013e7c681c907de09db349d;hp=b8b82212046aac3007b935b6fd9f0b759eaa4640;hpb=7c9a0bfb36e0c630d6056e5897d00a8d54317261;p=open-adventure.git

diff --git a/Makefile b/Makefile
index b8b8221..3c0e965 100644
--- a/Makefile
+++ b/Makefile
@@ -10,48 +10,57 @@
 # 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
 
 CC?=gcc
-CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -Wall -Wpedantic -g
+CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -Wall -Wpedantic -Wextra -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 saveresume.o common.o newdb.o
-SOURCES=$(OBJS:.o=.c) dungeon.c advent.h common.h adventure.text Makefile control linenoise/linenoise.[ch]
+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
+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.h
+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:
+	python3 newdungeon.py
+
 linenoise.o:	linenoise/linenoise.h
 	$(CC) -c linenoise/linenoise.c
 
@@ -59,7 +68,8 @@ 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 *~
 	cd tests; $(MAKE) --quiet clean