Changeset 4165 in orxonox.OLD for orxonox/branches/heightMap/src/subprojects

Timestamp:

May 11, 2005, 2:23:54 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/heightMap: merged trunk back to the heightMap branche
merged with command:
svn merge trunk/ branches/heightMap/ -r 4122:HEAD

Location:

orxonox/branches/heightMap/src/subprojects

Files:

• Makefile.in (modified) (2 diffs)
• benchmark.cc (copied) (copied from orxonox/trunk/src/subprojects/benchmark.cc)
• benchmark.h (copied) (copied from orxonox/trunk/src/subprojects/benchmark.h)
• testmain/Makefile.in (modified) (2 diffs)

orxonox/branches/heightMap/src/subprojects/Makefile.in

@@ -113 +113 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
@@ -176 +177 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/subprojects/Makefile
+          $(AUTOMAKE) --foreign  src/subprojects/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/branches/heightMap/src/subprojects/testmain/Makefile.in

@@ -128 +128 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
@@ -196 +197 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile
+          $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status