Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4090 in orxonox.OLD for orxonox/branches/heightMap/src/lib


Ignore:
Timestamp:
May 6, 2005, 6:01:06 PM (19 years ago)
Author:
nico
Message:

branches/heightMap: some makefile and include stuff fixed

Location:
orxonox/branches/heightMap/src/lib
Files:
4 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/heightMap/src/lib/Makefile.in

    r3789 r4090  
    1 # Makefile.in generated by automake 1.8.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.3 from Makefile.am.
    22# @configure_input@
    33
    … …  
    3434PRE_UNINSTALL = :
    3535POST_UNINSTALL = :
     36build_triplet = @build@
    3637host_triplet = @host@
     38target_triplet = @target@
    3739subdir = src/lib
    3840DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
    … …  
    133135am__leading_dot = @am__leading_dot@
    134136am__quote = @am__quote@
     137am__tar = @am__tar@
     138am__untar = @am__untar@
    135139bindir = @bindir@
    136140build = @build@
    … …  
    184188          esac; \
    185189        done; \
    186         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/Makefile'; \
     190        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/Makefile'; \
    187191        cd $(top_srcdir) && \
    188           $(AUTOMAKE) --foreign  src/lib/Makefile
     192          $(AUTOMAKE) --gnu  src/lib/Makefile
    189193.PRECIOUS: Makefile
    190194Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    356360          if test "$$subdir" = .; then :; else \
    357361            test -d "$(distdir)/$$subdir" \
    358             || mkdir "$(distdir)/$$subdir" \
     362            || $(mkdir_p) "$(distdir)/$$subdir" \
    359363            || exit 1; \
     364            distdir=`$(am__cd) $(distdir) && pwd`; \
     365            top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
    360366            (cd $$subdir && \
    361367              $(MAKE) $(AM_MAKEFLAGS) \
    362                 top_distdir="../$(top_distdir)" \
    363                 distdir="../$(distdir)/$$subdir" \
     368                top_distdir="$$top_distdir" \
     369                distdir="$$distdir/$$subdir" \
    364370                distdir) \
    365371              || exit 1; \
    … …  
    390396
    391397distclean-generic:
    392         -rm -f $(CONFIG_CLEAN_FILES)
     398        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
    393399
    394400maintainer-clean-generic:

  • orxonox/branches/heightMap/src/lib/graphics/Makefile.in

    r3789 r4090  
    1 # Makefile.in generated by automake 1.8.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.3 from Makefile.am.
    22# @configure_input@
    33
    … …  
    3434PRE_UNINSTALL = :
    3535POST_UNINSTALL = :
     36build_triplet = @build@
    3637host_triplet = @host@
     38target_triplet = @target@
    3739subdir = src/lib/graphics
    3840DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
    … …  
    133135am__leading_dot = @am__leading_dot@
    134136am__quote = @am__quote@
     137am__tar = @am__tar@
     138am__untar = @am__untar@
    135139bindir = @bindir@
    136140build = @build@
    … …  
    178182          esac; \
    179183        done; \
    180         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/Makefile'; \
     184        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/Makefile'; \
    181185        cd $(top_srcdir) && \
    182           $(AUTOMAKE) --foreign  src/lib/graphics/Makefile
     186          $(AUTOMAKE) --gnu  src/lib/graphics/Makefile
    183187.PRECIOUS: Makefile
    184188Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    347351          fi; \
    348352        done
    349         list='$(SUBDIRS)'; for subdir in $$list; do \
     353        list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
    350354          if test "$$subdir" = .; then :; else \
    351355            test -d "$(distdir)/$$subdir" \
    352             || mkdir "$(distdir)/$$subdir" \
     356            || $(mkdir_p) "$(distdir)/$$subdir" \
    353357            || exit 1; \
     358            distdir=`$(am__cd) $(distdir) && pwd`; \
     359            top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
    354360            (cd $$subdir && \
    355361              $(MAKE) $(AM_MAKEFLAGS) \
    356                 top_distdir="../$(top_distdir)" \
    357                 distdir="../$(distdir)/$$subdir" \
     362                top_distdir="$$top_distdir" \
     363                distdir="$$distdir/$$subdir" \
    358364                distdir) \
    359365              || exit 1; \
    … …  
    384390
    385391distclean-generic:
    386         -rm -f $(CONFIG_CLEAN_FILES)
     392        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
    387393
    388394maintainer-clean-generic:

  • orxonox/branches/heightMap/src/lib/graphics/importer/Makefile.in

    r3919 r4090  
    1 # Makefile.in generated by automake 1.8.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.3 from Makefile.am.
    22# @configure_input@
    33
    … …  
    3838PRE_UNINSTALL = :
    3939POST_UNINSTALL = :
     40build_triplet = @build@
    4041host_triplet = @host@
     42target_triplet = @target@
    4143bin_PROGRAMS = importer$(EXEEXT) heightmap$(EXEEXT)
    4244subdir = src/lib/graphics/importer
    4345DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    44         $(srcdir)/Makefile.in
     46        $(srcdir)/Makefile.in TODO
    4547ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    4648am__aclocal_m4_deps = $(top_srcdir)/configure.ac
    … …  
    6971depcomp = $(SHELL) $(top_srcdir)/depcomp
    7072am__depfiles_maybe = depfiles
    71 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po \
    72 @AMDEP_TRUE@    ./$(DEPDIR)/base_object.Po \
    73 @AMDEP_TRUE@    ./$(DEPDIR)/framework.Po \
    74 @AMDEP_TRUE@    ./$(DEPDIR)/graphics_engine.Po \
    75 @AMDEP_TRUE@    ./$(DEPDIR)/heightMapTerrain.Po \
    76 @AMDEP_TRUE@    ./$(DEPDIR)/heightMapViewer.Po ./$(DEPDIR)/main.Po \
    77 @AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/model.Po \
    78 @AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/objModel.Po \
    79 @AMDEP_TRUE@    ./$(DEPDIR)/p_node.Po \
    80 @AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Po \
    81 @AMDEP_TRUE@    ./$(DEPDIR)/resource_manager.Po \
    82 @AMDEP_TRUE@    ./$(DEPDIR)/text_engine.Po ./$(DEPDIR)/texture.Po \
    83 @AMDEP_TRUE@    ./$(DEPDIR)/vector.Po ./$(DEPDIR)/windowHandler.Po
    8473CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    8574        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    … …  
    170159am__leading_dot = @am__leading_dot@
    171160am__quote = @am__quote@
     161am__tar = @am__tar@
     162am__untar = @am__untar@
    172163bindir = @bindir@
    173164build = @build@
    … …  
    203194target_vendor = @target_vendor@
    204195MAINSRCDIR = ../../..
    205 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common
     196AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities \
     197        -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib \
     198        -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data \
     199        -I$(MAINSRCDIR)/lib/graphics \
     200        -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui \
     201        -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util \
     202        -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs \
     203        -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network \
     204        -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util \
     205        -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common
    206206AM_LDFLAGS = $(MWINDOWS)
    207207importer_SOURCES = framework.cc \
    … …  
    249249          esac; \
    250250        done; \
    251         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile'; \
     251        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile'; \
    252252        cd $(top_srcdir) && \
    253           $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile
     253          $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile
    254254.PRECIOUS: Makefile
    255255Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    328328@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    329329@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    330 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
    331 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     330@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    332331@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
    333332
    … …  
    336335@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    337336@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    338 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
    339 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     337@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    340338@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    341339
    … …  
    344342@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/vector.Tpo" "$(DEPDIR)/vector.Po"; else rm -f "$(DEPDIR)/vector.Tpo"; exit 1; fi
    345343@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/math/vector.cc' object='vector.o' libtool=no @AMDEPBACKSLASH@
    346 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/vector.Po' tmpdepfile='$(DEPDIR)/vector.TPo' @AMDEPBACKSLASH@
    347 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     344@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    348345@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o vector.o `test -f '$(MAINSRCDIR)/lib/math/vector.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/math/vector.cc
    349346
    … …  
    352349@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/vector.Tpo" "$(DEPDIR)/vector.Po"; else rm -f "$(DEPDIR)/vector.Tpo"; exit 1; fi
    353350@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/math/vector.cc' object='vector.obj' libtool=no @AMDEPBACKSLASH@
    354 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/vector.Po' tmpdepfile='$(DEPDIR)/vector.TPo' @AMDEPBACKSLASH@
    355 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     351@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    356352@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o vector.obj `if test -f '$(MAINSRCDIR)/lib/math/vector.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/math/vector.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/math/vector.cc'; fi`
    357353
    … …  
    360356@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/graphics_engine.Tpo" "$(DEPDIR)/graphics_engine.Po"; else rm -f "$(DEPDIR)/graphics_engine.Tpo"; exit 1; fi
    361357@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' object='graphics_engine.o' libtool=no @AMDEPBACKSLASH@
    362 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/graphics_engine.Po' tmpdepfile='$(DEPDIR)/graphics_engine.TPo' @AMDEPBACKSLASH@
    363 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     358@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    364359@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o graphics_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/graphics_engine.cc
    365360
    … …  
    368363@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/graphics_engine.Tpo" "$(DEPDIR)/graphics_engine.Po"; else rm -f "$(DEPDIR)/graphics_engine.Tpo"; exit 1; fi
    369364@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' object='graphics_engine.obj' libtool=no @AMDEPBACKSLASH@
    370 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/graphics_engine.Po' tmpdepfile='$(DEPDIR)/graphics_engine.TPo' @AMDEPBACKSLASH@
    371 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     365@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    372366@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o graphics_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; fi`
    373367
    … …  
    376370@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/base_object.Tpo" "$(DEPDIR)/base_object.Po"; else rm -f "$(DEPDIR)/base_object.Tpo"; exit 1; fi
    377371@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/lang/base_object.cc' object='base_object.o' libtool=no @AMDEPBACKSLASH@
    378 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/base_object.Po' tmpdepfile='$(DEPDIR)/base_object.TPo' @AMDEPBACKSLASH@
    379 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     372@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    380373@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o base_object.o `test -f '$(MAINSRCDIR)/lib/lang/base_object.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/lang/base_object.cc
    381374
    … …  
    384377@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/base_object.Tpo" "$(DEPDIR)/base_object.Po"; else rm -f "$(DEPDIR)/base_object.Tpo"; exit 1; fi
    385378@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/lang/base_object.cc' object='base_object.obj' libtool=no @AMDEPBACKSLASH@
    386 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/base_object.Po' tmpdepfile='$(DEPDIR)/base_object.TPo' @AMDEPBACKSLASH@
    387 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     379@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    388380@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o base_object.obj `if test -f '$(MAINSRCDIR)/lib/lang/base_object.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/lang/base_object.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/lang/base_object.cc'; fi`
    389381
    … …  
    392384@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/resource_manager.Tpo" "$(DEPDIR)/resource_manager.Po"; else rm -f "$(DEPDIR)/resource_manager.Tpo"; exit 1; fi
    393385@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/util/resource_manager.cc' object='resource_manager.o' libtool=no @AMDEPBACKSLASH@
    394 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/resource_manager.Po' tmpdepfile='$(DEPDIR)/resource_manager.TPo' @AMDEPBACKSLASH@
    395 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     386@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    396387@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resource_manager.o `test -f '$(MAINSRCDIR)/util/resource_manager.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/util/resource_manager.cc
    397388
    … …  
    400391@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/resource_manager.Tpo" "$(DEPDIR)/resource_manager.Po"; else rm -f "$(DEPDIR)/resource_manager.Tpo"; exit 1; fi
    401392@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/util/resource_manager.cc' object='resource_manager.obj' libtool=no @AMDEPBACKSLASH@
    402 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/resource_manager.Po' tmpdepfile='$(DEPDIR)/resource_manager.TPo' @AMDEPBACKSLASH@
    403 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     393@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    404394@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resource_manager.obj `if test -f '$(MAINSRCDIR)/util/resource_manager.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/resource_manager.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/resource_manager.cc'; fi`
    405395
    … …  
    408398@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/text_engine.Tpo" "$(DEPDIR)/text_engine.Po"; else rm -f "$(DEPDIR)/text_engine.Tpo"; exit 1; fi
    409399@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/text_engine.cc' object='text_engine.o' libtool=no @AMDEPBACKSLASH@
    410 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/text_engine.Po' tmpdepfile='$(DEPDIR)/text_engine.TPo' @AMDEPBACKSLASH@
    411 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     400@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    412401@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/text_engine.cc
    413402
    … …  
    416405@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/text_engine.Tpo" "$(DEPDIR)/text_engine.Po"; else rm -f "$(DEPDIR)/text_engine.Tpo"; exit 1; fi
    417406@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/text_engine.cc' object='text_engine.obj' libtool=no @AMDEPBACKSLASH@
    418 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/text_engine.Po' tmpdepfile='$(DEPDIR)/text_engine.TPo' @AMDEPBACKSLASH@
    419 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     407@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    420408@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/text_engine.cc'; fi`
    421409
    … …  
    424412@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/p_node.Tpo" "$(DEPDIR)/p_node.Po"; else rm -f "$(DEPDIR)/p_node.Tpo"; exit 1; fi
    425413@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/coord/p_node.cc' object='p_node.o' libtool=no @AMDEPBACKSLASH@
    426 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/p_node.Po' tmpdepfile='$(DEPDIR)/p_node.TPo' @AMDEPBACKSLASH@
    427 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     414@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    428415@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o p_node.o `test -f '$(MAINSRCDIR)/lib/coord/p_node.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/coord/p_node.cc
    429416
    … …  
    432419@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/p_node.Tpo" "$(DEPDIR)/p_node.Po"; else rm -f "$(DEPDIR)/p_node.Tpo"; exit 1; fi
    433420@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/coord/p_node.cc' object='p_node.obj' libtool=no @AMDEPBACKSLASH@
    434 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/p_node.Po' tmpdepfile='$(DEPDIR)/p_node.TPo' @AMDEPBACKSLASH@
    435 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     421@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    436422@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o p_node.obj `if test -f '$(MAINSRCDIR)/lib/coord/p_node.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/coord/p_node.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/coord/p_node.cc'; fi`
    437423
    … …  
    440426@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/null_parent.Tpo" "$(DEPDIR)/null_parent.Po"; else rm -f "$(DEPDIR)/null_parent.Tpo"; exit 1; fi
    441427@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/coord/null_parent.cc' object='null_parent.o' libtool=no @AMDEPBACKSLASH@
    442 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/null_parent.Po' tmpdepfile='$(DEPDIR)/null_parent.TPo' @AMDEPBACKSLASH@
    443 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     428@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    444429@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o null_parent.o `test -f '$(MAINSRCDIR)/lib/coord/null_parent.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/coord/null_parent.cc
    445430
    … …  
    448433@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/null_parent.Tpo" "$(DEPDIR)/null_parent.Po"; else rm -f "$(DEPDIR)/null_parent.Tpo"; exit 1; fi
    449434@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/coord/null_parent.cc' object='null_parent.obj' libtool=no @AMDEPBACKSLASH@
    450 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/null_parent.Po' tmpdepfile='$(DEPDIR)/null_parent.TPo' @AMDEPBACKSLASH@
    451 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     435@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    452436@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o null_parent.obj `if test -f '$(MAINSRCDIR)/lib/coord/null_parent.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/coord/null_parent.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/coord/null_parent.cc'; fi`
    453437uninstall-info-am:
    … …  
    554538
    555539distclean-generic:
    556         -rm -f $(CONFIG_CLEAN_FILES)
     540        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
    557541
    558542maintainer-clean-generic:

  • orxonox/branches/heightMap/src/lib/graphics/importer/framework.h

    r3657 r4090  
    44#include "windowHandler.h" // Include the Whandler Basecode
    55#include "objModel.h"
     6#include "heightmap.h"
    67#include "vector.h"
    78

  • orxonox/branches/heightMap/src/lib/graphics/importer/heightmap.cc

    r4021 r4090  
     1
     2
     3#include "heightmap.h"
     4
     5#include <stdio.h>
     6#include <string.h>
     7#include <stdlib.h>
     8
     9#include "debug.h"
     10#include "compiler.h"
     11
     12
     13Heightmap::Heightmap(const char* fileName, float scaling, int displaylistResolution, int vertexResolution)
     14{
     15        this->scaleFactor = scaling;
     16        this->setName(fileName);
     17       
     18        this->import(fileName);
     19       
     20        //this->finalize();
     21}
     22
     23Heightmap::~Heightmap ()
     24{
     25}
     26
     27bool Heightmap::import (const char* fileName)
     28{
     29        PRINTF(4)("preparing to read in file: %s\n", fileName);
     30       
     31        // using SDL-image to load the bitmap
     32        this->bitmap = IMG_Load(fileName);
     33
     34       
     35       
     36       
     37       
     38        return true;
     39}
     40

  • orxonox/branches/heightMap/src/lib/graphics/importer/heightmap.h

    r4021 r4090  
     1
     2
     3#ifndef _HEIGHTMAP_H
     4#define _HEIGHTMAP_H
     5
    16#include "model.h"
     7#include <SDL_image.h>
    28
    39class Heightmap : public Model
    410{
    511
     12public:
     13        Heightmap(const char* fileName, float scaling = 1.0, int displaylistResolution = 100, int vertexResolution = 1);
    614
     15        virtual ~Heightmap();
     16       
     17private:
     18        bool import (const char* fileName);
    719
     20        // holds the loaded pixels
     21        SDL_Surface* bitmap;
     22};
    823
    9 
    10 
    11 }
     24#endif /* _HEIGHTMAP_H */

  • orxonox/branches/heightMap/src/lib/gui/Makefile.in

    r3789 r4090  
    1 # Makefile.in generated by automake 1.8.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.3 from Makefile.am.
    22# @configure_input@
    33
    … …  
    3434PRE_UNINSTALL = :
    3535POST_UNINSTALL = :
     36build_triplet = @build@
    3637host_triplet = @host@
     38target_triplet = @target@
    3739subdir = src/lib/gui
    3840DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
    … …  
    133135am__leading_dot = @am__leading_dot@
    134136am__quote = @am__quote@
     137am__tar = @am__tar@
     138am__untar = @am__untar@
    135139bindir = @bindir@
    136140build = @build@
    … …  
    180184          esac; \
    181185        done; \
    182         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/Makefile'; \
     186        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/Makefile'; \
    183187        cd $(top_srcdir) && \
    184           $(AUTOMAKE) --foreign  src/lib/gui/Makefile
     188          $(AUTOMAKE) --gnu  src/lib/gui/Makefile
    185189.PRECIOUS: Makefile
    186190Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    349353          fi; \
    350354        done
    351         list='$(SUBDIRS)'; for subdir in $$list; do \
     355        list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
    352356          if test "$$subdir" = .; then :; else \
    353357            test -d "$(distdir)/$$subdir" \
    354             || mkdir "$(distdir)/$$subdir" \
     358            || $(mkdir_p) "$(distdir)/$$subdir" \
    355359            || exit 1; \
     360            distdir=`$(am__cd) $(distdir) && pwd`; \
     361            top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
    356362            (cd $$subdir && \
    357363              $(MAKE) $(AM_MAKEFLAGS) \
    358                 top_distdir="../$(top_distdir)" \
    359                 distdir="../$(distdir)/$$subdir" \
     364                top_distdir="$$top_distdir" \
     365                distdir="$$distdir/$$subdir" \
    360366                distdir) \
    361367              || exit 1; \
    … …  
    386392
    387393distclean-generic:
    388         -rm -f $(CONFIG_CLEAN_FILES)
     394        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
    389395
    390396maintainer-clean-generic:

  • orxonox/branches/heightMap/src/lib/gui/console/Makefile.in

    r3789 r4090  
    1 # Makefile.in generated by automake 1.8.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.3 from Makefile.am.
    22# @configure_input@
    33
    … …  
    3838PRE_UNINSTALL = :
    3939POST_UNINSTALL = :
     40build_triplet = @build@
    4041host_triplet = @host@
     42target_triplet = @target@
    4143bin_PROGRAMS = console$(EXEEXT)
    4244subdir = src/lib/gui/console
    … …  
    6062depcomp = $(SHELL) $(top_srcdir)/depcomp
    6163am__depfiles_maybe = depfiles
    62 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/orxonox_console.Po \
    63 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_console_entry.Po \
    64 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_console_log.Po
    6564CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6665        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    … …  
    152151am__leading_dot = @am__leading_dot@
    153152am__quote = @am__quote@
     153am__tar = @am__tar@
     154am__untar = @am__untar@
    154155bindir = @bindir@
    155156build = @build@
    … …  
    206207          esac; \
    207208        done; \
    208         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile'; \
     209        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile'; \
    209210        cd $(top_srcdir) && \
    210           $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile
     211          $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile
    211212.PRECIOUS: Makefile
    212213Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    267268@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    268269@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    269 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
    270 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     270@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    271271@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
    272272
    … …  
    275275@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    276276@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    277 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
    278 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     277@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    279278@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    280279uninstall-info-am:
    … …  
    381380
    382381distclean-generic:
    383         -rm -f $(CONFIG_CLEAN_FILES)
     382        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
    384383
    385384maintainer-clean-generic:

  • orxonox/branches/heightMap/src/lib/gui/gui/Makefile.in

    r3789 r4090  
    1 # Makefile.in generated by automake 1.8.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.3 from Makefile.am.
    22# @configure_input@
    33
    … …  
    3838PRE_UNINSTALL = :
    3939POST_UNINSTALL = :
     40build_triplet = @build@
    4041host_triplet = @host@
     42target_triplet = @target@
    4143bin_PROGRAMS = gui$(EXEEXT)
    4244subdir = src/lib/gui/gui
    … …  
    6365depcomp = $(SHELL) $(top_srcdir)/depcomp
    6466am__depfiles_maybe = depfiles
    65 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/orxonox_gui.Po \
    66 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_audio.Po \
    67 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_banner.Po \
    68 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_exec.Po \
    69 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_flags.Po \
    70 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_gtk.Po \
    71 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_keys.Po \
    72 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_update.Po \
    73 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_video.Po
    7467CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    7568        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    … …  
    160153am__leading_dot = @am__leading_dot@
    161154am__quote = @am__quote@
     155am__tar = @am__tar@
     156am__untar = @am__untar@
    162157bindir = @bindir@
    163158build = @build@
    … …  
    193188target_vendor = @target_vendor@
    194189MAINSRCDIR = ../../..
    195 AM_CXXFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS) -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/font -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
     190AM_CXXFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) \
     191        $(MSBITFIELDS) -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities \
     192        -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib \
     193        -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data \
     194        -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/font \
     195        -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui \
     196        -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util \
     197        -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs \
     198        -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network \
     199        -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
    196200
    197201#AM_LDFLAGS=$(GTK2_LIBS)   $(GTHREAD_LIBS)
    … …  
    240244          esac; \
    241245        done; \
    242         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile'; \
     246        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile'; \
    243247        cd $(top_srcdir) && \
    244           $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile
     248          $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile
    245249.PRECIOUS: Makefile
    246250Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    307311@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    308312@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    309 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
    310 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     313@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    311314@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
    312315
    … …  
    315318@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    316319@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    317 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
    318 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     320@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    319321@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    320322uninstall-info-am:
    … …  
    421423
    422424distclean-generic:
    423         -rm -f $(CONFIG_CLEAN_FILES)
     425        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
    424426
    425427maintainer-clean-generic:
Note: See TracChangeset for help on using the changeset viewer.