Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5674 in orxonox.OLD for trunk/src/lib/graphics


Ignore:
Timestamp:
Nov 21, 2005, 4:51:07 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: collision-detection with new Matrix-class

Location:
trunk/src/lib/graphics
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/graphics/Makefile.in

    r5672 r5674  
    1 # Makefile.in generated by automake 1.8.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
    5 # 2003, 2004  Free Software Foundation, Inc.
     5# 2003, 2004, 2005  Free Software Foundation, Inc.
    66# This Makefile.in is free software; the Free Software Foundation
    77# gives unlimited permission to copy and/or distribute it,
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXgraphics_a_SOURCES)
    1917
    2018srcdir = @srcdir@
    … …  
    3836PRE_UNINSTALL = :
    3937POST_UNINSTALL = :
     38build_triplet = @build@
    4039host_triplet = @host@
     40target_triplet = @target@
    4141subdir = src/lib/graphics
    4242DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    … …  
    6262depcomp = $(SHELL) $(top_srcdir)/depcomp
    6363am__depfiles_maybe = depfiles
    64 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/element_2d.Po ./$(DEPDIR)/font.Po \
    65 @AMDEP_TRUE@    ./$(DEPDIR)/graphics_engine.Po \
    66 @AMDEP_TRUE@    ./$(DEPDIR)/light.Po ./$(DEPDIR)/render_2d.Po \
    67 @AMDEP_TRUE@    ./$(DEPDIR)/shader.Po ./$(DEPDIR)/text.Po \
    68 @AMDEP_TRUE@    ./$(DEPDIR)/text_engine.Po
    6964CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    7065        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    … …  
    232227          esac; \
    233228        done; \
    234         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/Makefile'; \
     229        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/Makefile'; \
    235230        cd $(top_srcdir) && \
    236           $(AUTOMAKE) --foreign  src/lib/graphics/Makefile
     231          $(AUTOMAKE) --gnu  src/lib/graphics/Makefile
    237232.PRECIOUS: Makefile
    238233Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    279274@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    280275@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    281 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
    282 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     276@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    283277@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
    284278
    … …  
    287281@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    288282@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    289 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
    290 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     283@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    291284@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    292285
    … …  
    295288@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/render_2d.Tpo" "$(DEPDIR)/render_2d.Po"; else rm -f "$(DEPDIR)/render_2d.Tpo"; exit 1; fi
    296289@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='render2D/render_2d.cc' object='render_2d.o' libtool=no @AMDEPBACKSLASH@
    297 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/render_2d.Po' tmpdepfile='$(DEPDIR)/render_2d.TPo' @AMDEPBACKSLASH@
    298 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     290@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    299291@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o render_2d.o `test -f 'render2D/render_2d.cc' || echo '$(srcdir)/'`render2D/render_2d.cc
    300292
    … …  
    303295@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/render_2d.Tpo" "$(DEPDIR)/render_2d.Po"; else rm -f "$(DEPDIR)/render_2d.Tpo"; exit 1; fi
    304296@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='render2D/render_2d.cc' object='render_2d.obj' libtool=no @AMDEPBACKSLASH@
    305 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/render_2d.Po' tmpdepfile='$(DEPDIR)/render_2d.TPo' @AMDEPBACKSLASH@
    306 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     297@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    307298@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o render_2d.obj `if test -f 'render2D/render_2d.cc'; then $(CYGPATH_W) 'render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/render2D/render_2d.cc'; fi`
    308299
    … …  
    311302@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/element_2d.Tpo" "$(DEPDIR)/element_2d.Po"; else rm -f "$(DEPDIR)/element_2d.Tpo"; exit 1; fi
    312303@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='render2D/element_2d.cc' object='element_2d.o' libtool=no @AMDEPBACKSLASH@
    313 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/element_2d.Po' tmpdepfile='$(DEPDIR)/element_2d.TPo' @AMDEPBACKSLASH@
    314 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     304@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    315305@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o element_2d.o `test -f 'render2D/element_2d.cc' || echo '$(srcdir)/'`render2D/element_2d.cc
    316306
    … …  
    319309@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/element_2d.Tpo" "$(DEPDIR)/element_2d.Po"; else rm -f "$(DEPDIR)/element_2d.Tpo"; exit 1; fi
    320310@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='render2D/element_2d.cc' object='element_2d.obj' libtool=no @AMDEPBACKSLASH@
    321 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/element_2d.Po' tmpdepfile='$(DEPDIR)/element_2d.TPo' @AMDEPBACKSLASH@
    322 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     311@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    323312@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o element_2d.obj `if test -f 'render2D/element_2d.cc'; then $(CYGPATH_W) 'render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/render2D/element_2d.cc'; fi`
    324313
    … …  
    327316@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/text_engine.Tpo" "$(DEPDIR)/text_engine.Po"; else rm -f "$(DEPDIR)/text_engine.Tpo"; exit 1; fi
    328317@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='text_engine/text_engine.cc' object='text_engine.o' libtool=no @AMDEPBACKSLASH@
    329 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/text_engine.Po' tmpdepfile='$(DEPDIR)/text_engine.TPo' @AMDEPBACKSLASH@
    330 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     318@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    331319@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_engine.o `test -f 'text_engine/text_engine.cc' || echo '$(srcdir)/'`text_engine/text_engine.cc
    332320
    … …  
    335323@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/text_engine.Tpo" "$(DEPDIR)/text_engine.Po"; else rm -f "$(DEPDIR)/text_engine.Tpo"; exit 1; fi
    336324@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='text_engine/text_engine.cc' object='text_engine.obj' libtool=no @AMDEPBACKSLASH@
    337 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/text_engine.Po' tmpdepfile='$(DEPDIR)/text_engine.TPo' @AMDEPBACKSLASH@
    338 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     325@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    339326@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_engine.obj `if test -f 'text_engine/text_engine.cc'; then $(CYGPATH_W) 'text_engine/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/text_engine/text_engine.cc'; fi`
    340327
    … …  
    343330@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/text.Tpo" "$(DEPDIR)/text.Po"; else rm -f "$(DEPDIR)/text.Tpo"; exit 1; fi
    344331@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='text_engine/text.cc' object='text.o' libtool=no @AMDEPBACKSLASH@
    345 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/text.Po' tmpdepfile='$(DEPDIR)/text.TPo' @AMDEPBACKSLASH@
    346 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     332@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    347333@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text.o `test -f 'text_engine/text.cc' || echo '$(srcdir)/'`text_engine/text.cc
    348334
    … …  
    351337@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/text.Tpo" "$(DEPDIR)/text.Po"; else rm -f "$(DEPDIR)/text.Tpo"; exit 1; fi
    352338@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='text_engine/text.cc' object='text.obj' libtool=no @AMDEPBACKSLASH@
    353 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/text.Po' tmpdepfile='$(DEPDIR)/text.TPo' @AMDEPBACKSLASH@
    354 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     339@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    355340@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text.obj `if test -f 'text_engine/text.cc'; then $(CYGPATH_W) 'text_engine/text.cc'; else $(CYGPATH_W) '$(srcdir)/text_engine/text.cc'; fi`
    356341
    … …  
    359344@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/font.Tpo" "$(DEPDIR)/font.Po"; else rm -f "$(DEPDIR)/font.Tpo"; exit 1; fi
    360345@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='text_engine/font.cc' object='font.o' libtool=no @AMDEPBACKSLASH@
    361 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/font.Po' tmpdepfile='$(DEPDIR)/font.TPo' @AMDEPBACKSLASH@
    362 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     346@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    363347@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o font.o `test -f 'text_engine/font.cc' || echo '$(srcdir)/'`text_engine/font.cc
    364348
    … …  
    367351@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/font.Tpo" "$(DEPDIR)/font.Po"; else rm -f "$(DEPDIR)/font.Tpo"; exit 1; fi
    368352@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='text_engine/font.cc' object='font.obj' libtool=no @AMDEPBACKSLASH@
    369 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/font.Po' tmpdepfile='$(DEPDIR)/font.TPo' @AMDEPBACKSLASH@
    370 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     353@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    371354@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o font.obj `if test -f 'text_engine/font.cc'; then $(CYGPATH_W) 'text_engine/font.cc'; else $(CYGPATH_W) '$(srcdir)/text_engine/font.cc'; fi`
    372355uninstall-info-am:
    … …  
    379362# (2) otherwise, pass the desired values on the `make' command line.
    380363$(RECURSIVE_TARGETS):
    381         @set fnord $$MAKEFLAGS; amf=$$2; \
     364        @failcom='exit 1'; \
     365        for f in x $$MAKEFLAGS; do \
     366          case $$f in \
     367            *=* | --[!k]*);; \
     368            *k*) failcom='fail=yes';; \
     369          esac; \
     370        done; \
    382371        dot_seen=no; \
    383372        target=`echo $@ | sed s/-recursive//`; \
    … …  
    391380          fi; \
    392381          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
    393            || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
     382          || eval $$failcom; \
    394383        done; \
    395384        if test "$$dot_seen" = "no"; then \
    … …  
    399388mostlyclean-recursive clean-recursive distclean-recursive \
    400389maintainer-clean-recursive:
    401         @set fnord $$MAKEFLAGS; amf=$$2; \
     390        @failcom='exit 1'; \
     391        for f in x $$MAKEFLAGS; do \
     392          case $$f in \
     393            *=* | --[!k]*);; \
     394            *k*) failcom='fail=yes';; \
     395          esac; \
     396        done; \
    402397        dot_seen=no; \
    403398        case "$@" in \
    … …  
    420415          fi; \
    421416          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
    422            || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
     417          || eval $$failcom; \
    423418        done && test -z "$$fail"
    424419tags-recursive:
    … …  
    520515          fi; \
    521516        done
    522         list='$(SUBDIRS)'; for subdir in $$list; do \
     517        list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
    523518          if test "$$subdir" = .; then :; else \
    524519            test -d "$(distdir)/$$subdir" \
    525             || mkdir "$(distdir)/$$subdir" \
     520            || $(mkdir_p) "$(distdir)/$$subdir" \
    526521            || exit 1; \
     522            distdir=`$(am__cd) $(distdir) && pwd`; \
     523            top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
    527524            (cd $$subdir && \
    528525              $(MAKE) $(AM_MAKEFLAGS) \
    529                 top_distdir="../$(top_distdir)" \
    530                 distdir="../$(distdir)/$$subdir" \
     526                top_distdir="$$top_distdir" \
     527                distdir="$$distdir/$$subdir" \
    531528                distdir) \
    532529              || exit 1; \
    … …  
    557554
    558555distclean-generic:
    559         -rm -f $(CONFIG_CLEAN_FILES)
     556        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
    560557
    561558maintainer-clean-generic:

  • trunk/src/lib/graphics/importer/Makefile.in

    r5672 r5674  
    1 # Makefile.in generated by automake 1.8.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
    5 # 2003, 2004  Free Software Foundation, Inc.
     5# 2003, 2004, 2005  Free Software Foundation, Inc.
    66# This Makefile.in is free software; the Free Software Foundation
    77# gives unlimited permission to copy and/or distribute it,
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXimporter_a_SOURCES)
    1917
    2018srcdir = @srcdir@
    … …  
    3836PRE_UNINSTALL = :
    3937POST_UNINSTALL = :
     38build_triplet = @build@
    4039host_triplet = @host@
     40target_triplet = @target@
    4141subdir = src/lib/graphics/importer
    4242DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    … …  
    6161depcomp = $(SHELL) $(top_srcdir)/depcomp
    6262am__depfiles_maybe = depfiles
    63 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/material.Po \
    64 @AMDEP_TRUE@    ./$(DEPDIR)/md2Model.Po ./$(DEPDIR)/model.Po \
    65 @AMDEP_TRUE@    ./$(DEPDIR)/objModel.Po \
    66 @AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Po \
    67 @AMDEP_TRUE@    ./$(DEPDIR)/texture.Po
    6863CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6964        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    … …  
    219214          esac; \
    220215        done; \
    221         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile'; \
     216        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile'; \
    222217        cd $(top_srcdir) && \
    223           $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile
     218          $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile
    224219.PRECIOUS: Makefile
    225220Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    264259@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    265260@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    266 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
    267 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     261@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    268262@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
    269263
    … …  
    272266@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    273267@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    274 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
    275 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     268@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    276269@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    277270uninstall-info-am:
    … …  
    375368
    376369distclean-generic:
    377         -rm -f $(CONFIG_CLEAN_FILES)
     370        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
    378371
    379372maintainer-clean-generic:

  • trunk/src/lib/graphics/spatial_separation/Makefile.in

    r5672 r5674  
    1 # Makefile.in generated by automake 1.8.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
    5 # 2003, 2004  Free Software Foundation, Inc.
     5# 2003, 2004, 2005  Free Software Foundation, Inc.
    66# This Makefile.in is free software; the Free Software Foundation
    77# gives unlimited permission to copy and/or distribute it,
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXquadtree_a_SOURCES)
    1917
    2018srcdir = @srcdir@
    … …  
    3836PRE_UNINSTALL = :
    3937POST_UNINSTALL = :
     38build_triplet = @build@
    4039host_triplet = @host@
     40target_triplet = @target@
    4141subdir = src/lib/graphics/spatial_separation
    4242DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    … …  
    6060depcomp = $(SHELL) $(top_srcdir)/depcomp
    6161am__depfiles_maybe = depfiles
    62 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/quadtree.Po \
    63 @AMDEP_TRUE@    ./$(DEPDIR)/quadtree_node.Po \
    64 @AMDEP_TRUE@    ./$(DEPDIR)/spatial_separation.Po
    6562CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6663        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    … …  
    207204          esac; \
    208205        done; \
    209         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/spatial_separation/Makefile'; \
     206        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/spatial_separation/Makefile'; \
    210207        cd $(top_srcdir) && \
    211           $(AUTOMAKE) --foreign  src/lib/graphics/spatial_separation/Makefile
     208          $(AUTOMAKE) --gnu  src/lib/graphics/spatial_separation/Makefile
    212209.PRECIOUS: Makefile
    213210Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    249246@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    250247@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    251 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
    252 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     248@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    253249@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
    254250
    … …  
    257253@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    258254@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    259 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
    260 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     255@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    261256@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    262257uninstall-info-am:
    … …  
    360355
    361356distclean-generic:
    362         -rm -f $(CONFIG_CLEAN_FILES)
     357        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
    363358
    364359maintainer-clean-generic:
Note: See TracChangeset for help on using the changeset viewer.