X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=Makefile;h=0f7bd783b44cc790d61630ff590cd91ed902f66c;hp=ea6f03b850495be56a1979bafa8d60e2bdf23bd0;hb=43aef9ceb16d0e2821c5ee81ea9d7c2f7ace84bb;hpb=aacd3a5f8d80c88deb0c5fe7ae79962cd5dd29e7

diff --git a/Makefile b/Makefile
index ea6f03b..0f7bd78 100644
--- a/Makefile
+++ b/Makefile
@@ -1,53 +1,62 @@
 # Makefile for the open-source release of adventure 2.5
 
-CCFLAGS=-std=c99
-LIBS=-lrt
+CC?=gcc
+CCFLAGS=-std=c99 -O0 --coverage
+LIBS=
 UNAME_S := $(shell uname -s)
-GCCVERSIONGTEQ4 := $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 4)
-ifeq ($(UNAME_S),Darwin)
-	LIBS=
-else ifeq "$(GCCVERSIONGTEQ4)" "1"
-	CC=c99
+ifeq ($(UNAME_S),Linux)
+	LIBS=-lrt
 endif
 
-OBJS=main.o init.o actions1.o actions2.o score.o misc.o
-SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO adventure.text advent.text control misc.h main.h share.h funcs.h
+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
 
 .c.o:
-	$(CC) $(CCFLAGS) -O $(DBX) -c $<
+	$(CC) $(CCFLAGS) $(DBX) -c $<
 
 advent:	$(OBJS) database.o
-	$(CC) $(CCFLAGS) -O $(DBX) -o advent $(OBJS) database.o $(LIBS)
+	$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) $(LIBS)
 
-main.o:		main.h misc.h funcs.h database.h
+main.o:		advent.h funcs.h database.h
 
-init.o:		misc.h main.h share.h funcs.h database.h
+init.o:		advent.h funcs.h database.h
 
-actions1.o:	misc.h main.h share.h funcs.h database.h
+actions1.o:	advent.h funcs.h database.h
 
-actions2.o:	misc.h main.h share.h funcs.h
+actions2.o:	advent.h funcs.h
 
-score.o:	misc.h main.h share.h database.h
+score.o:	advent.h database.h
 
-misc.o:		misc.h main.h database.h
+misc.o:		advent.h database.h
+
+database.o:	database.h
+
+funcs.h:	database.h
+
+compile: compile.c
+	$(CC) $(CCFLAGS) -o $@ $<
 
 database.c database.h: compile adventure.text
 	./compile
-	$(CC) $(CCFLAGS) -O $(DBX) -c database.c
+	$(CC) $(CCFLAGS) $(DBX) -c database.c
+
+html: index.html advent.html history.html hints.html
 
 clean:
-	rm -f *.o advent advent.html advent.6 database.[ch] compile
+	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
 	tar --transform='s:^:advent-$(VERS)/:' --show-transformed-names -cvzf advent-$(VERS).tar.gz $(SOURCES) advent.6