Fix for parallel make.

[open-adventure.git] / Makefile

diff --git a/Makefile b/Makefile
index 2cc167f1709af788c790108038a950a802961eb5..dce6fc066ba6e5e8127c02cd08359d6f59334228 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ init.o:               advent.h funcs.h database.h
 
 actions1.o:    advent.h funcs.h database.h
 
-actions2.o:    advent.h funcs.h
+actions2.o:    advent.h funcs.h database.h
 
 score.o:       advent.h database.h
 
@@ -40,11 +40,9 @@ 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 database.[ch] compile *.gcno *.gcda
-       rm -f README advent.6 MANIFEST
+       rm -f README advent.6 MANIFEST *.tar.gz
        cd tests; $(MAKE) --quiet clean
 
 check: advent
@@ -60,16 +58,24 @@ check: advent
 .adoc:
        asciidoc $<
 
+html: advent.html history.html hints.html
+
 # 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
+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
+# 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
-       @(cd ..; ln -s advent advent-$(VERS))
-       (cd ..; tar -czvf advent/advent-$(VERS).tar.gz `cat advent/MANIFEST`)
-       @(cd ..; rm advent-$(VERS))
+       @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 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