projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix dependencies so parallel make works (issue #4).
[open-adventure.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index bd579585aba187109109487bd85c08a35ad256d0..35b097ba1cf64f46f24487ec1b652eb34da090a3 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,14
+1,23
@@
# 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
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 database.o
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
+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 -Wall -std=c99
-O $(DBX) -o advent $(OBJS) $(LIBS)
+advent: $(OBJS)
database.o
+
$(CC) $(CCFLAGS)
-O $(DBX) -o advent $(OBJS) $(LIBS)
main.o: main.h misc.h funcs.h database.h
main.o: main.h misc.h funcs.h database.h
@@
-24,8
+33,14
@@
misc.o: misc.h main.h database.h
database.o: database.h
database.o: database.h
+funcs.h: database.h
+
+database.c database.h: compile adventure.text
+ ./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 clean
check: advent