Get rid of tarballs with 'make clean'.

[open-adventure.git] / Makefile

diff --git a/Makefile b/Makefile
index f023b0e096e72ee90576a6785a4e713ba2cd4745..3b8844e60e95f2577700554c9ba640c75c0a0a39 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,14 +10,14 @@ 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) compile.c advent.h database.h funcs.h adventure.text Makefile 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) $(LDFLAGS) $(LIBS)
+       $(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) database.o $(LDFLAGS) $(LIBS)
 
 main.o:                advent.h funcs.h database.h
 
@@ -33,8 +33,6 @@ misc.o:               advent.h database.h
 
 database.o:    database.h
 
-funcs.h:       database.h
-
 compile: compile.c
        $(CC) $(CCFLAGS) -o $@ $<
 
@@ -42,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
+       rm -f README advent.6 MANIFEST *.tar.gz
        cd tests; $(MAKE) --quiet clean
 
 check: advent
@@ -62,12 +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.
+# This is a requirement for testing dist in GitLab's CI pipeline
 advent-$(VERS).tar.gz: $(SOURCES) $(DOCS)
-       tar --transform='s:^:advent-$(VERS)/:' --show-transformed-names -cvzf 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