Changeset 5350 in orxonox.OLD for trunk/src/Makefile.am

Timestamp:

Oct 10, 2005, 5:02:39 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: building all in src/util as a lib calles util/libORXutils.a

File:

• trunk/src/Makefile.am (modified) (5 diffs)

trunk/src/Makefile.am

@@ -11 +11 @@
 
 orxonox_DEPENDENCIES = lib/libORXlibs.a \
+                       util/libORXutils.a \
                        lib/gui/gtk_gui/libORXgui.a \
                        lib/gui/gl_gui/libORXglgui.a \
@@ -24 +25 @@
                        lib/shell/libORXshell.a
 
-orxonox_LDADD = lib/libORXlibs.a \
+orxonox_LDADD = util/libORXutils.a \
+                lib/libORXlibs.a \
                 lib/gui/gtk_gui/libORXgui.a \
                 lib/gui/gl_gui/libORXglgui.a \
                 lib/graphics/importer/libORXimporter.a \
-                lib/graphics/libORXgraphics.a \
+                lib/graphics/libORXgraphics.a \
                 lib/sound/libORXsound.a \
                 lib/event/libORXevent.a \
@@ -36 +38 @@
                 lib/graphics/spatial_separation/libORXquadtree.a \
                 lib/tinyxml/libtinyxml.a \
-                lib/shell/libORXshell.a \
+                lib/shell/libORXshell.a \
                 $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 
 orxonox_SOURCES = orxonox.cc \
-                  util/loading/game_loader.cc \
-                  util/track/track_manager.cc \
-                  util/track/track_node.cc \
-                  util/track/pilot_node.cc \
-                  util/animation/animation.cc \
-                  util/animation/animation3d.cc \
-                  util/animation/animation_player.cc \
-                  util/fast_factory.cc \
-                  util/garbage_collector.cc \
-                  util/resource_manager.cc \
-                  util/loading/factory.cc \
-                  util/loading/load_param.cc \
-                  util/state.cc \
-                  util/user_control.cc \
                   story_entities/story_entity.cc \
                   story_entities/campaign.cc \
@@ -81 +69 @@
                  ability.h \
                  defs/message_structures.h \
-                 util/loading/game_loader.h \
-                 util/track/track_manager.h \
-                 util/track/track_node.h \
-                 util/track/pilot_node.h \
-                 util/animation/animation.h \
-                 util/animation/t_animation.h \
-                 util/animation/animation3d.h \
-                 util/animation/animation_player.h \
-                 util/fast_factory.h \
-                 util/garbage_collector.h \
-                 util/state.h \
-                 util/user_control.h \
-                 util/resource_manager.h \
-                 util/loading/factory.h \
-                 util/loading/load_param.h \
                  story_entities/story_entity.h \
                  story_entities/story_def.h \
@@ -152 +125 @@
 
 SUBDIRS = lib \
+          util \
           $(SUB_PROGS) \
           .