X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=Makefile;h=ad1d95e8ef220a9f120863587d063eb70cea6a13;hb=c29e30d25cce4a92d617d79a49d97643fb9261a7;hp=435adc4622adb602af320034fd342a494a97f263;hpb=f0528b0ded7e921510ecdece2a36ce94c6414044;p=open-adventure.git

diff --git a/Makefile b/Makefile
index 435adc4..ad1d95e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,48 @@
 # Makefile for the open-source release of adventure 2.5
 
-LIBS=-lrt
-OBJS=main.o init.o actions1.o actions2.o score.o misc.o database/database.o
-SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO advent.text control
+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),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 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) database
-	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/database.h
+main.o:		main.h misc.h funcs.h database.h
 
-init.o:		misc.h main.h share.h funcs.h database/database.h
+init.o:		misc.h main.h share.h funcs.h database.h
 
-actions1.o:	misc.h main.h share.h funcs.h database/database.h
+actions1.o:	misc.h main.h share.h funcs.h database.h
 
 actions2.o:	misc.h main.h share.h funcs.h
 
-score.o:	misc.h main.h share.h database/database.h
+score.o:	misc.h main.h share.h database.h
+
+misc.o:		misc.h main.h database.h
+
+database.o:	database.h
 
-misc.o:		misc.h main.h database/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
 
 clean:
-	rm -f *.o advent advent.html advent.6 adventure.data
+	rm -f *.o advent advent.html advent.6 database.[ch] compile
 	cd tests; $(MAKE) --quiet clean
-	cd database; $(MAKE) clean
 
 check: advent
 	cd tests; $(MAKE) --quiet
@@ -47,6 +64,3 @@ release: advent-$(VERS).tar.gz advent.html
 
 refresh: advent.html
 	shipper -N -w version=$(VERS) | sh -e -x
-
-database:
-	cd database; $(MAKE)