Changeset 3383 in orxonox.OLD

Timestamp:

Jan 26, 2005, 12:32:47 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/nico: added makefile for the heightmap
I liked it much more if you moved this into importer, and build it there, but for the time being this is ok

Location:

orxonox/branches/nico

Files:

• configure (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/Makefile.in (modified) (3 diffs)
• src/console/Makefile.in (modified) (1 diff)
• src/gui/Makefile.in (modified) (1 diff)
• src/heightmap (moved) (moved from orxonox/branches/nico/src/heightMap)
• src/heightmap/Makefile.am (added)
• src/importer/Makefile.in (modified) (1 diff)

orxonox/branches/nico/configure

@@ -7547 +7547 @@
 
 
-                                                  ac_config_files="$ac_config_files Makefile src/console/Makefile src/gui/Makefile src/Makefile src/importer/Makefile"
+                                                            ac_config_files="$ac_config_files Makefile src/console/Makefile src/gui/Makefile src/Makefile src/importer/Makefile src/heightmap/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/importer/Makefile
+                 src/heightmap/Makefile])
 AC_OUTPUT

orxonox/branches/nico/src/Makefile.am

@@ -74 +74 @@
 SUBDIRS = . \
           importer \
+          heightmap \
           gui \
           $(GTK_PROGS)

orxonox/branches/nico/src/Makefile.in

@@ -95 +95 @@
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = . importer gui console
+DIST_SUBDIRS = . importer heightmap gui console
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -258 +258 @@
 SUBDIRS = . \
           importer \
+          heightmap \
           gui \
           $(GTK_PROGS)
@@ -274 +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

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