Because (almost) everything is done in handlers now, merge the action files.

[open-adventure.git] / Makefile

diff --git a/Makefile b/Makefile
index c78e4cdf2b19b480c6fa9b24f6a864a2aae5276e..a0b1c70f00662e17dd08c3ecc50234274e4adf90 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,16 @@
 # 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
@@ -10,8 +21,8 @@ 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
+SOURCES=$(OBJS:.o=.c) dungeon.c advent.h sizes.h adventure.text Makefile control linenoise/linenoise.[ch]
 
 .c.o:
        $(CC) $(CCFLAGS) $(DBX) -c $<
@@ -19,13 +30,11 @@ SOURCES=$(OBJS:.o=.c) dungeon.c advent.h funcs.h sizes.h adventure.text Makefile
 advent:        $(OBJS) database.o linenoise.o
        $(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) database.o linenoise.o $(LDFLAGS) $(LIBS)
 
-main.o:                advent.h funcs.h database.h database.c sizes.h
-
-init.o:                advent.h funcs.h database.h database.c sizes.h
+main.o:                advent.h database.h database.c sizes.h
 
-actions1.o:     advent.h funcs.h database.h database.c sizes.h
+init.o:                advent.h database.h database.c sizes.h
 
-actions2.o:     advent.h funcs.h database.h database.c sizes.h
+actions.o:     advent.h database.h database.c sizes.h
 
 score.o:       advent.h database.h database.c sizes.h