X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=Makefile;h=7fae0ef90a45e16cb886e3d29febaecfa24918be;hb=4beb21e08fbffbca3b2745056b4fb55e626851db;hp=5eab9d5288aa42ba0442dd19df776aa592b6f3b6;hpb=5ae76995d2e8d412f565481505e4c7bc37260bb1;p=open-adventure.git

diff --git a/Makefile b/Makefile
index 5eab9d5..7fae0ef 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,22 @@
 # 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.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 --std=gnu99
+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) -O $(DBX) -c $<
 
-advent:	$(OBJS)
-	gcc -Wall -std=c99 -O $(DBX) -o advent $(OBJS) $(LIBS)
+advent:	$(OBJS) database.o
+	$(CC) -Wall -std=c99 -O $(DBX) -o advent $(OBJS) database.o $(LIBS)
 
 main.o:		main.h misc.h funcs.h database.h
 
@@ -24,10 +32,10 @@ misc.o:		misc.h main.h database.h
 
 database.c database.h: compile
 	./compile
-	gcc $(OPTIONS) -O $(DBX) -c database.c
+	$(CC) $(OPTIONS) -O $(DBX) -c database.c
 
 clean:
-	rm -f *.o advent advent.html advent.6 database.[ch]
+	rm -f *.o advent advent.html advent.6 database.[ch] compile
 	cd tests; $(MAKE) --quiet clean
 
 check: advent
@@ -50,6 +58,3 @@ release: advent-$(VERS).tar.gz advent.html
 
 refresh: advent.html
 	shipper -N -w version=$(VERS) | sh -e -x
-
-database:
-	cd database; $(MAKE)