projects
/
open-adventure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
aacd3a5
)
Fix dependencies so parallel make works (issue #4).
28/head
author
Jason S. Ninneman
<jsn@mbar.us>
Wed, 31 May 2017 17:52:46 +0000
(10:52 -0700)
committer
Jason S. Ninneman
<jsn@mbar.us>
Wed, 31 May 2017 17:52:46 +0000
(10:52 -0700)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index ea6f03b850495be56a1979bafa8d60e2bdf23bd0..35b097ba1cf64f46f24487ec1b652eb34da090a3 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-10,14
+10,14
@@
else ifeq "$(GCCVERSIONGTEQ4)" "1"
CC=c99
endif
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
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
main.o: main.h misc.h funcs.h database.h
@@
-31,6
+31,10
@@
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.h
+database.o: database.h
+
+funcs.h: database.h
+
database.c database.h: compile adventure.text
./compile
$(CC) $(CCFLAGS) -O $(DBX) -c database.c
database.c database.h: compile adventure.text
./compile
$(CC) $(CCFLAGS) -O $(DBX) -c database.c