X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=Makefile;h=3b9509dfd7065ab44a21261770272f9909bbd412;hb=fadb722c5911e49b33d5775efd393b6d48633582;hp=ba2c9ef318469c61fd5af169e75ce46c0443dfc3;hpb=beb80ff521fd0c5219bbe761c901ce486bca1913;p=open-adventure.git

diff --git a/Makefile b/Makefile
index ba2c9ef..3b9509d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +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
-DOCS=COPYING NEWS README TODO advent.adoc history.adoc index.adoc hints.adoc
-SOURCES=$(OBJS:.o=.c) advent.h funcs.h adventure.text $(DOCS) 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) $(LIBS)
+	$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) database.o $(LDFLAGS) $(LIBS)
 
 main.o:		advent.h funcs.h database.h
 
@@ -32,8 +33,6 @@ misc.o:		advent.h database.h
 
 database.o:	database.h
 
-funcs.h:	database.h
-
 compile: compile.c
 	$(CC) $(CCFLAGS) -o $@ $<
 
@@ -44,30 +43,35 @@ 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 MANIFEST
 	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
-
-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 index.adoc hints.adoc advent.6
 
-release: advent-$(VERS).tar.gz advent.html
-	shipper version=$(VERS) | sh -e -x
+# Can't use GNU tar's --transform, needs to build under Alpine Linux
+advent-$(VERS).tar.gz: $(SOURCES) $(DOCS) advent.6
+	@ls $(SOURCES) $(DOCS) advent.6 | 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))
 
-refresh: advent.html
-	shipper -N -w version=$(VERS) | sh -e -x
+dist: advent-$(VERS).tar.gz
 
 debug: CCFLAGS += -O0 --coverage
 debug: advent