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

diff --git a/Makefile b/Makefile
index 435adc4..a34c7a6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,43 @@
 # Makefile for the open-source release of adventure 2.5
 
+CCFLAGS=-std=c99
 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
+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
+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
 
 .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) database.o $(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
 
-misc.o:		misc.h main.h database/database.h
+database.c database.h: compile
+	./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 +59,3 @@ release: advent-$(VERS).tar.gz advent.html
 
 refresh: advent.html
 	shipper -N -w version=$(VERS) | sh -e -x
-
-database:
-	cd database; $(MAKE)