Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5413 in orxonox.OLD for trunk/src/lib/tinyxml


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/tinyxml
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/tinyxml/Makefile.am

    r5410 r5413  
    11
    2 noinst_LTLIBRARIES = libtinyxml.la
     2noinst_LIBRARIES = libtinyxml.a
    33
    4 libtinyxml_la_SOURCES = tinyxml.cc \
     4libtinyxml_a_SOURCES = tinyxml.cc \
    55                       tinystr.cc \
    66                       tinyxmlerror.cc \

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

    r5412 r5413  
    1616
    1717
    18 SOURCES = $(libtinyxml_la_SOURCES)
     18SOURCES = $(libtinyxml_a_SOURCES)
    1919
    2020srcdir = @srcdir@
    … …  
    4949CONFIG_HEADER = $(top_builddir)/config.h
    5050CONFIG_CLEAN_FILES =
    51 LTLIBRARIES = $(noinst_LTLIBRARIES)
    52 libtinyxml_la_LIBADD =
    53 am_libtinyxml_la_OBJECTS = tinyxml.lo tinystr.lo tinyxmlerror.lo \
    54         tinyxmlparser.lo
    55 libtinyxml_la_OBJECTS = $(am_libtinyxml_la_OBJECTS)
     51LIBRARIES = $(noinst_LIBRARIES)
     52AR = ar
     53ARFLAGS = cru
     54libtinyxml_a_AR = $(AR) $(ARFLAGS)
     55libtinyxml_a_LIBADD =
     56am_libtinyxml_a_OBJECTS = tinyxml.$(OBJEXT) tinystr.$(OBJEXT) \
     57        tinyxmlerror.$(OBJEXT) tinyxmlparser.$(OBJEXT)
     58libtinyxml_a_OBJECTS = $(am_libtinyxml_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)/tinystr.Plo \
    60 @AMDEP_TRUE@    ./$(DEPDIR)/tinyxml.Plo \
    61 @AMDEP_TRUE@    ./$(DEPDIR)/tinyxmlerror.Plo \
    62 @AMDEP_TRUE@    ./$(DEPDIR)/tinyxmlparser.Plo
     62@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/tinystr.Po ./$(DEPDIR)/tinyxml.Po \
     63@AMDEP_TRUE@    ./$(DEPDIR)/tinyxmlerror.Po \
     64@AMDEP_TRUE@    ./$(DEPDIR)/tinyxmlparser.Po
    6365CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6466        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    65 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
    66         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
    67         $(AM_CXXFLAGS) $(CXXFLAGS)
    6867CXXLD = $(CXX)
    69 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
    70         $(AM_LDFLAGS) $(LDFLAGS) -o $@
    71 SOURCES = $(libtinyxml_la_SOURCES)
    72 DIST_SOURCES = $(libtinyxml_la_SOURCES)
     68CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     69        -o $@
     70SOURCES = $(libtinyxml_a_SOURCES)
     71DIST_SOURCES = $(libtinyxml_a_SOURCES)
    7372HEADERS = $(noinst_HEADERS)
    7473ETAGS = etags
    … …  
    7978AMDEP_TRUE = @AMDEP_TRUE@
    8079AMTAR = @AMTAR@
    81 AR = @AR@
    8280AUTOCONF = @AUTOCONF@
    8381AUTOHEADER = @AUTOHEADER@
    … …  
    9290CURL_LIBS = @CURL_LIBS@
    9391CXX = @CXX@
    94 CXXCPP = @CXXCPP@
    9592CXXDEPMODE = @CXXDEPMODE@
    9693CXXFLAGS = @CXXFLAGS@
    … …  
    104101DOXYGEN_FALSE = @DOXYGEN_FALSE@
    105102DOXYGEN_TRUE = @DOXYGEN_TRUE@
    106 ECHO = @ECHO@
    107103ECHO_C = @ECHO_C@
    108104ECHO_N = @ECHO_N@
    … …  
    110106EGREP = @EGREP@
    111107EXEEXT = @EXEEXT@
    112 F77 = @F77@
    113 FFLAGS = @FFLAGS@
    114108GPROF = @GPROF@
    115109GTK2_CFLAGS = @GTK2_CFLAGS@
    … …  
    126120LIBOBJS = @LIBOBJS@
    127121LIBS = @LIBS@
    128 LIBTOOL = @LIBTOOL@
    129 LN_S = @LN_S@
    130122LTLIBOBJS = @LTLIBOBJS@
    131123MAKEINFO = @MAKEINFO@
    … …  
    147139SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    148140VERSION = @VERSION@
    149 ac_ct_AR = @ac_ct_AR@
    150141ac_ct_CC = @ac_ct_CC@
    151142ac_ct_CXX = @ac_ct_CXX@
    152 ac_ct_F77 = @ac_ct_F77@
    153143ac_ct_RANLIB = @ac_ct_RANLIB@
    154144ac_ct_STRIP = @ac_ct_STRIP@
    … …  
    192182target_os = @target_os@
    193183target_vendor = @target_vendor@
    194 noinst_LTLIBRARIES = libtinyxml.la
    195 libtinyxml_la_SOURCES = tinyxml.cc \
     184noinst_LIBRARIES = libtinyxml.a
     185libtinyxml_a_SOURCES = tinyxml.cc \
    196186                       tinystr.cc \
    197187                       tinyxmlerror.cc \
    … …  
    204194
    205195.SUFFIXES:
    206 .SUFFIXES: .cc .lo .o .obj
     196.SUFFIXES: .cc .o .obj
    207197$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    208198        @for dep in $?; do \
    … …  
    235225        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    236226
    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 libtinyxml.la: $(libtinyxml_la_OBJECTS) $(libtinyxml_la_DEPENDENCIES)
    246         $(CXXLINK)  $(libtinyxml_la_LDFLAGS) $(libtinyxml_la_OBJECTS) $(libtinyxml_la_LIBADD) $(LIBS)
     227clean-noinstLIBRARIES:
     228        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
     229libtinyxml.a: $(libtinyxml_a_OBJECTS) $(libtinyxml_a_DEPENDENCIES)
     230        -rm -f libtinyxml.a
     231        $(libtinyxml_a_AR) libtinyxml.a $(libtinyxml_a_OBJECTS) $(libtinyxml_a_LIBADD)
     232        $(RANLIB) libtinyxml.a
    247233
    248234mostlyclean-compile:
    … …  
    252238        -rm -f *.tab.c
    253239
    254 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinystr.Plo@am__quote@
    255 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxml.Plo@am__quote@
    256 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxmlerror.Plo@am__quote@
    257 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxmlparser.Plo@am__quote@
     240@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinystr.Po@am__quote@
     241@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxml.Po@am__quote@
     242@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxmlerror.Po@am__quote@
     243@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxmlparser.Po@am__quote@
    258244
    259245.cc.o:
    … …  
    272258@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    273259@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    274 
    275 .cc.lo:
    276 @am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    277 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    278 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    279 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
    280 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    281 @am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
    282 
    283 mostlyclean-libtool:
    284         -rm -f *.lo
    285 
    286 clean-libtool:
    287         -rm -rf .libs _libs
    288 
    289 distclean-libtool:
    290         -rm -f libtool
    291260uninstall-info-am:
    292261
    … …  
    368337check-am: all-am
    369338check: check-am
    370 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
     339all-am: Makefile $(LIBRARIES) $(HEADERS)
    371340installdirs:
    372341install: install-am
    … …  
    396365clean: clean-am
    397366
    398 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
    399         mostlyclean-am
     367clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
    400368
    401369distclean: distclean-am
    … …  
    403371        -rm -f Makefile
    404372distclean-am: clean-am distclean-compile distclean-generic \
    405         distclean-libtool distclean-tags
     373        distclean-tags
    406374
    407375dvi: dvi-am
    … …  
    432400mostlyclean: mostlyclean-am
    433401
    434 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    435         mostlyclean-libtool
     402mostlyclean-am: mostlyclean-compile mostlyclean-generic
    436403
    437404pdf: pdf-am
    … …  
    446413
    447414.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    448         clean-libtool clean-noinstLTLIBRARIES ctags distclean \
    449         distclean-compile distclean-generic distclean-libtool \
    450         distclean-tags distdir dvi dvi-am html html-am info info-am \
    451         install install-am install-data install-data-am install-exec \
    452         install-exec-am install-info install-info-am install-man \
    453         install-strip installcheck installcheck-am installdirs \
    454         maintainer-clean maintainer-clean-generic mostlyclean \
    455         mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    456         pdf pdf-am ps ps-am tags uninstall uninstall-am \
    457         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
    458424
    459425# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.