Makefile and CI recipe YML rework.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a5e791fb82367f7c20d736e02f8f0285c1efe30..34e16e889640d196c08a3efa116f9a944c5ef30a 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,7 +44,7 @@ manpage:
     - apk update
     - apk add make asciidoc
   script:
-    - make .adoc.6
+    - make advent.6
   artifacts:
     paths:
       - advent.6
@@ -108,8 +108,6 @@ pages:
 
 package:
   stage: deploy
-  script:
-    - mv README.adoc README
   artifacts:
     paths:
       - advent

diff --git a/Makefile b/Makefile
index 291efd2a6f282d32b113c05a1584cb00dce6057e..f023b0e096e72ee90576a6785a4e713ba2cd4745 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 # Makefile for the open-source release of adventure 2.5
 
+VERS=1.0
+
 CC?=gcc
 CCFLAGS+=-std=c99
 LIBS=
@@ -9,8 +11,7 @@ ifeq ($(UNAME_S),Linux)
 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
+SOURCES=$(OBJS:.o=.c) compile.c advent.h database.h funcs.h adventure.text Makefile control
 
 .c.o:
        $(CC) $(CCFLAGS) $(DBX) -c $<
@@ -44,30 +45,31 @@ database.c database.h: compile adventure.text
 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
        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
+# 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
 
-dist: advent-$(VERS).tar.gz
+advent-$(VERS).tar.gz: $(SOURCES) $(DOCS)
+       tar --transform='s:^:advent-$(VERS)/:' --show-transformed-names -cvzf advent-$(VERS).tar.gz $(SOURCES) $(DOCS)
 
-release: advent-$(VERS).tar.gz advent.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