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

diff --git a/Makefile b/Makefile
index a34c7a6..3b8844e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,61 +1,83 @@
 # Makefile for the open-source release of adventure 2.5
 
-CCFLAGS=-std=c99
-LIBS=-lrt
+VERS=1.0
+
+CC?=gcc
+CCFLAGS+=-std=c99
+LIBS=
 UNAME_S := $(shell uname -s)
-GCCVERSIONGTEQ4 := $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 4)
-ifeq ($(UNAME_S),Darwin)
-	LIBS=
-else ifeq "$(GCCVERSIONGTEQ4)" "1"
-	CC=c99
+ifeq ($(UNAME_S),Linux)
+	LIBS=-lrt
 endif
 
 OBJS=main.o init.o actions1.o actions2.o score.o misc.o
-SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO adventure.text advent.text control misc.h main.h share.h funcs.h
+SOURCES=$(OBJS:.o=.c) compile.c advent.h funcs.h adventure.text Makefile control
 
 .c.o:
-	$(CC) $(CCFLAGS) -O $(DBX) -c $<
+	$(CC) $(CCFLAGS) $(DBX) -c $<
 
 advent:	$(OBJS) database.o
-	$(CC) $(CCFLAGS) -O $(DBX) -o advent $(OBJS) database.o $(LIBS)
+	$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) database.o $(LDFLAGS) $(LIBS)
+
+main.o:		advent.h funcs.h database.h
+
+init.o:		advent.h funcs.h database.h
 
-main.o:		main.h misc.h funcs.h database.h
+actions1.o:	advent.h funcs.h database.h
 
-init.o:		misc.h main.h share.h funcs.h database.h
+actions2.o:	advent.h funcs.h
 
-actions1.o:	misc.h main.h share.h funcs.h database.h
+score.o:	advent.h database.h
 
-actions2.o:	misc.h main.h share.h funcs.h
+misc.o:		advent.h database.h
 
-score.o:	misc.h main.h share.h database.h
+database.o:	database.h
 
-misc.o:		misc.h main.h database.h
+compile: compile.c
+	$(CC) $(CCFLAGS) -o $@ $<
 
-database.c database.h: compile
+database.c database.h: compile adventure.text
 	./compile
-	$(CC) $(CCFLAGS) -O $(DBX) -c database.c
+	$(CC) $(CCFLAGS) $(DBX) -c database.c
 
 clean:
-	rm -f *.o advent advent.html advent.6 database.[ch] compile
+	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 .6
+
 # Requires asciidoc and xsltproc/docbook stylesheets.
-.asc.6:
+.adoc.6:
 	a2x --doctype manpage --format manpage $<
-.asc.html:
-	a2x --doctype manpage --format xhtml -D . $<
-	rm -f docbook-xsl.css
+.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