Compile in the new (partial) database.

[open-adventure.git] / Makefile

diff --git a/Makefile b/Makefile
index ab304b8113f90adfb86fbb460af11966bd07bc30..b0e1adf74093f9fa339c7ca59798863cc3db3d78 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,47 +1,62 @@
 # Makefile for the open-source release of adventure 2.5
 
+# Note: If you're building from the repository rather than the source tarball,
+# do this to get the linenoise library where you can use it:
+#
+# git submodule update --recursive --remote --init
+#
+# Therafter, you can update it like this:
+#
+# git submodule update --recursive --remote
+#
+# but this should seldom be necessary as that library is pretty stable.
+
 VERS=1.0
 
 CC?=gcc
-CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE
+CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -g
 LIBS=
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Linux)
        LIBS=-lrt
 endif
 
-OBJS=main.o init.o actions1.o actions2.o score.o misc.o
-SOURCES=$(OBJS:.o=.c) dungeon.c advent.h funcs.h sizes.h adventure.text Makefile control linenoise/linenoise.h
+OBJS=main.o init.o actions.o score.o misc.o saveresume.o common.o newdb.o
+SOURCES=$(OBJS:.o=.c) dungeon.c advent.h common.h adventure.text Makefile control linenoise/linenoise.[ch]
 
 .c.o:
        $(CC) $(CCFLAGS) $(DBX) -c $<
 
 advent:        $(OBJS) database.o linenoise.o
-       $(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) database.o $(LDFLAGS) $(LIBS)
+       $(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) database.o linenoise.o $(LDFLAGS) $(LIBS)
+
+main.o:                advent.h database.h database.c common.h
 
-main.o:                advent.h funcs.h database.h database.c sizes.h
+init.o:                advent.h database.h database.c common.h
 
-init.o:                advent.h funcs.h database.h database.c sizes.h
+actions.o:     advent.h database.h database.c common.h
 
-actions1.o:     advent.h funcs.h database.h database.c sizes.h
+score.o:       advent.h database.h database.c common.h
 
-actions2.o:     advent.h funcs.h database.h database.c sizes.h
+misc.o:                advent.h database.h database.c common.h newdb.h
 
-score.o:       advent.h database.h database.c sizes.h
+saveresume.o:  advent.h database.h database.c common.h
 
-misc.o:         advent.h database.h database.c sizes.h
+common.o:      common.h
 
-database.o:     database.c database.h sizes.h
+database.o:     database.c database.h common.h
        $(CC) $(CCFLAGS) $(DBX) -c database.c
 
+newdb.o:       newdb.h
+
 database.c database.h: dungeon
        ./dungeon
 
 linenoise.o:   linenoise/linenoise.h
        $(CC) $(CCFLAGS) $(DBX) -c linenoise/linenoise.c
 
-dungeon: dungeon.c
-       $(CC) $(CCFLAGS) -o $@ $<
+dungeon: dungeon.o common.o
+       $(CC) $(CCFLAGS) -o $@ dungeon.o common.o
 
 clean:
        rm -f *.o advent *.html database.[ch] dungeon *.gcno *.gcda