Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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/subprojects/particles/Makefile.in

    r5527 r5558  
    6262        particles-gui_gtk.$(OBJEXT) particles-substring.$(OBJEXT) \
    6363        particles-load_param.$(OBJEXT) \
     64        particles-load_param_description.$(OBJEXT) \
    6465        particles-helper_functions.$(OBJEXT) \
    6566        particles-factory.$(OBJEXT) particles-color.$(OBJEXT) \
    … …  
    233234                   $(MAINSRCDIR)/lib/util/substring.cc \
    234235                   $(MAINSRCDIR)/util/loading/load_param.cc \
     236                   $(MAINSRCDIR)/util/loading/load_param_description.cc \
    235237                   $(MAINSRCDIR)/lib/util/helper_functions.cc \
    236238                   $(MAINSRCDIR)/util/loading/factory.cc \
    … …  
    251253          esac; \
    252254        done; \
    253         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/particles/Makefile'; \
     255        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/particles/Makefile'; \
    254256        cd $(top_srcdir) && \
    255           $(AUTOMAKE) --gnu  src/subprojects/particles/Makefile
     257          $(AUTOMAKE) --foreign  src/subprojects/particles/Makefile
    256258.PRECIOUS: Makefile
    257259Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    316318@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-light.Po@am__quote@
    317319@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-load_param.Po@am__quote@
     320@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-load_param_description.Po@am__quote@
    318321@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-null_parent.Po@am__quote@
    319322@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-p_node.Po@am__quote@
    … …  
    562565@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    563566@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-load_param.obj `if test -f '$(MAINSRCDIR)/util/loading/load_param.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/loading/load_param.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/loading/load_param.cc'; fi`
     567
     568particles-load_param_description.o: $(MAINSRCDIR)/util/loading/load_param_description.cc
     569@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-load_param_description.o -MD -MP -MF "$(DEPDIR)/particles-load_param_description.Tpo" -c -o particles-load_param_description.o `test -f '$(MAINSRCDIR)/util/loading/load_param_description.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/util/loading/load_param_description.cc; \
     570@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particles-load_param_description.Tpo" "$(DEPDIR)/particles-load_param_description.Po"; else rm -f "$(DEPDIR)/particles-load_param_description.Tpo"; exit 1; fi
     571@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/util/loading/load_param_description.cc' object='particles-load_param_description.o' libtool=no @AMDEPBACKSLASH@
     572@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     573@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-load_param_description.o `test -f '$(MAINSRCDIR)/util/loading/load_param_description.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/util/loading/load_param_description.cc
     574
     575particles-load_param_description.obj: $(MAINSRCDIR)/util/loading/load_param_description.cc
     576@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-load_param_description.obj -MD -MP -MF "$(DEPDIR)/particles-load_param_description.Tpo" -c -o particles-load_param_description.obj `if test -f '$(MAINSRCDIR)/util/loading/load_param_description.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/loading/load_param_description.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/loading/load_param_description.cc'; fi`; \
     577@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particles-load_param_description.Tpo" "$(DEPDIR)/particles-load_param_description.Po"; else rm -f "$(DEPDIR)/particles-load_param_description.Tpo"; exit 1; fi
     578@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/util/loading/load_param_description.cc' object='particles-load_param_description.obj' libtool=no @AMDEPBACKSLASH@
     579@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     580@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-load_param_description.obj `if test -f '$(MAINSRCDIR)/util/loading/load_param_description.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/loading/load_param_description.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/loading/load_param_description.cc'; fi`
    564581
    565582particles-helper_functions.o: $(MAINSRCDIR)/lib/util/helper_functions.cc
Note: See TracChangeset for help on using the changeset viewer.