Changeset 9869 in orxonox.OLD for trunk/src/lib/util/Makefile.am

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/lib/util/Makefile.am (modified) (7 diffs)

trunk/src/lib/util/Makefile.am

@@ -2 +2 @@
 include $(MAINSRCDIR)/defs/include_paths.am
 
-noinst_LIBRARIES = libORXlibutil.a
+noinst_LIBRARIES = \
+                libORXlibutil.a \
+                libORXexecutor.a
+
+libORXexecutor_a_SOURCES = \
+                executor/executor_substring.cc
 
 libORXlibutil_a_SOURCES = \
@@ -9 +14 @@
                 helper_functions.cc \
                 multi_type.cc \
-                executor/executor.cc \
-                executor/executor_functional.cc \
-                executor/executor_lua.cc \
+                debug_buffer.cc \
                 \
                 loading/resource_manager.cc \
@@ -18 +21 @@
                 loading/load_param.cc \
                 loading/load_param_description.cc \
+                loading/load_param_class_description.cc \
                 loading/factory.cc \
-                loading/dynamic_loader.cc \
+                loading/fast_factory.cc \
                 \
                 filesys/file.cc \
@@ -25 +29 @@
                 filesys/net_link.cc \
                 \
-                preferences.cc \
                 threading.cc \
                 timer.cc
+
+#               loading/dynamic_loader.cc
 
 
@@ -35 +40 @@
                 color.h \
                 helper_functions.h \
+                debug.h \
+                debug_buffer.h \
+                \
+                \
                 executor/executor.h \
-                executor/executor_functional.h \
                 executor/executor_xml.h \
-                executor/executor_lua.h \
+                executor/executor_substring.h \
+                executor/executor_generic.h \
+                executor/executor_member.h \
+                executor/executor_const_member.h \
+                executor/executor_static.h \
+                \
                 executor/functor_list.h \
+                executor/functor_generic.h \
+                executor/functor_member.h \
+                executor/functor_const_member.h \
+                executor/functor_static.h \
+                \
                 \
                 filesys/file.h \
@@ -45 +63 @@
                 filesys/net_link.h \
                 \
-                preferences.h \
                 threading.h \
                 timer.h \
@@ -53 +70 @@
                 loading/game_loader.h \
                 loading/load_param.h \
+                loading/load_param_xml.h \
                 loading/load_param_description.h \
+                loading/load_param_class_description.h \
                 loading/factory.h \
+                loading/fast_factory.h \
                 loading/dynamic_loader.h \
                 \