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

[open-adventure.git] / Makefile

diff --git a/Makefile b/Makefile
index 92a2941117908f885b4d15c2936c9a2aa6de2cf7..a0b1c70f00662e17dd08c3ecc50234274e4adf90 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ ifeq ($(UNAME_S),Linux)
        LIBS=-lrt
 endif
 
-OBJS=main.o init.o actions1.o actions2.o score.o misc.o
+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:
@@ -34,9 +34,7 @@ main.o:               advent.h database.h database.c sizes.h
 
 init.o:                advent.h database.h database.c sizes.h
 
-actions1.o:     advent.h database.h database.c sizes.h
-
-actions2.o:     advent.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