projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix things so seed doesn't cost clock time.
[open-adventure.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 95b561e59744192e8a9c31642cc1523a42ad9c79..a34c7a616fdfc65e0ba668bf93ed96652b5dc2cf 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,28
+1,46
@@
# Makefile for the open-source release of adventure 2.5
# 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=
+else ifeq "$(GCCVERSIONGTEQ4)" "1"
+ CC=c99
+endif
+
OBJS=main.o init.o actions1.o actions2.o score.o misc.o
OBJS=main.o init.o actions1.o actions2.o score.o misc.o
-SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO advent
.text control
+SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO advent
ure.text advent.text control misc.h main.h share.h funcs.h
.c.o:
.c.o:
-
gcc
-O $(DBX) -c $<
+
$(CC) $(CCFLAGS)
-O $(DBX) -c $<
-advent: $(OBJS)
-
gcc -O $(DBX) -o advent $(OBJ
S)
+advent: $(OBJS)
database.o
+
$(CC) $(CCFLAGS) -O $(DBX) -o advent $(OBJS) database.o $(LIB
S)
-main.o: m
isc.h funcs
.h
+main.o: m
ain.h misc.h funcs.h database
.h
-init.o: misc.h main.h share.h funcs.h
+init.o: misc.h main.h share.h funcs.h
database.h
-actions1.o: misc.h main.h share.h funcs.h
+actions1.o: misc.h main.h share.h funcs.h
database.h
actions2.o: misc.h main.h share.h funcs.h
actions2.o: misc.h main.h share.h funcs.h
-score.o: misc.h main.h share.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.c database.h: compile
+ ./compile
+ $(CC) $(CCFLAGS) -O $(DBX) -c database.c
clean:
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
+
+check: advent
+ cd tests; $(MAKE) --quiet
# Requires asciidoc and xsltproc/docbook stylesheets.
.asc.6:
# Requires asciidoc and xsltproc/docbook stylesheets.
.asc.6: