X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=Makefile;h=ad1d95e8ef220a9f120863587d063eb70cea6a13;hb=c29e30d25cce4a92d617d79a49d97643fb9261a7;hp=4faf82ea40f51f9b0b092485107c304820b9d2f6;hpb=519d8f07e636c3171ad8ce05e729abb0d5b3c4e1;p=open-adventure.git

diff --git a/Makefile b/Makefile
index 4faf82e..ad1d95e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,21 @@
 # Makefile for the open-source release of adventure 2.5
 
-CCFLAGS=-std=c99
-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)
-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
+OBJS=main.o init.o actions1.o actions2.o score.o misc.o database.o
 SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO adventure.text advent.text control misc.h main.h share.h funcs.h
 
 .c.o:
 	$(CC) $(CCFLAGS) -O $(DBX) -c $<
 
 advent:	$(OBJS) database.o
-	$(CC) $(CCFLAGS) -O $(DBX) -o advent $(OBJS) database.o $(LIBS)
+	$(CC) $(CCFLAGS) -O $(DBX) -o advent $(OBJS) $(LIBS)
 
 main.o:		main.h misc.h funcs.h database.h
 
@@ -31,7 +29,14 @@ 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) $(CCFLAGS) -O $(DBX) -c database.c