Remove inventory commands from the pirare log - more hope of completing it.

[open-adventure.git] / Makefile

diff --git a/Makefile b/Makefile
index 5eab9d5288aa42ba0442dd19df776aa592b6f3b6..a34c7a616fdfc65e0ba668bf93ed96652b5dc2cf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,23 @@
 # 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.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)
-       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.h
 
@@ -24,10 +33,10 @@ misc.o:             misc.h main.h database.h
 
 database.c database.h: compile
        ./compile
-       gcc $(OPTIONS) -O $(DBX) -c database.c
+       $(CC) $(CCFLAGS) -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 +59,3 @@ release: advent-$(VERS).tar.gz advent.html
 
 refresh: advent.html
        shipper -N -w version=$(VERS) | sh -e -x
-
-database:
-       cd database; $(MAKE)