X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=Makefile;h=ee8c567ccf1f17c18e04d75e277fb4d9783c5393;hb=41265e020c857fc87e6848941115210f3ea9b98d;hp=39714a0102206e72d0acb1a53d8022eaab4981dc;hpb=beb762735dec5e078b9015d81c7833e8db4b9daa;p=open-adventure.git

diff --git a/Makefile b/Makefile
index 39714a0..ee8c567 100644
--- a/Makefile
+++ b/Makefile
@@ -1,73 +1,87 @@
 # Makefile for the open-source release of adventure 2.5
 
+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 database.o
-DOCS=COPYING NEWS README.adoc TODO advent.adoc history.adoc index.adoc hints.adoc
-SOURCES=$(OBJS:.o=.c) compile.c advent.h database.h funcs.h adventure.text $(DOCS) Makefile control
+OBJS=main.o init.o actions1.o actions2.o score.o misc.o linenoise.o
+SOURCES=$(OBJS:.o=.c) dungeon.c advent.h funcs.h sizes.h adventure.text Makefile control
 
 .c.o:
 	$(CC) $(CCFLAGS) $(DBX) -c $<
 
-advent:	$(OBJS) database.o
-	$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) $(LIBS)
-
-main.o:		advent.h funcs.h database.h
+advent: $(OBJS) database.o
+	$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) database.o $(LDFLAGS) $(LIBS)
 
-init.o:		advent.h funcs.h database.h
+main.o:	 	advent.h funcs.h database.h database.c sizes.h
 
-actions1.o:	advent.h funcs.h database.h
+init.o:	 	advent.h funcs.h database.h database.c sizes.h
 
-actions2.o:	advent.h funcs.h
+actions1.o:     advent.h funcs.h database.h database.c sizes.h
 
-score.o:	advent.h database.h
+actions2.o:     advent.h funcs.h database.h database.c sizes.h
 
-misc.o:		advent.h database.h
+score.o:	advent.h database.h database.c sizes.h
 
-database.o:	database.h
+misc.o:	 advent.h database.h database.c sizes.h
 
-funcs.h:	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 advent.6 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
 	cd tests; $(MAKE) --quiet
 
-.SUFFIXES: .adoc .html
+.SUFFIXES: .adoc .html .6
 
 # Requires asciidoc and xsltproc/docbook stylesheets.
-.adoc.6: advent.adoc
+.adoc.6:
 	a2x --doctype manpage --format manpage $<
-.adoc.html: advent.adoc
+.adoc.html:
+	asciidoc $<
+.adoc:
 	asciidoc $<
 
-advent-$(VERS).tar.gz: $(SOURCES) .adoc.6
-	tar --transform='s:^:advent-$(VERS)/:' --show-transformed-names -cvzf advent-$(VERS).tar.gz $(SOURCES) advent.6
+html: advent.html history.html hints.html
 
-dist: advent-$(VERS).tar.gz
+# README.adoc exists because that filename is magic on GitLab.
+DOCS=COPYING NEWS README.adoc TODO advent.adoc history.adoc hints.adoc advent.6
+
+# 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
+	@(ln -s . advent-$(VERS))
+	(tar -T MANIFEST -czvf advent-$(VERS).tar.gz)
+	@(rm advent-$(VERS))
 
-release: advent-$(VERS).tar.gz advent.html
+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
+
 debug: CCFLAGS += -O0 --coverage
 debug: advent