X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMakefile.am;h=4e8f65d0b26b0f47d252050332843f7e227426cd;hp=e2ea2fe75e30ecf5f81151bfef2fba156088c06a;hb=ed5fcf5f1357fc42749408f705e9ec55531ff006;hpb=2d77fb5fb3480f522658f30af6addd5146530517

diff --git a/src/Makefile.am b/src/Makefile.am
index e2ea2fe..4e8f65d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,36 +7,37 @@
 
 #
 # libmoof.a
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 noinst_LIBRARIES = libmoof.a
 
 libmoof_a_SOURCES = \
-					Moof/Aabb.cc \
 					Moof/Aabb.hh \
 					Moof/Camera.cc \
 					Moof/Camera.hh \
 					Moof/ConvertUTF.c \
 					Moof/ConvertUTF.h \
+					Moof/Core.cc \
+					Moof/Core.hh \
 					Moof/Cullable.hh \
 					Moof/Dispatch.cc \
 					Moof/Dispatch.hh \
 					Moof/Drawable.hh \
-					Moof/Engine.cc \
-					Moof/Engine.hh \
 					Moof/Entity.hh \
+					Moof/Error.hh \
 					Moof/Event.hh \
-					Moof/Exception.hh \
 					Moof/Frustum.cc \
 					Moof/Frustum.hh \
 					Moof/Hash.cc \
 					Moof/Hash.hh \
+					Moof/Image.cc \
+					Moof/Image.hh \
 					Moof/Interpolator.hh \
 					Moof/Layer.hh \
-					Moof/Library.hh \
 					Moof/Line.hh \
 					Moof/Log.cc \
 					Moof/Log.hh \
+					Moof/Manager.hh \
 					Moof/Math.hh \
 					Moof/ModalDialog.hh \
 					Moof/Octree.hh \
@@ -44,8 +45,6 @@ libmoof_a_SOURCES = \
 					Moof/Plane.cc \
 					Moof/Plane.hh \
 					Moof/Ray.hh \
-					Moof/Rectangle.cc \
-					Moof/Rectangle.hh \
 					Moof/Resource.cc \
 					Moof/Resource.hh \
 					Moof/RigidBody.hh \
@@ -77,7 +76,7 @@ EXTRA_DIST = Moof/cml Moof/stlplus
 
 #
 # yoink
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 bin_PROGRAMS = yoink
 
@@ -94,12 +93,10 @@ yoink_SOURCES = \
 				Heroine.hh \
 				Hud.cc \
 				Hud.hh \
-				MainLayer.cc \
-				MainLayer.hh \
+				Main.cc \
+				Main.hh \
 				Scene.cc \
 				Scene.hh \
-				Tilemap.cc \
-				Tilemap.hh \
 				TilemapFont.cc \
 				TilemapFont.hh \
 				TitleLayer.cc \
@@ -113,7 +110,7 @@ yoink_SOURCES = \
 if WIN32
 yoink_SOURCES += yoink.rc yoink.ico
 .rc.o:
-	@WINDRES@ -o $@ -i $<
+	$(AM_V_GEN) $(WINDRES) -o $@ -i $<
 endif
 
 yoink_CPPFLAGS = -I$(top_srcdir)/src/Moof
@@ -128,6 +125,3 @@ run: all
 debug: all
 	$(YOINK_ENVIRONMENT) gdb ./yoink
 
-all-local:	# always rebuild version.c
-	@touch version.c
-