X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=Makefile;h=c2f34d48f62db23405b85061bbe045e4a7d1c367;hb=467a25565356cffd20e233e6c05b2d21da376ddc;hp=22f1370edf6665e0db8547cdb0cf35b80751f9cf;hpb=7555c5354a0db4b0eafe5e9b742068f01985860c;p=open-adventure.git

diff --git a/Makefile b/Makefile
index 22f1370..c2f34d4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,21 @@
 # Makefile for the open-source release of adventure 2.5
 
-LIBS=-lrt
+CC?=gcc
+CCFLAGS=-std=c99
+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 --std=gnu99
+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) COPYING NEWS README TODO advent.text control
+SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO adventure.text advent.text control misc.h main.h share.h funcs.h
 
 .c.o:
-	$(CC) -O $(DBX) -c $<
+	$(CC) $(CCFLAGS) -O $(DBX) -c $<
 
-advent:	$(OBJS)
-	$(CC) -Wall -std=c99 -O $(DBX) -o advent $(OBJS) $(LIBS)
+advent:	$(OBJS) database.o
+	$(CC) $(CCFLAGS) -O $(DBX) -o advent $(OBJS) $(LIBS)
 
 main.o:		main.h misc.h funcs.h database.h
 
@@ -30,9 +29,16 @@ score.o:	misc.h main.h share.h database.h
 
 misc.o:		misc.h main.h database.h
 
-database.c database.h: compile
+database.o:	database.h
+
+funcs.h:	database.h
+
+compile: compile.c
+	$(CC) $(CCFLAGS) -o $@ $<
+
+database.c database.h: compile adventure.text
 	./compile
-	$(CC) $(OPTIONS) -O $(DBX) -c database.c
+	$(CC) $(CCFLAGS) -O $(DBX) -c database.c
 
 clean:
 	rm -f *.o advent advent.html advent.6 database.[ch] compile
@@ -42,9 +48,9 @@ check: advent
 	cd tests; $(MAKE) --quiet
 
 # Requires asciidoc and xsltproc/docbook stylesheets.
-.asc.6:
+.asc.6: advent.txt
 	a2x --doctype manpage --format manpage $<
-.asc.html:
+.asc.html: advent.txt
 	a2x --doctype manpage --format xhtml -D . $<
 	rm -f docbook-xsl.css