Changeset 4223 in orxonox.OLD for orxonox/branches/physics/src/Makefile.in

Timestamp:

May 19, 2005, 7:45:28 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged back the Trunk into the Physics-branche
merged with command:
svn merge -r 4178:HEAD ../trunk/ physics
no conflicts in relevant files

File:

• orxonox/branches/physics/src/Makefile.in (modified) (7 diffs)

orxonox/branches/physics/src/Makefile.in

@@ -87 +87 @@
         particle_system.$(OBJEXT) particle_emitter.$(OBJEXT) \
         base_entity.$(OBJEXT) base_object.$(OBJEXT) \
-        ini_parser.$(OBJEXT) list.$(OBJEXT) resource_manager.$(OBJEXT) \
-        i_physics.$(OBJEXT) physics_engine.$(OBJEXT) \
-        physics_connection.$(OBJEXT) field.$(OBJEXT) gravity.$(OBJEXT) \
-        point_gravity.$(OBJEXT) twirl.$(OBJEXT) vector.$(OBJEXT) \
-        curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) tinyxml.$(OBJEXT) \
+        ini_parser.$(OBJEXT) substring.$(OBJEXT) list.$(OBJEXT) \
+        resource_manager.$(OBJEXT) i_physics.$(OBJEXT) \
+        physics_engine.$(OBJEXT) physics_connection.$(OBJEXT) \
+        field.$(OBJEXT) gravity.$(OBJEXT) point_gravity.$(OBJEXT) \
+        twirl.$(OBJEXT) vector.$(OBJEXT) curve.$(OBJEXT) \
+        glmenu_imagescreen.$(OBJEXT) tinyxml.$(OBJEXT) \
         tinystr.$(OBJEXT) tinyxmlerror.$(OBJEXT) \
         tinyxmlparser.$(OBJEXT) benchmark.$(OBJEXT)
@@ -143 +144 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/satellite.Po ./$(DEPDIR)/skybox.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/skysphere.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/story_entity.Po ./$(DEPDIR)/terrain.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/story_entity.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/substring.Po ./$(DEPDIR)/terrain.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/test_bullet.Po ./$(DEPDIR)/test_gun.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/text_engine.Po ./$(DEPDIR)/texture.Po \
@@ -331 +333 @@
                  lib/lang/base_object.cc \
                  lib/util/ini_parser.cc \
+                 lib/util/substring.cc \
                  util/common/list.cc \
                  util/resource_manager.cc \
@@ -415 +418 @@
                  util/physics/fields/twirl.h \
                  lib/util/ini_parser.h \
+                 lib/util/substring.h \
                  lib/math/vector.h \
                  lib/math/curve.h \
@@ -468 +472 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/Makefile
+          $(AUTOMAKE) --gnu  src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -586 +590 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skysphere.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/story_entity.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/substring.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_bullet.Po@am__quote@
@@ -1402 +1407 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ini_parser.obj `if test -f 'lib/util/ini_parser.cc'; then $(CYGPATH_W) 'lib/util/ini_parser.cc'; else $(CYGPATH_W) '$(srcdir)/lib/util/ini_parser.cc'; fi`
+
+substring.o: lib/util/substring.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT substring.o -MD -MP -MF "$(DEPDIR)/substring.Tpo" -c -o substring.o `test -f 'lib/util/substring.cc' || echo '$(srcdir)/'`lib/util/substring.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/substring.Tpo" "$(DEPDIR)/substring.Po"; else rm -f "$(DEPDIR)/substring.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/util/substring.cc' object='substring.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/substring.Po' tmpdepfile='$(DEPDIR)/substring.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o substring.o `test -f 'lib/util/substring.cc' || echo '$(srcdir)/'`lib/util/substring.cc
+
+substring.obj: lib/util/substring.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT substring.obj -MD -MP -MF "$(DEPDIR)/substring.Tpo" -c -o substring.obj `if test -f 'lib/util/substring.cc'; then $(CYGPATH_W) 'lib/util/substring.cc'; else $(CYGPATH_W) '$(srcdir)/lib/util/substring.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/substring.Tpo" "$(DEPDIR)/substring.Po"; else rm -f "$(DEPDIR)/substring.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/util/substring.cc' object='substring.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/substring.Po' tmpdepfile='$(DEPDIR)/substring.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o substring.obj `if test -f 'lib/util/substring.cc'; then $(CYGPATH_W) 'lib/util/substring.cc'; else $(CYGPATH_W) '$(srcdir)/lib/util/substring.cc'; fi`
 
 list.o: util/common/list.cc