X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=Makefile;h=3b8844e60e95f2577700554c9ba640c75c0a0a39;hp=0f7bd783b44cc790d61630ff590cd91ed902f66c;hb=acc08b8a5cdd9a56781cfe4733f6e88c22367321;hpb=43aef9ceb16d0e2821c5ee81ea9d7c2f7ace84bb

diff --git a/Makefile b/Makefile
index 0f7bd78..3b8844e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,23 @@
 # Makefile for the open-source release of adventure 2.5
 
+VERS=1.0
+
 CC?=gcc
-CCFLAGS=-std=c99 -O0 --coverage
+CCFLAGS+=-std=c99
 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 TODO advent.adoc history.adoc index.adoc hints.adoc
-SOURCES=$(OBJS:.o=.c) advent.h funcs.h adventure.text $(DOCS) control
+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
 
 .c.o:
 	$(CC) $(CCFLAGS) $(DBX) -c $<
 
 advent:	$(OBJS) database.o
-	$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) $(LIBS)
+	$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) database.o $(LDFLAGS) $(LIBS)
 
 main.o:		advent.h funcs.h database.h
 
@@ -32,8 +33,6 @@ misc.o:		advent.h database.h
 
 database.o:	database.h
 
-funcs.h:	database.h
-
 compile: compile.c
 	$(CC) $(CCFLAGS) -o $@ $<
 
@@ -41,30 +40,44 @@ database.c database.h: compile adventure.text
 	./compile
 	$(CC) $(CCFLAGS) $(DBX) -c database.c
 
-html: index.html advent.html history.html hints.html
-
 clean:
-	rm -f *.o advent *.html advent.6 database.[ch] compile *.gcno *.gcda
+	rm -f *.o advent *.html database.[ch] compile *.gcno *.gcda
+	rm -f README advent.6 MANIFEST *.tar.gz
 	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) advent.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
 
-release: advent-$(VERS).tar.gz advent.html
+# 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)
+	@ls $(SOURCES) $(DOCS) | 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
+
+debug: CCFLAGS += -O0 --coverage
+debug: advent