X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=Makefile;h=ab304b8113f90adfb86fbb460af11966bd07bc30;hb=3674588968dbfb1c1c0590890beba19a3e06412e;hp=9fa7c861f3e384a717382c286bab0ea22a09bbcc;hpb=a6b2602b83cfaae063b802bd8329602040a642de;p=open-adventure.git

diff --git a/Makefile b/Makefile
index 9fa7c86..ab304b8 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 VERS=1.0
 
 CC?=gcc
-CCFLAGS+=-std=c99
+CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE
 LIBS=
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Linux)
@@ -11,40 +11,42 @@ ifeq ($(UNAME_S),Linux)
 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
+SOURCES=$(OBJS:.o=.c) dungeon.c advent.h funcs.h sizes.h adventure.text Makefile control linenoise/linenoise.h
 
 .c.o:
 	$(CC) $(CCFLAGS) $(DBX) -c $<
 
-advent:	$(OBJS) database.o
+advent:	$(OBJS) database.o linenoise.o
 	$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) database.o $(LDFLAGS) $(LIBS)
 
-main.o:		advent.h funcs.h database.h
+main.o:	 	advent.h funcs.h database.h database.c sizes.h
 
-init.o:		advent.h funcs.h database.h
+init.o:	 	advent.h funcs.h database.h database.c sizes.h
 
-actions1.o:	advent.h funcs.h database.h
+actions1.o:     advent.h funcs.h database.h database.c sizes.h
 
-actions2.o:	advent.h funcs.h
+actions2.o:     advent.h funcs.h database.h database.c sizes.h
 
-score.o:	advent.h database.h
+score.o:	advent.h database.h database.c sizes.h
 
-misc.o:		advent.h database.h
+misc.o:	 advent.h database.h database.c sizes.h
 
-database.o:	database.h
+database.o:     database.c database.h sizes.h
+	$(CC) $(CCFLAGS) $(DBX) -c database.c
 
-compile: compile.c
-	$(CC) $(CCFLAGS) -o $@ $<
+database.c database.h: dungeon
+	./dungeon
 
-database.c database.h: compile adventure.text
-	./compile
-	$(CC) $(CCFLAGS) $(DBX) -c database.c
+linenoise.o:	linenoise/linenoise.h
+	$(CC) $(CCFLAGS) $(DBX) -c linenoise/linenoise.c
 
-html: index.html advent.html history.html hints.html
+dungeon: dungeon.c
+	$(CC) $(CCFLAGS) -o $@ $<
 
 clean:
-	rm -f *.o advent *.html database.[ch] compile *.gcno *.gcda
-	rm -f README advent.6 MANIFEST
+	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
@@ -60,16 +62,25 @@ check: advent
 .adoc:
 	asciidoc $<
 
+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 index.adoc hints.adoc advent.6
-
-# Can't use GNU tar's --transform, needs to build under Alpine Linux
-advent-$(VERS).tar.gz: $(SOURCES) $(DOCS) advent.6
-	@ls $(SOURCES) $(DOCS) advent.1 | sed s:^:advent-$(VERS)/: >MANIFEST
-	@(cd ..; ln -s advent advent-$(VERS))
-	(cd ..; tar -czvf advent/advent-$(VERS).tar.gz `cat advent/MANIFEST`)
-	@(cd ..; rm advent-$(VERS))
+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) $(TESTFILES) -print | sed s:^:advent-$(VERS)/: >MANIFEST
+	@(ln -s . advent-$(VERS))
+	(tar -T MANIFEST -czvf advent-$(VERS).tar.gz)
+	@(rm advent-$(VERS))
+
+release: advent-$(VERS).tar.gz advent.html history.html hints.html
+	shipper version=$(VERS) | sh -e -x
+
+refresh: advent.html
+	shipper -N -w version=$(VERS) | sh -e -x
 
 dist: advent-$(VERS).tar.gz