Get rid of tarballs with 'make clean'.

[open-adventure.git] / Makefile

diff --git a/Makefile b/Makefile
index bdd19debe3088f556a37f46fb58b1ab6f62ebb3c..3b8844e60e95f2577700554c9ba640c75c0a0a39 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,23 @@
 # Makefile for the open-source release of adventure 2.5
 
+VERS=1.0
+
 CC?=gcc
-CCFLAGS=-std=c99
+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
-SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO adventure.text advent.text control advent.h funcs.h
+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) -O $(DBX) -c $<
+       $(CC) $(CCFLAGS) $(DBX) -c $<
 
 advent:        $(OBJS) database.o
-       $(CC) $(CCFLAGS) -O $(DBX) -o advent $(OBJS) $(LIBS)
+       $(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) database.o $(LDFLAGS) $(LIBS)
 
 main.o:                advent.h funcs.h database.h
 
@@ -31,36 +33,51 @@ misc.o:             advent.h database.h
 
 database.o:    database.h
 
-funcs.h:       database.h
-
 compile: compile.c
        $(CC) $(CCFLAGS) -o $@ $<
 
 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: advent.txt
+.adoc.6:
        a2x --doctype manpage --format manpage $<
-.asc.html: advent.txt
-       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