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

Timestamp:

Oct 10, 2005, 4:06:16 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: build everything in src/lib as a libORXlibs.a

File:

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

trunk/src/Makefile.am

@@ -10 +10 @@
 orxonox_CPPFLAGS = -DIS_ORXONOX
 
-orxonox_DEPENDENCIES = lib/gui/gtk_gui/libORXgui.a \
+orxonox_DEPENDENCIES = 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 \
@@ -21 +22 @@
                        lib/graphics/spatial_separation/libORXquadtree.a \
                        lib/tinyxml/libtinyxml.a \
-                       lib/shell/libORXshell.a
+                       lib/shell/libORXshell.a
 
-orxonox_LDADD = lib/gui/gtk_gui/libORXgui.a \
+orxonox_LDADD = lib/libORXlibs.a \
+                lib/gui/gtk_gui/libORXgui.a \
                 lib/gui/gl_gui/libORXglgui.a \
                 lib/graphics/importer/libORXimporter.a \
@@ -74 +76 @@
                   world_entities/weapons/test_bullet.cc \
                   world_entities/weapons/crosshair.cc \
-                  lib/coord/p_node.cc \
-                  lib/coord/null_parent.cc \
-                  lib/lang/base_object.cc \
-                  lib/lang/class_list.cc \
-                  lib/util/ini_parser.cc \
-                  lib/util/substring.cc \
-                  lib/util/color.cc \
-                  lib/util/helper_functions.cc \
-                  lib/math/vector.cc \
-                  lib/math/curve.cc \
                   subprojects/benchmark.cc
 
@@ -141 +133 @@
                  defs/class_id.h \
                  defs/functor_list.h \
-                 lib/coord/p_node.h \
-                 lib/coord/null_parent.h \
-                 lib/lang/base_object.h \
-                 lib/graphics/render2D/element_2d.h \
-                 lib/graphics/render2D/render_2d.h \
-                 lib/lang/class_list.h \
-                 lib/util/ini_parser.h \
-                 lib/util/substring.h \
-                 lib/util/array.h \
-                 lib/util/list.h \
-                 lib/util/color.h \
-                 lib/util/helper_functions.h \
-                 lib/math/vector.h \
-                 lib/math/curve.h \
                  subprojects/benchmark.h
 
@@ -173 +151 @@
 endif
 
-SUBDIRS = lib . $(SUB_PROGS)
+SUBDIRS = lib \
+          $(SUB_PROGS) \
+          .