X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=Makefile;h=7b81be6b418236e9f1b89b1b06f3c7e18ba56a01;hb=092f4787902cf26da6745bc7ef303b5fd783773c;hp=362f58664d7c6750fd1166fd66383766ab3e9ad1;hpb=6facfe15888aedc39cfa47c8c251256bcabfe771;p=open-adventure.git

diff --git a/Makefile b/Makefile
index 362f586..7b81be6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,21 @@
 # Makefile for the open-source release of adventure 2.5
 
-LIBS=-lrt
+CC=clang
+CCFLAGS=-O2 -std=c99 -Wall -Wextra -Wpedantic -fstack-protector -fstack-protector-all -pipe -mtune=native
+LIBS=
 UNAME_S := $(shell uname -s)
-ifeq ($(UNAME_S),Darwin)
-	LIBS=
+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:
-	gcc -O $(DBX) -c $<
+	$(CC) $(CCFLAGS) -O $(DBX) -c $<
 
-advent:	$(OBJS)
-	gcc -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
 
@@ -27,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
-	gcc $(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
@@ -39,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