Index: trunk/src/util/Makefile.in
===================================================================
--- trunk/src/util/Makefile.in	(revision 5475)
+++ trunk/src/util/Makefile.in	(revision 5479)
@@ -1,3 +1,3 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
@@ -15,6 +15,4 @@
 @SET_MAKE@
 
-
-SOURCES = $(libORXutils_a_SOURCES)
 
 srcdir = @srcdir@
@@ -57,8 +55,9 @@
 libORXutils_a_LIBADD =
 am_libORXutils_a_OBJECTS = fast_factory.$(OBJEXT) \
-	garbage_collector.$(OBJEXT) resource_manager.$(OBJEXT) \
-	state.$(OBJEXT) user_control.$(OBJEXT) animation3d.$(OBJEXT) \
+	garbage_collector.$(OBJEXT) state.$(OBJEXT) \
+	user_control.$(OBJEXT) animation3d.$(OBJEXT) \
 	animation.$(OBJEXT) animation_player.$(OBJEXT) \
-	factory.$(OBJEXT) game_loader.$(OBJEXT) load_param.$(OBJEXT) \
+	resource_manager.$(OBJEXT) factory.$(OBJEXT) \
+	game_loader.$(OBJEXT) load_param.$(OBJEXT) \
 	pilot_node.$(OBJEXT) track_manager.$(OBJEXT) \
 	track_node.$(OBJEXT)
@@ -192,5 +191,4 @@
 libORXutils_a_SOURCES = fast_factory.cc \
 			garbage_collector.cc \
-			resource_manager.cc \
 			state.cc \
 			user_control.cc \
@@ -198,4 +196,5 @@
 			animation/animation.cc \
 			animation/animation_player.cc \
+			loading/resource_manager.cc \
 			loading/factory.cc \
 			loading/game_loader.cc \
@@ -207,5 +206,4 @@
 noinst_HEADERS = fast_factory.h \
 			garbage_collector.h \
-			resource_manager.h \
 			state.h \
 			user_control.h \
@@ -214,4 +212,5 @@
 			animation/animation_player.h \
 			animation/t_animation.h \
+			loading/resource_manager.h \
 			loading/factory.h \
 			loading/game_loader.h \
@@ -338,4 +337,18 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o animation_player.obj `if test -f 'animation/animation_player.cc'; then $(CYGPATH_W) 'animation/animation_player.cc'; else $(CYGPATH_W) '$(srcdir)/animation/animation_player.cc'; fi`
+
+resource_manager.o: loading/resource_manager.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resource_manager.o -MD -MP -MF "$(DEPDIR)/resource_manager.Tpo" -c -o resource_manager.o `test -f 'loading/resource_manager.cc' || echo '$(srcdir)/'`loading/resource_manager.cc; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/resource_manager.Tpo" "$(DEPDIR)/resource_manager.Po"; else rm -f "$(DEPDIR)/resource_manager.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='loading/resource_manager.cc' object='resource_manager.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resource_manager.o `test -f 'loading/resource_manager.cc' || echo '$(srcdir)/'`loading/resource_manager.cc
+
+resource_manager.obj: loading/resource_manager.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resource_manager.obj -MD -MP -MF "$(DEPDIR)/resource_manager.Tpo" -c -o resource_manager.obj `if test -f 'loading/resource_manager.cc'; then $(CYGPATH_W) 'loading/resource_manager.cc'; else $(CYGPATH_W) '$(srcdir)/loading/resource_manager.cc'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/resource_manager.Tpo" "$(DEPDIR)/resource_manager.Po"; else rm -f "$(DEPDIR)/resource_manager.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='loading/resource_manager.cc' object='resource_manager.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resource_manager.obj `if test -f 'loading/resource_manager.cc'; then $(CYGPATH_W) 'loading/resource_manager.cc'; else $(CYGPATH_W) '$(srcdir)/loading/resource_manager.cc'; fi`
 
 factory.o: loading/factory.cc
