Changeset 3391 in orxonox.OLD for orxonox/branches

Timestamp:

Feb 2, 2005, 1:16:41 PM (20 years ago)

Author:

nico

Message:

orxonox/branches/nico: heightmap stuff

Location:

orxonox/branches/nico

Files:

• Makefile.in (modified) (1 diff)
• configure (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• src/Makefile.in (modified) (1 diff)
• src/console/Makefile.in (modified) (1 diff)
• src/gui/Makefile.in (modified) (1 diff)
• src/importer/Makefile.in (modified) (2 diffs)

orxonox/branches/nico/Makefile.in

@@ -38 +38 @@
         $(srcdir)/Makefile.in $(srcdir)/config.h.in \
         $(srcdir)/doc/documentation.am $(top_srcdir)/configure AUTHORS \
-        COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \
-        install-sh missing mkinstalldirs
+        COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \
+        depcomp install-sh missing mkinstalldirs
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

orxonox/branches/nico/configure

@@ -7547 +7547 @@
 
 
-                                                            ac_config_files="$ac_config_files Makefile src/console/Makefile src/gui/Makefile src/Makefile src/importer/Makefile src/heightmap/Makefile"
+                                                  ac_config_files="$ac_config_files Makefile src/console/Makefile src/gui/Makefile src/Makefile src/importer/Makefile"
 
 cat >confcache <<\_ACEOF
@@ -8124 +8124 @@
   "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
   "src/importer/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/importer/Makefile" ;;
-  "src/heightmap/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/heightmap/Makefile" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;

orxonox/branches/nico/configure.ac

@@ -367 +367 @@
                  src/gui/Makefile
                  src/Makefile
-                 src/importer/Makefile
-                 src/heightmap/Makefile])
+                 src/importer/Makefile])
 AC_OUTPUT

orxonox/branches/nico/src/Makefile.in

@@ -275 +275 @@
           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

orxonox/branches/nico/src/console/Makefile.in

@@ -193 +193 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/console/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/console/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/console/Makefile
+          $(AUTOMAKE) --gnu  src/console/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/branches/nico/src/gui/Makefile.in

@@ -220 +220 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/gui/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/gui/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/gui/Makefile
+          $(AUTOMAKE) --gnu  src/gui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/branches/nico/src/importer/Makefile.in

@@ -42 +42 @@
 subdir = src/importer
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
+        $(srcdir)/Makefile.in TODO
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -135 +135 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SUB_PROJECTS_FALSE = @SUB_PROJECTS_FALSE@
-SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@