Changeset 4500 in orxonox.OLD for orxonox/trunk

Timestamp:

Jun 3, 2005, 11:45:27 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: moved the list file again back to lib/util

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (3 diffs)
• lib/util/list.h (copied) (copied from orxonox/trunk/src/util/common/list.h)
• util/common (deleted)

orxonox/trunk/src/Makefile.am

@@ -89 +89 @@
                  util/garbage_collector.h \
                  util/state.h \
+                 util/resource_manager.h \
+                 util/loading/factory.h \
+                 util/loading/load_param.h \
                  story_entities/story_entity.h \
                  story_entities/story_def.h \
@@ -135 +138 @@
                  lib/graphics/importer/texture.h \
                  lib/lang/base_object.h \
-                 util/common/list.h \
-                 util/resource_manager.h \
-                 util/loading/factory.h \
-                 util/loading/load_param.h \
                  lib/util/ini_parser.h \
                  lib/util/substring.h \
+                 lib/util/list.h \
                  lib/math/vector.h \
                  lib/math/curve.h \

orxonox/trunk/src/Makefile.in

@@ -318 +318 @@
                  util/garbage_collector.h \
                  util/state.h \
+                 util/resource_manager.h \
+                 util/loading/factory.h \
+                 util/loading/load_param.h \
                  story_entities/story_entity.h \
                  story_entities/story_def.h \
@@ -364 +367 @@
                  lib/graphics/importer/texture.h \
                  lib/lang/base_object.h \
-                 util/common/list.h \
-                 util/resource_manager.h \
-                 util/loading/factory.h \
-                 util/loading/load_param.h \
                  lib/util/ini_parser.h \
                  lib/util/substring.h \
+                 lib/util/list.h \
                  lib/math/vector.h \
                  lib/math/curve.h \
@@ -1445 +1445 @@
 
 distdir: $(DISTFILES)
-        $(mkdir_p) $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/graphics $(distdir)/lib/graphics/importer $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/common $(distdir)/util/loading $(distdir)/util/track $(distdir)/world_entities
+        $(mkdir_p) $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/graphics $(distdir)/lib/graphics/importer $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/loading $(distdir)/util/track $(distdir)/world_entities
         @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \