converted tilemap scripts to lua

[chaz/yoink] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index aeab798dfe4ce2260a775e77037d67749e2378bd..a7598d40e740b65482534a8c936e59edd1cfd2e3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,15 +14,11 @@ noinst_LIBRARIES = libmoof.a
 libmoof_a_SOURCES = \
                                        Moof/Aabb.cc \
                                        Moof/Aabb.hh \
-                                       Moof/Animation.cc \
-                                       Moof/Animation.hh \
                                        Moof/Camera.cc \
                                        Moof/Camera.hh \
                                        Moof/ConvertUTF.c \
                                        Moof/ConvertUTF.h \
                                        Moof/Cullable.hh \
-                                       Moof/Deserializer.cc \
-                                       Moof/Deserializer.hh \
                                        Moof/Dispatcher.cc \
                                        Moof/Dispatcher.hh \
                                        Moof/Drawable.hh \
@@ -53,10 +49,6 @@ libmoof_a_SOURCES = \
                                        Moof/Resource.hh \
                                        Moof/RK4.hh \
                                        Moof/Script.hh \
-                                       Moof/Serializable.cc \
-                                       Moof/Serializable.hh \
-                                       Moof/Serializer.cc \
-                                       Moof/Serializer.hh \
                                        Moof/Settings.cc \
                                        Moof/Settings.hh \
                                        Moof/Sound.cc \
@@ -68,8 +60,6 @@ libmoof_a_SOURCES = \
                                        Moof/Texture.cc \
                                        Moof/Texture.hh \
                                        Moof/Thread.hh \
-                                       Moof/Tilemap.cc \
-                                       Moof/Tilemap.hh \
                                        Moof/Timer.cc \
                                        Moof/Timer.hh \
                                        Moof/Transition.hh \
@@ -79,25 +69,9 @@ libmoof_a_SOURCES = \
                                        Moof/fastevents.h \
                                        $(ENDLIST)
 
-libmoof_a_SOURCES += \
-                                        Moof/yajl/src/yajl.c \
-                                        Moof/yajl/src/yajl_alloc.c \
-                                        Moof/yajl/src/yajl_alloc.h \
-                                        Moof/yajl/src/yajl_buf.c \
-                                        Moof/yajl/src/yajl_buf.h \
-                                        Moof/yajl/src/yajl_bytestack.h \
-                                        Moof/yajl/src/yajl_encode.c \
-                                        Moof/yajl/src/yajl_encode.h \
-                                        Moof/yajl/src/yajl_gen.c \
-                                        Moof/yajl/src/yajl_lex.c \
-                                        Moof/yajl/src/yajl_lex.h \
-                                        Moof/yajl/src/yajl_parser.c \
-                                        Moof/yajl/src/yajl_parser.h \
-                                        $(ENDLIST)
+libmoof_a_CPPFLAGS = -I$(top_srcdir)/src/Moof
 
-libmoof_a_CPPFLAGS = -I$(top_srcdir)/src/Moof -I$(top_srcdir)/src/Moof/yajl/src
-
-EXTRA_DIST = Moof/cml Moof/stlplus Moof/yajl
+EXTRA_DIST = Moof/cml Moof/stlplus
 
 
 #
@@ -107,6 +81,8 @@ EXTRA_DIST = Moof/cml Moof/stlplus Moof/yajl
 bin_PROGRAMS = yoink
 
 yoink_SOURCES = \
+                               Animation.cc \
+                               Animation.hh \
                                Character.cc \
                                Character.hh \
                                GameLayer.cc \
@@ -119,6 +95,8 @@ yoink_SOURCES = \
                                MainLayer.hh \
                                Scene.cc \
                                Scene.hh \
+                               Tilemap.cc \
+                               Tilemap.hh \
                                TilemapFont.cc \
                                TilemapFont.hh \
                                TitleLayer.cc \