Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5413 in orxonox.OLD for trunk/src/lib/graphics/spatial_separation


Ignore:
Timestamp:
Oct 20, 2005, 11:42:08 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: reverted to old revision 5409, removing the LIBTOOL-stuff with command:
svn merge . . -r HEAD:5409

Reason:
Timing:
Default:

real 1m1.111s
user 1m31.534s
sys 0m6.903s

LIBTOOL:

real 2m21.384s
user 3m12.141s
sys 0m36.896s

→ compileTime doubled

Location:
trunk/src/lib/graphics/spatial_separation
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r5410 r5413  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LTLIBRARIES = libORXquadtree.la
     4noinst_LIBRARIES = libORXquadtree.a
    55
    6 libORXquadtree_la_SOURCES = quadtree.cc \
    7                             quadtree_node.cc \
    8                             spatial_separation.cc
     6libORXquadtree_a_SOURCES = quadtree.cc \
     7                           quadtree_node.cc \
     8                           spatial_separation.cc
    99
    1010noinst_HEADERS =  quadtree.h \

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

    r5412 r5413  
    1616
    1717
    18 SOURCES = $(libORXquadtree_la_SOURCES)
     18SOURCES = $(libORXquadtree_a_SOURCES)
    1919
    2020srcdir = @srcdir@
    … …  
    4949CONFIG_HEADER = $(top_builddir)/config.h
    5050CONFIG_CLEAN_FILES =
    51 LTLIBRARIES = $(noinst_LTLIBRARIES)
    52 libORXquadtree_la_LIBADD =
    53 am_libORXquadtree_la_OBJECTS = quadtree.lo quadtree_node.lo \
    54         spatial_separation.lo
    55 libORXquadtree_la_OBJECTS = $(am_libORXquadtree_la_OBJECTS)
     51LIBRARIES = $(noinst_LIBRARIES)
     52AR = ar
     53ARFLAGS = cru
     54libORXquadtree_a_AR = $(AR) $(ARFLAGS)
     55libORXquadtree_a_LIBADD =
     56am_libORXquadtree_a_OBJECTS = quadtree.$(OBJEXT) \
     57        quadtree_node.$(OBJEXT) spatial_separation.$(OBJEXT)
     58libORXquadtree_a_OBJECTS = $(am_libORXquadtree_a_OBJECTS)
    5659DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    5760depcomp = $(SHELL) $(top_srcdir)/depcomp
    5861am__depfiles_maybe = depfiles
    59 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/quadtree.Plo \
    60 @AMDEP_TRUE@    ./$(DEPDIR)/quadtree_node.Plo \
    61 @AMDEP_TRUE@    ./$(DEPDIR)/spatial_separation.Plo
     62@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/quadtree.Po \
     63@AMDEP_TRUE@    ./$(DEPDIR)/quadtree_node.Po \
     64@AMDEP_TRUE@    ./$(DEPDIR)/spatial_separation.Po
    6265CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6366        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    64 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
    65         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
    66         $(AM_CXXFLAGS) $(CXXFLAGS)
    6767CXXLD = $(CXX)
    68 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
    69         $(AM_LDFLAGS) $(LDFLAGS) -o $@
    70 SOURCES = $(libORXquadtree_la_SOURCES)
    71 DIST_SOURCES = $(libORXquadtree_la_SOURCES)
     68CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     69        -o $@
     70SOURCES = $(libORXquadtree_a_SOURCES)
     71DIST_SOURCES = $(libORXquadtree_a_SOURCES)
    7272HEADERS = $(noinst_HEADERS)
    7373ETAGS = etags
    … …  
    7878AMDEP_TRUE = @AMDEP_TRUE@
    7979AMTAR = @AMTAR@
    80 AR = @AR@
    8180AUTOCONF = @AUTOCONF@
    8281AUTOHEADER = @AUTOHEADER@
    … …  
    9190CURL_LIBS = @CURL_LIBS@
    9291CXX = @CXX@
    93 CXXCPP = @CXXCPP@
    9492CXXDEPMODE = @CXXDEPMODE@
    9593CXXFLAGS = @CXXFLAGS@
    … …  
    103101DOXYGEN_FALSE = @DOXYGEN_FALSE@
    104102DOXYGEN_TRUE = @DOXYGEN_TRUE@
    105 ECHO = @ECHO@
    106103ECHO_C = @ECHO_C@
    107104ECHO_N = @ECHO_N@
    … …  
    109106EGREP = @EGREP@
    110107EXEEXT = @EXEEXT@
    111 F77 = @F77@
    112 FFLAGS = @FFLAGS@
    113108GPROF = @GPROF@
    114109GTK2_CFLAGS = @GTK2_CFLAGS@
    … …  
    125120LIBOBJS = @LIBOBJS@
    126121LIBS = @LIBS@
    127 LIBTOOL = @LIBTOOL@
    128 LN_S = @LN_S@
    129122LTLIBOBJS = @LTLIBOBJS@
    130123MAKEINFO = @MAKEINFO@
    … …  
    146139SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    147140VERSION = @VERSION@
    148 ac_ct_AR = @ac_ct_AR@
    149141ac_ct_CC = @ac_ct_CC@
    150142ac_ct_CXX = @ac_ct_CXX@
    151 ac_ct_F77 = @ac_ct_F77@
    152143ac_ct_RANLIB = @ac_ct_RANLIB@
    153144ac_ct_STRIP = @ac_ct_STRIP@
    … …  
    192183target_vendor = @target_vendor@
    193184MAINSRCDIR = ../../..
    194 noinst_LTLIBRARIES = libORXquadtree.la
    195 libORXquadtree_la_SOURCES = quadtree.cc \
    196                             quadtree_node.cc \
    197                             spatial_separation.cc
     185noinst_LIBRARIES = libORXquadtree.a
     186libORXquadtree_a_SOURCES = quadtree.cc \
     187                           quadtree_node.cc \
     188                           spatial_separation.cc
    198189
    199190noinst_HEADERS = quadtree.h \
    … …  
    204195
    205196.SUFFIXES:
    206 .SUFFIXES: .cc .lo .o .obj
     197.SUFFIXES: .cc .o .obj
    207198$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    208199        @for dep in $?; do \
    … …  
    235226        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    236227
    237 clean-noinstLTLIBRARIES:
    238         -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
    239         @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
    240           dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    241           test "$$dir" != "$$p" || dir=.; \
    242           echo "rm -f \"$${dir}/so_locations\""; \
    243           rm -f "$${dir}/so_locations"; \
    244         done
    245 libORXquadtree.la: $(libORXquadtree_la_OBJECTS) $(libORXquadtree_la_DEPENDENCIES)
    246         $(CXXLINK)  $(libORXquadtree_la_LDFLAGS) $(libORXquadtree_la_OBJECTS) $(libORXquadtree_la_LIBADD) $(LIBS)
     228clean-noinstLIBRARIES:
     229        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
     230libORXquadtree.a: $(libORXquadtree_a_OBJECTS) $(libORXquadtree_a_DEPENDENCIES)
     231        -rm -f libORXquadtree.a
     232        $(libORXquadtree_a_AR) libORXquadtree.a $(libORXquadtree_a_OBJECTS) $(libORXquadtree_a_LIBADD)
     233        $(RANLIB) libORXquadtree.a
    247234
    248235mostlyclean-compile:
    … …  
    252239        -rm -f *.tab.c
    253240
    254 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quadtree.Plo@am__quote@
    255 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quadtree_node.Plo@am__quote@
    256 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spatial_separation.Plo@am__quote@
     241@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quadtree.Po@am__quote@
     242@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quadtree_node.Po@am__quote@
     243@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spatial_separation.Po@am__quote@
    257244
    258245.cc.o:
    … …  
    271258@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    272259@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    273 
    274 .cc.lo:
    275 @am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    276 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    277 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    278 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
    279 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    280 @am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
    281 
    282 mostlyclean-libtool:
    283         -rm -f *.lo
    284 
    285 clean-libtool:
    286         -rm -rf .libs _libs
    287 
    288 distclean-libtool:
    289         -rm -f libtool
    290260uninstall-info-am:
    291261
    … …  
    367337check-am: all-am
    368338check: check-am
    369 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
     339all-am: Makefile $(LIBRARIES) $(HEADERS)
    370340installdirs:
    371341install: install-am
    … …  
    395365clean: clean-am
    396366
    397 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
    398         mostlyclean-am
     367clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
    399368
    400369distclean: distclean-am
    … …  
    402371        -rm -f Makefile
    403372distclean-am: clean-am distclean-compile distclean-generic \
    404         distclean-libtool distclean-tags
     373        distclean-tags
    405374
    406375dvi: dvi-am
    … …  
    431400mostlyclean: mostlyclean-am
    432401
    433 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    434         mostlyclean-libtool
     402mostlyclean-am: mostlyclean-compile mostlyclean-generic
    435403
    436404pdf: pdf-am
    … …  
    445413
    446414.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    447         clean-libtool clean-noinstLTLIBRARIES ctags distclean \
    448         distclean-compile distclean-generic distclean-libtool \
    449         distclean-tags distdir dvi dvi-am html html-am info info-am \
    450         install install-am install-data install-data-am install-exec \
    451         install-exec-am install-info install-info-am install-man \
    452         install-strip installcheck installcheck-am installdirs \
    453         maintainer-clean maintainer-clean-generic mostlyclean \
    454         mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    455         pdf pdf-am ps ps-am tags uninstall uninstall-am \
    456         uninstall-info-am
     415        clean-noinstLIBRARIES ctags distclean distclean-compile \
     416        distclean-generic distclean-tags distdir dvi dvi-am html \
     417        html-am info info-am install install-am install-data \
     418        install-data-am install-exec install-exec-am install-info \
     419        install-info-am install-man install-strip installcheck \
     420        installcheck-am installdirs maintainer-clean \
     421        maintainer-clean-generic mostlyclean mostlyclean-compile \
     422        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
     423        uninstall-am uninstall-info-am
    457424
    458425include $(MAINSRCDIR)/defs/include_paths.am
Note: See TracChangeset for help on using the changeset viewer.