X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=Makefile;h=39714a0102206e72d0acb1a53d8022eaab4981dc;hb=beb762735dec5e078b9015d81c7833e8db4b9daa;hp=856575580fcd0898df9d09706bb90800047f62dc;hpb=23f2dbe81467d28e2f45d14bd5c4ce19229f69e3;p=open-adventure.git

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