X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=Makefile;h=a0b1c70f00662e17dd08c3ecc50234274e4adf90;hp=dce6fc066ba6e5e8127c02cd08359d6f59334228;hb=dd9bbe1f00367bce08cdd5d77ced9f4f8d9fddc0;hpb=31ecc4a8e3e8dcd5db1f2349a91ef6064421d2a0

diff --git a/Makefile b/Makefile
index dce6fc0..a0b1c70 100644
--- a/Makefile
+++ b/Makefile
@@ -1,48 +1,61 @@
 # 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.
+
 VERS=1.0
 
 CC?=gcc
-CCFLAGS+=-std=c99
+CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE
 LIBS=
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Linux)
 	LIBS=-lrt
 endif
 
-OBJS=main.o init.o actions1.o actions2.o score.o misc.o
-SOURCES=$(OBJS:.o=.c) compile.c advent.h funcs.h adventure.text Makefile control
+OBJS=main.o init.o actions.o score.o misc.o
+SOURCES=$(OBJS:.o=.c) dungeon.c advent.h sizes.h adventure.text Makefile control linenoise/linenoise.[ch]
 
 .c.o:
 	$(CC) $(CCFLAGS) $(DBX) -c $<
 
-advent:	$(OBJS) database.o
-	$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) database.o $(LDFLAGS) $(LIBS)
+advent:	$(OBJS) database.o linenoise.o
+	$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) database.o linenoise.o $(LDFLAGS) $(LIBS)
 
-main.o:		advent.h funcs.h database.h
+main.o:	 	advent.h database.h database.c sizes.h
 
-init.o:		advent.h funcs.h database.h
+init.o:	 	advent.h database.h database.c sizes.h
 
-actions1.o:	advent.h funcs.h database.h
+actions.o:	advent.h database.h database.c sizes.h
 
-actions2.o:	advent.h funcs.h database.h
+score.o:	advent.h database.h database.c sizes.h
 
-score.o:	advent.h database.h
+misc.o:	 advent.h database.h database.c sizes.h
 
-misc.o:		advent.h database.h
+database.o:     database.c database.h sizes.h
+	$(CC) $(CCFLAGS) $(DBX) -c database.c
 
-database.o:	database.h
+database.c database.h: dungeon
+	./dungeon
 
-compile: compile.c
-	$(CC) $(CCFLAGS) -o $@ $<
+linenoise.o:	linenoise/linenoise.h
+	$(CC) $(CCFLAGS) $(DBX) -c linenoise/linenoise.c
 
-database.c database.h: compile adventure.text
-	./compile
-	$(CC) $(CCFLAGS) $(DBX) -c database.c
+dungeon: dungeon.c
+	$(CC) $(CCFLAGS) -o $@ $<
 
 clean:
-	rm -f *.o advent *.html database.[ch] compile *.gcno *.gcda
+	rm -f *.o advent *.html database.[ch] dungeon *.gcno *.gcda
 	rm -f README advent.6 MANIFEST *.tar.gz
+	rm -f *~
 	cd tests; $(MAKE) --quiet clean
 
 check: advent
@@ -62,11 +75,12 @@ html: advent.html history.html hints.html
 
 # README.adoc exists because that filename is magic on GitLab.
 DOCS=COPYING NEWS README.adoc TODO advent.adoc history.adoc hints.adoc advent.6
+TESTFILES=tests/*.log tests/*.chk tests/README tests/decheck tests/Makefile
 
 # Can't use GNU tar's --transform, needs to build under Alpine Linux.
 # This is a requirement for testing dist in GitLab's CI pipeline
 advent-$(VERS).tar.gz: $(SOURCES) $(DOCS)
-	@find $(SOURCES) $(DOCS) tests -print | sed s:^:advent-$(VERS)/: >MANIFEST
+	@find $(SOURCES) $(DOCS) $(TESTFILES) -print | sed s:^:advent-$(VERS)/: >MANIFEST
 	@(ln -s . advent-$(VERS))
 	(tar -T MANIFEST -czvf advent-$(VERS).tar.gz)
 	@(rm advent-$(VERS))