Merge remote-tracking branch 'upstream/master' into freebsd
This commit is contained in:
commit
9f0c1ad28f
1 changed files with 7 additions and 3 deletions
10
Makefile
10
Makefile
|
@ -8,14 +8,14 @@ ifeq ($(UNAME_S),Linux)
|
||||||
LIBS=-lrt
|
LIBS=-lrt
|
||||||
endif
|
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
|
SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO adventure.text advent.text control misc.h main.h share.h funcs.h
|
||||||
|
|
||||||
.c.o:
|
.c.o:
|
||||||
$(CC) $(CCFLAGS) -O $(DBX) -c $<
|
$(CC) $(CCFLAGS) -O $(DBX) -c $<
|
||||||
|
|
||||||
advent: $(OBJS) database.o
|
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
|
||||||
|
|
||||||
|
@ -29,7 +29,11 @@ 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.c database.h: compile
|
database.o: database.h
|
||||||
|
|
||||||
|
funcs.h: database.h
|
||||||
|
|
||||||
|
database.c database.h: compile adventure.text
|
||||||
./compile
|
./compile
|
||||||
$(CC) $(CCFLAGS) -O $(DBX) -c database.c
|
$(CC) $(CCFLAGS) -O $(DBX) -c database.c
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue