X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=Makefile;h=9fa7c861f3e384a717382c286bab0ea22a09bbcc;hp=435adc4622adb602af320034fd342a494a97f263;hb=a6b2602b83cfaae063b802bd8329602040a642de;hpb=f0528b0ded7e921510ecdece2a36ce94c6414044

diff --git a/Makefile b/Makefile
index 435adc4..9fa7c86 100644
--- a/Makefile
+++ b/Makefile
@@ -1,52 +1,77 @@
 # Makefile for the open-source release of adventure 2.5
 
-LIBS=-lrt
-OBJS=main.o init.o actions1.o actions2.o score.o misc.o database/database.o
-SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO advent.text control
+VERS=1.0
+
+CC?=gcc
+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
+SOURCES=$(OBJS:.o=.c) compile.c advent.h funcs.h adventure.text Makefile control
 
 .c.o:
-	gcc -O $(DBX) -c $<
+	$(CC) $(CCFLAGS) $(DBX) -c $<
+
+advent:	$(OBJS) database.o
+	$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) database.o $(LDFLAGS) $(LIBS)
+
+main.o:		advent.h funcs.h database.h
+
+init.o:		advent.h funcs.h database.h
 
-advent:	$(OBJS) database
-	gcc -Wall -std=c99 -O $(DBX) -o advent $(OBJS) $(LIBS)
+actions1.o:	advent.h funcs.h database.h
 
-main.o:		main.h misc.h funcs.h database/database.h
+actions2.o:	advent.h funcs.h
 
-init.o:		misc.h main.h share.h funcs.h database/database.h
+score.o:	advent.h database.h
 
-actions1.o:	misc.h main.h share.h funcs.h database/database.h
+misc.o:		advent.h database.h
 
-actions2.o:	misc.h main.h share.h funcs.h
+database.o:	database.h
 
-score.o:	misc.h main.h share.h database/database.h
+compile: compile.c
+	$(CC) $(CCFLAGS) -o $@ $<
 
-misc.o:		misc.h main.h database/database.h
+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 advent.html advent.6 adventure.data
+	rm -f *.o advent *.html database.[ch] compile *.gcno *.gcda
+	rm -f README advent.6 MANIFEST
 	cd tests; $(MAKE) --quiet clean
-	cd database; $(MAKE) clean
 
 check: advent
 	cd tests; $(MAKE) --quiet
 
+.SUFFIXES: .adoc .html .6
+
 # Requires asciidoc and xsltproc/docbook stylesheets.
-.asc.6:
+.adoc.6:
 	a2x --doctype manpage --format manpage $<
-.asc.html:
-	a2x --doctype manpage --format xhtml -D . $<
-	rm -f docbook-xsl.css
-
-advent-$(VERS).tar.gz: $(SOURCES) advent.6
-	tar --transform='s:^:advent-$(VERS)/:' --show-transformed-names -cvzf advent-$(VERS).tar.gz $(SOURCES) advent.6
+.adoc.html:
+	asciidoc $<
+.adoc:
+	asciidoc $<
+
+# 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
+
+# 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.1 | 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))
 
 dist: advent-$(VERS).tar.gz
 
-release: advent-$(VERS).tar.gz advent.html
-	shipper version=$(VERS) | sh -e -x
-
-refresh: advent.html
-	shipper -N -w version=$(VERS) | sh -e -x
-
-database:
-	cd database; $(MAKE)
+debug: CCFLAGS += -O0 --coverage
+debug: advent