Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5558 in orxonox.OLD for branches/world_entities/src/Makefile.in


Ignore:
Timestamp:
Nov 13, 2005, 3:10:49 PM (19 years ago)
Author:
bensch
Message:

orxonox/branches/world_entities: merged the Trunk to the world_entities branche
merged with command
svn merge -r5516:HEAD ../trunk/ world_entities/
no conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/world_entities/src/Makefile.in

    r5527 r5558  
    6767        orxonox-aiming_turret.$(OBJEXT) orxonox-test_bullet.$(OBJEXT) \
    6868        orxonox-rocket.$(OBJEXT) orxonox-laser.$(OBJEXT) \
    69         orxonox-crosshair.$(OBJEXT) orxonox-power_up.$(OBJEXT) \
    70         orxonox-turret_power_up.$(OBJEXT) \
     69        orxonox-aim.$(OBJEXT) orxonox-crosshair.$(OBJEXT) \
     70        orxonox-power_up.$(OBJEXT) orxonox-turret_power_up.$(OBJEXT) \
    7171        orxonox-laser_power_up.$(OBJEXT) orxonox-benchmark.$(OBJEXT)
    7272orxonox_OBJECTS = $(am_orxonox_OBJECTS)
    … …  
    9191ETAGS = etags
    9292CTAGS = ctags
    93 DIST_SUBDIRS = lib util subprojects .
     93DIST_SUBDIRS = lib util . subprojects
    9494DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    9595ACLOCAL = @ACLOCAL@
    … …  
    261261                  world_entities/weapons/rocket.cc \
    262262                  world_entities/weapons/laser.cc \
     263                  world_entities/weapons/aim.cc \
    263264                  world_entities/weapons/crosshair.cc \
    264265                  world_entities/power_ups/power_up.cc \
    … …  
    295296                 world_entities/weapons/rocket.h \
    296297                 world_entities/weapons/laser.h \
     298                 world_entities/weapons/aim.h \
    297299                 world_entities/weapons/crosshair.h \
    298300                 world_entities/power_ups/power_up.h \
    … …  
    326328SUBDIRS = lib \
    327329          util \
    328           $(SUB_PROGS) \
    329           .
     330          . \
     331          $(SUB_PROGS)
    330332
    331333all: all-recursive
    … …  
    342344          esac; \
    343345        done; \
    344         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
     346        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
    345347        cd $(top_srcdir) && \
    346           $(AUTOMAKE) --gnu  src/Makefile
     348          $(AUTOMAKE) --foreign  src/Makefile
    347349.PRECIOUS: Makefile
    348350Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    395397        -rm -f *.tab.c
    396398
     399@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-aim.Po@am__quote@
    397400@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-aiming_turret.Po@am__quote@
    398401@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-benchmark.Po@am__quote@
    … …  
    789792@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    790793@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-laser.obj `if test -f 'world_entities/weapons/laser.cc'; then $(CYGPATH_W) 'world_entities/weapons/laser.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/laser.cc'; fi`
     794
     795orxonox-aim.o: world_entities/weapons/aim.cc
     796@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-aim.o -MD -MP -MF "$(DEPDIR)/orxonox-aim.Tpo" -c -o orxonox-aim.o `test -f 'world_entities/weapons/aim.cc' || echo '$(srcdir)/'`world_entities/weapons/aim.cc; \
     797@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-aim.Tpo" "$(DEPDIR)/orxonox-aim.Po"; else rm -f "$(DEPDIR)/orxonox-aim.Tpo"; exit 1; fi
     798@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/aim.cc' object='orxonox-aim.o' libtool=no @AMDEPBACKSLASH@
     799@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     800@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-aim.o `test -f 'world_entities/weapons/aim.cc' || echo '$(srcdir)/'`world_entities/weapons/aim.cc
     801
     802orxonox-aim.obj: world_entities/weapons/aim.cc
     803@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-aim.obj -MD -MP -MF "$(DEPDIR)/orxonox-aim.Tpo" -c -o orxonox-aim.obj `if test -f 'world_entities/weapons/aim.cc'; then $(CYGPATH_W) 'world_entities/weapons/aim.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/aim.cc'; fi`; \
     804@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-aim.Tpo" "$(DEPDIR)/orxonox-aim.Po"; else rm -f "$(DEPDIR)/orxonox-aim.Tpo"; exit 1; fi
     805@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/aim.cc' object='orxonox-aim.obj' libtool=no @AMDEPBACKSLASH@
     806@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     807@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-aim.obj `if test -f 'world_entities/weapons/aim.cc'; then $(CYGPATH_W) 'world_entities/weapons/aim.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/aim.cc'; fi`
    791808
    792809orxonox-crosshair.o: world_entities/weapons/crosshair.cc
Note: See TracChangeset for help on using the changeset viewer.