X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=Makefile;h=a6d39b6e542d095ee3a3fbe96093ca9e83d74002;hb=ad3b097c9e587c1474cc1cac93f89ada853902ff;hp=f1e51f366f24106e6ef191d4b81c06b1ec4e0852;hpb=a4341923730d5c04d959acc76244d44ba0c4027f;p=open-adventure.git

diff --git a/Makefile b/Makefile
index f1e51f3..a6d39b6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,6 @@
 # Makefile for the open-source release of adventure 2.5
 
-# Note: If you're building from the repository rather than the source tarball,
-# do this to get the linenoise library where you can use it:
-#
-# git submodule update --recursive --remote --init
-#
-# Therafter, you can update it like this:
-#
-# 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:
+# You will need Python 3 YAML.  Under Debian or ubuntu:
 #
 # apt-get install python3-yaml
 #
@@ -24,64 +13,52 @@
 #
 # To build with save/resume disabled, pass CCFLAGS="-D ADVENT_NOSAVE"
 
-.PHONY: debug indent release refresh dist linty html clean
+VERS=$(shell sed -n <NEWS '/^[0-9]/s/:.*//p' | head -1)
 
-VERS=1.0
+.PHONY: debug indent release refresh dist linty html clean
+.PHONY: check coverage
 
 CC?=gcc
-CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -Wpedantic -O2
-LIBS=
+CCFLAGS+=-std=c99 -D_DEFAULT_SOURCE -DVERSION=\"$(VERS)\" -Wpedantic -O2
+LIBS=-ledit
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Linux)
-	LIBS=-lrt
+	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.yaml Makefile control make_dungeon.py
 
 .c.o:
 	$(CC) $(CCFLAGS) $(DBX) -c $<
 
-advent:	$(OBJS) linenoise.o newdb.o
-	$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) newdb.o linenoise.o $(LDFLAGS) $(LIBS)
+advent:	$(OBJS) dungeon.o
+	$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) dungeon.o $(LDFLAGS) $(LIBS)
 
-main.o:	 	advent.h database.h common.h newdb.h
+main.o:	 	advent.h dungeon.h
 
-init.o:	 	advent.h database.h common.h newdb.h
+init.o:	 	advent.h dungeon.h
 
-actions.o:	advent.h database.h common.h newdb.h
+actions.o:	advent.h dungeon.h
 
-score.o:	advent.h database.h common.h newdb.h
+score.o:	advent.h dungeon.h
 
-misc.o:		advent.h database.h common.h newdb.h
+misc.o:		advent.h dungeon.h
 
-cheat.o:	advent.h database.h common.h newdb.h
+cheat.o:	advent.h dungeon.h
 
-saveresume.o:	advent.h database.h common.h newdb.h
+saveresume.o:	advent.h dungeon.h
 
-common.o:	common.h
+dungeon.o:	dungeon.c dungeon.h
+	$(CC) $(CCFLAGS) $(DBX) -c dungeon.c
 
-dungeon.o:	common.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
+dungeon.c dungeon.h: make_dungeon.py adventure.yaml
+	python3 make_dungeon.py
 
 clean:
-	rm -f *.o advent cheat *.html database.h dungeon *.gcno *.gcda
-	rm -f newdb.c newdb.h
+	rm -f *.o advent cheat *.html *.gcno *.gcda
+	rm -f dungeon.c dungeon.h
 	rm -f README advent.6 MANIFEST *.tar.gz
 	rm -f *~
 	rm -f .*~
@@ -89,8 +66,8 @@ clean:
 	cd tests; $(MAKE) --quiet clean
 
 
-cheat: $(CHEAT_OBJS) linenoise.o newdb.o 
-	$(CC) $(CCFLAGS) $(DBX) -o cheat $(CHEAT_OBJS) linenoise.o newdb.o $(LDFLAGS) $(LIBS)
+cheat: $(CHEAT_OBJS) dungeon.o
+	$(CC) $(CCFLAGS) $(DBX) -o cheat $(CHEAT_OBJS) dungeon.o $(LDFLAGS) $(LIBS)
 
 check: advent cheat
 	cd tests; $(MAKE) --quiet
@@ -157,4 +134,3 @@ debug: CCFLAGS += -O0 --coverage -ggdb
 debug: linty
 debug: cheat
 
-