sockets documentation and cleanup

[chaz/yoink] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index f4122dec4a3a6659d7531e510db69bb1535f8cf7..c9b5dd9bfe79714b2287628b435b4cc128f94a89 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,96 +1,144 @@
 
-noinst_LTLIBRARIES = libmoof.la
-
-libmoof_la_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 \
-                                  Moof/Engine.cc \
-                                  Moof/Engine.hh \
-                                  Moof/Entity.hh \
-                                  Moof/Event.hh \
-                                  Moof/Frustum.cc \
-                                  Moof/Frustum.hh \
-                                  Moof/Hash.cc \
-                                  Moof/Hash.hh \
-                                  Moof/Interpolator.hh \
-                                  Moof/Math.hh \
-                                  Moof/Mippleton.hh \
-                                  Moof/Octree.hh \
-                                  Moof/OpenGL.cc \
-                                  Moof/OpenGL.hh \
-                                  Moof/Plane.cc \
-                                  Moof/Plane.hh \
-                                  Moof/Random.cc \
-                                  Moof/Random.hh \
-                                  Moof/Resource.cc \
-                                  Moof/Resource.hh \
-                                  Moof/Scene.cc \
-                                  Moof/Scene.hh \
-                                  Moof/Serializable.cc \
-                                  Moof/Serializable.hh \
-                                  Moof/Serializer.cc \
-                                  Moof/Serializer.hh \
-                                  Moof/Settings.cc \
-                                  Moof/Settings.hh \
-                                  Moof/Singleton.hh \
-                                  Moof/Sphere.cc \
-                                  Moof/Sphere.hh \
-                                  Moof/StringTools.cc \
-                                  Moof/StringTools.hh \
-                                  Moof/Texture.cc \
-                                  Moof/Texture.hh \
-                                  Moof/Thread.hh \
-                                  Moof/Tilemap.cc \
-                                  Moof/Tilemap.hh \
-                                  Moof/Timer.cc \
-                                  Moof/Timer.hh \
-                                  Moof/Video.cc \
-                                  Moof/Video.hh \
-                                  Moof/fastevents.c \
-                                  Moof/fastevents.h \
-                                  $(ENDLIST)
-
-libmoof_la_CPPFLAGS = -I$(top_srcdir)/src/Moof -I$(top_srcdir)/yajl/src
-libmoof_la_LIBADD   = $(top_srcdir)/yajl/libyajl.la
-
-
-bin_PROGRAMS   = yoink
-
-yoink_SOURCES  = \
-                                Character.cc \
-                                Character.hh \
-                                TilemapFont.cc \
-                                TilemapFont.hh \
-                                Typesetter.cc \
-                                Typesetter.hh \
-                                YoinkApp.cc \
-                                YoinkApp.hh \
-                                $(ENDLIST)
+#
+# Yoink
+# Process this file with automake to produce a Makefile.
+#
 
-yoink_CPPFLAGS = -I$(top_srcdir)/src/Moof
-yoink_LDADD    = libmoof.la
 
+#
+# libmoof.a
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+noinst_LIBRARIES = libmoof.a
+
+libmoof_a_CPPFLAGS = -I$(top_srcdir)/src/Moof
+
+libmoof_a_SOURCES = \
+                                       Moof/Aabb.cc \
+                                       Moof/Aabb.hh \
+                                       Moof/Backend.cc \
+                                       Moof/Backend.hh \
+                                       Moof/Camera.cc \
+                                       Moof/Camera.hh \
+                                       Moof/Contact.hh \
+                                       Moof/ConvertUTF.c \
+                                       Moof/ConvertUTF.h \
+                                       Moof/Cullable.hh \
+                                       Moof/Dispatch.cc \
+                                       Moof/Dispatch.hh \
+                                       Moof/Drawable.hh \
+                                       Moof/Entity.hh \
+                                       Moof/Error.hh \
+                                       Moof/Event.hh \
+                                       Moof/Frustum.cc \
+                                       Moof/Frustum.hh \
+                                       Moof/HashTools.cc \
+                                       Moof/HashTools.hh \
+                                       Moof/Image.cc \
+                                       Moof/Image.hh \
+                                       Moof/Interpolator.hh \
+                                       Moof/Line.hh \
+                                       Moof/Log.cc \
+                                       Moof/Log.hh \
+                                       Moof/Manager.hh \
+                                       Moof/Math.hh \
+                                       Moof/ModalDialog.hh \
+                                       Moof/Network.hh \
+                                       Moof/Octree.hh \
+                                       Moof/OpenGL.hh \
+                                       Moof/Packet.cc \
+                                       Moof/Packet.hh \
+                                       Moof/Plane.cc \
+                                       Moof/Plane.hh \
+                                       Moof/Ray.hh \
+                                       Moof/Resource.cc \
+                                       Moof/Resource.hh \
+                                       Moof/RigidBody.hh \
+                                       Moof/Script.hh \
+                                       Moof/Service.cc \
+                                       Moof/Service.hh \
+                                       Moof/Settings.cc \
+                                       Moof/Settings.hh \
+                                       Moof/Shape.hh \
+                                       Moof/Socket.hh \
+                                       Moof/Sound.cc \
+                                       Moof/Sound.hh \
+                                       Moof/Sphere.hh \
+                                       Moof/StringTools.cc \
+                                       Moof/StringTools.hh \
+                                       Moof/Texture.cc \
+                                       Moof/Texture.hh \
+                                       Moof/Thread.hh \
+                                       Moof/Timer.cc \
+                                       Moof/Timer.hh \
+                                       Moof/Video.cc \
+                                       Moof/Video.hh \
+                                       Moof/View.cc \
+                                       Moof/View.hh \
+                                       Moof/fastevents.c \
+                                       Moof/fastevents.h \
+                                       $(ENDLIST)
 
 EXTRA_DIST = Moof/cml Moof/stlplus
 
 
-YOINK_ENVIRONMENT = YOINK_DATADIR="$(top_srcdir)/data"
+#
+# yoink
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+bin_PROGRAMS = yoink
 
+yoink_CPPFLAGS = -I$(top_srcdir)/src/Moof
+yoink_LDADD = libmoof.a
+
+yoink_SOURCES = \
+                               Animation.cc \
+                               Animation.hh \
+                               Character.cc \
+                               Character.hh \
+                               ErrorHandler.cc \
+                               ErrorHandler.hh \
+                               GameLayer.cc \
+                               GameLayer.hh \
+                               GameState.hh \
+                               Heroine.cc \
+                               Heroine.hh \
+                               Hud.cc \
+                               Hud.hh \
+                               Main.cc \
+                               Main.hh \
+                               Scene.cc \
+                               Scene.hh \
+                               TilemapFont.cc \
+                               TilemapFont.hh \
+                               TitleLayer.cc \
+                               TitleLayer.hh \
+                               Typesetter.cc \
+                               Typesetter.hh \
+                               version.c \
+                               version.h \
+                               $(ENDLIST)
+
+if WIN32
+yoink_SOURCES += yoink.rc
+.rc.o:
+       $(WINDRES) -o $@ -i $<
+else
+YOINK_ENVIRONMENT = YOINK_DATADIR="$(top_srcdir)/data"
 run: all
        $(YOINK_ENVIRONMENT) ./yoink $(YOINK_OPTS)
 
 debug: all
        $(YOINK_ENVIRONMENT) gdb ./yoink
+endif
+
+if LINK_SH
+yoink$(EXEEXT): $(yoink_OBJECTS) $(yoink_DEPENDENCIES)
+       @rm -f yoink$(EXEEXT)
+       @LINK="$(CXXLINK) $(yoink_OBJECTS) $(yoink_LDADD) $(LIBS)"\
+               sh $(top_srcdir)/link.sh
+
+clean-local:
+       rm -f .link/*
+endif