Fix dependencies so parallel make works (issue #4).

[open-adventure.git] / Makefile

diff --git a/Makefile b/Makefile
index 4faf82ea40f51f9b0b092485107c304820b9d2f6..35b097ba1cf64f46f24487ec1b652eb34da090a3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,17 +7,17 @@ GCCVERSIONGTEQ4 := $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 4)
 ifeq ($(UNAME_S),Darwin)
        LIBS=
 else ifeq "$(GCCVERSIONGTEQ4)" "1"
-       CC=c99 --std=gnu99
+       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 database.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) $(CCFLAGS) -O $(DBX) -c $<
 
 advent:        $(OBJS) database.o
-       $(CC) $(CCFLAGS) -O $(DBX) -o advent $(OBJS) database.o $(LIBS)
+       $(CC) $(CCFLAGS) -O $(DBX) -o advent $(OBJS) $(LIBS)
 
 main.o:                main.h misc.h funcs.h database.h
 
@@ -31,7 +31,11 @@ score.o:     misc.h main.h share.h database.h
 
 misc.o:                misc.h main.h database.h
 
-database.c database.h: compile
+database.o:    database.h
+
+funcs.h:       database.h
+
+database.c database.h: compile adventure.text
        ./compile
        $(CC) $(CCFLAGS) -O $(DBX) -c database.c