Minor build tweaks.

[open-adventure.git] / Makefile

diff --git a/Makefile b/Makefile
index 362f58664d7c6750fd1166fd66383766ab3e9ad1..7fae0ef90a45e16cb886e3d29febaecfa24918be 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,18 +2,21 @@
 
 LIBS=-lrt
 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 database.o
-SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO advent.text control
+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
 
@@ -29,7 +32,7 @@ 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] compile