X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=Makefile;h=a34c7a616fdfc65e0ba668bf93ed96652b5dc2cf;hb=6b6cfa37f11ebd53c4e293aa895ebb60fbb3515e;hp=7526a71d8d0c426d570a6ddbe1eebd081cb9d90e;hpb=ae3c34084f2afe7332973ab20fcaf1a29264c078;p=open-adventure.git

diff --git a/Makefile b/Makefile
index 7526a71..a34c7a6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,23 @@
 # Makefile for the open-source release of adventure 2.5
 
+CCFLAGS=-std=c99
 LIBS=-lrt
 UNAME_S := $(shell uname -s)
+GCCVERSIONGTEQ4 := $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 4)
 ifeq ($(UNAME_S),Darwin)
 	LIBS=
-endif
-GCCVERSIONGTEQ4 := $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 4)
-ifeq "$(GCCVERSIONGTEQ4)" "1"
-	CC=c99 --std=gnu99
+else ifeq "$(GCCVERSIONGTEQ4)" "1"
+	CC=c99
 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:
-	$(CC) -O $(DBX) -c $<
+	$(CC) $(CCFLAGS) -O $(DBX) -c $<
 
-advent:	$(OBJS)
-	$(CC) -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
 
@@ -33,7 +33,7 @@ misc.o:		misc.h main.h database.h
 
 database.c database.h: compile
 	./compile
-	$(CC) $(OPTIONS) -O $(DBX) -c database.c
+	$(CC) $(CCFLAGS) -O $(DBX) -c database.c
 
 clean:
 	rm -f *.o advent advent.html advent.6 database.[ch] compile