Changeset 5353 in orxonox.OLD

Timestamp:

Oct 10, 2005, 5:49:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: reverted with
svn merge . . -r5351:5350
to remove libworldentity

Location:

trunk

Files:

• configure (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (3 diffs)
• src/Makefile.in (modified) (4 diffs)
• src/world_entities/Makefile.am (deleted)
• src/world_entities/Makefile.in (deleted)

trunk/configure

@@ -10717 +10717 @@
 ## OUTPUT CONFIGURE ##
 ######################
-                                                                                                                                                                                                                                      ac_config_files="$ac_config_files Makefile src/Makefile src/lib/Makefile src/lib/graphics/Makefile src/lib/graphics/importer/Makefile src/lib/graphics/spatial_separation/Makefile src/lib/sound/Makefile src/lib/event/Makefile src/lib/physics/Makefile src/lib/particles/Makefile src/lib/collision_detection/Makefile src/lib/shell/Makefile src/lib/gui/Makefile src/lib/gui/gtk_gui/Makefile src/lib/gui/gl_gui/Makefile src/lib/tinyxml/Makefile src/world_entities/Makefile src/util/Makefile src/subprojects/Makefile src/subprojects/testmain/Makefile src/subprojects/importer/Makefile src/subprojects/particles/Makefile src/subprojects/collision_detection/Makefile"
+                                                                                                                                                                                                                            ac_config_files="$ac_config_files Makefile src/Makefile src/lib/Makefile src/lib/graphics/Makefile src/lib/graphics/importer/Makefile src/lib/graphics/spatial_separation/Makefile src/lib/sound/Makefile src/lib/event/Makefile src/lib/physics/Makefile src/lib/particles/Makefile src/lib/collision_detection/Makefile src/lib/shell/Makefile src/lib/gui/Makefile src/lib/gui/gtk_gui/Makefile src/lib/gui/gl_gui/Makefile src/lib/tinyxml/Makefile src/util/Makefile src/subprojects/Makefile src/subprojects/testmain/Makefile src/subprojects/importer/Makefile src/subprojects/particles/Makefile src/subprojects/collision_detection/Makefile"
 
 
@@ -11327 +11327 @@
   "src/lib/gui/gl_gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gui/gl_gui/Makefile" ;;
   "src/lib/tinyxml/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/tinyxml/Makefile" ;;
-  "src/world_entities/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/world_entities/Makefile" ;;
   "src/util/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/util/Makefile" ;;
   "src/subprojects/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/subprojects/Makefile" ;;

trunk/configure.ac

@@ -702 +702 @@
                  src/lib/gui/gl_gui/Makefile
                  src/lib/tinyxml/Makefile
-                 src/world_entities/Makefile
                  src/util/Makefile
                  src/subprojects/Makefile

trunk/src/Makefile.am

@@ -10 +10 @@
 orxonox_CPPFLAGS = -DIS_ORXONOX
 
-orxonox_DEPENDENCIES = world_entities/libORXworldentities.a \
-                       lib/libORXlibs.a \
+orxonox_DEPENDENCIES = lib/libORXlibs.a \
                        util/libORXutils.a \
                        lib/gui/gtk_gui/libORXgui.a \
@@ -26 +25 @@
                        lib/shell/libORXshell.a
 
-orxonox_LDADD = world_entities/libORXworldentities.a \
-                util/libORXutils.a \
+orxonox_LDADD = util/libORXutils.a \
                 lib/libORXlibs.a \
                 lib/gui/gtk_gui/libORXgui.a \
@@ -128 +126 @@
 SUBDIRS = lib \
           util \
-          world_entities \
           $(SUB_PROGS) \
           .

trunk/src/Makefile.in

@@ -112 +112 @@
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = lib util world_entities subprojects .
+DIST_SUBDIRS = lib util subprojects .
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -224 +224 @@
 MAINSRCDIR = .
 orxonox_CPPFLAGS = -DIS_ORXONOX
-orxonox_DEPENDENCIES = world_entities/libORXworldentities.a \
-                       lib/libORXlibs.a \
+orxonox_DEPENDENCIES = lib/libORXlibs.a \
                        util/libORXutils.a \
                        lib/gui/gtk_gui/libORXgui.a \
@@ -240 +239 @@
                        lib/shell/libORXshell.a
 
-orxonox_LDADD = world_entities/libORXworldentities.a \
-                util/libORXutils.a \
+orxonox_LDADD = util/libORXutils.a \
                 lib/libORXlibs.a \
                 lib/gui/gtk_gui/libORXgui.a \
@@ -336 +334 @@
 SUBDIRS = lib \
           util \
-          world_entities \
           $(SUB_PROGS) \
           .