Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


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

Legend:

Unmodified
Added
Removed

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

    r5410 r5413  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LTLIBRARIES = libORXimporter.la
     4noinst_LIBRARIES = libORXimporter.a
    55
    6 libORXimporter_la_SOURCES = model.cc \
    7                             objModel.cc \
    8                             primitive_model.cc \
    9                             md2Model.cc \
    10                             material.cc \
    11                             texture.cc
     6libORXimporter_a_SOURCES = model.cc \
     7                           objModel.cc \
     8                           primitive_model.cc \
     9                           md2Model.cc \
     10                           material.cc \
     11                           texture.cc
    1212
    1313

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

    r5412 r5413  
    1616
    1717
    18 SOURCES = $(libORXimporter_la_SOURCES)
     18SOURCES = $(libORXimporter_a_SOURCES)
    1919
    2020srcdir = @srcdir@
    … …  
    4949CONFIG_HEADER = $(top_builddir)/config.h
    5050CONFIG_CLEAN_FILES =
    51 LTLIBRARIES = $(noinst_LTLIBRARIES)
    52 libORXimporter_la_LIBADD =
    53 am_libORXimporter_la_OBJECTS = model.lo objModel.lo primitive_model.lo \
    54         md2Model.lo material.lo texture.lo
    55 libORXimporter_la_OBJECTS = $(am_libORXimporter_la_OBJECTS)
     51LIBRARIES = $(noinst_LIBRARIES)
     52AR = ar
     53ARFLAGS = cru
     54libORXimporter_a_AR = $(AR) $(ARFLAGS)
     55libORXimporter_a_LIBADD =
     56am_libORXimporter_a_OBJECTS = model.$(OBJEXT) objModel.$(OBJEXT) \
     57        primitive_model.$(OBJEXT) md2Model.$(OBJEXT) \
     58        material.$(OBJEXT) texture.$(OBJEXT)
     59libORXimporter_a_OBJECTS = $(am_libORXimporter_a_OBJECTS)
    5660DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    5761depcomp = $(SHELL) $(top_srcdir)/depcomp
    5862am__depfiles_maybe = depfiles
    59 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/material.Plo \
    60 @AMDEP_TRUE@    ./$(DEPDIR)/md2Model.Plo ./$(DEPDIR)/model.Plo \
    61 @AMDEP_TRUE@    ./$(DEPDIR)/objModel.Plo \
    62 @AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Plo \
    63 @AMDEP_TRUE@    ./$(DEPDIR)/texture.Plo
     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
    6468CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6569        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    66 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
    67         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
    68         $(AM_CXXFLAGS) $(CXXFLAGS)
    6970CXXLD = $(CXX)
    70 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
    71         $(AM_LDFLAGS) $(LDFLAGS) -o $@
    72 SOURCES = $(libORXimporter_la_SOURCES)
    73 DIST_SOURCES = $(libORXimporter_la_SOURCES)
     71CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     72        -o $@
     73SOURCES = $(libORXimporter_a_SOURCES)
     74DIST_SOURCES = $(libORXimporter_a_SOURCES)
    7475HEADERS = $(noinst_HEADERS)
    7576ETAGS = etags
    … …  
    8081AMDEP_TRUE = @AMDEP_TRUE@
    8182AMTAR = @AMTAR@
    82 AR = @AR@
    8383AUTOCONF = @AUTOCONF@
    8484AUTOHEADER = @AUTOHEADER@
    … …  
    9393CURL_LIBS = @CURL_LIBS@
    9494CXX = @CXX@
    95 CXXCPP = @CXXCPP@
    9695CXXDEPMODE = @CXXDEPMODE@
    9796CXXFLAGS = @CXXFLAGS@
    … …  
    105104DOXYGEN_FALSE = @DOXYGEN_FALSE@
    106105DOXYGEN_TRUE = @DOXYGEN_TRUE@
    107 ECHO = @ECHO@
    108106ECHO_C = @ECHO_C@
    109107ECHO_N = @ECHO_N@
    … …  
    111109EGREP = @EGREP@
    112110EXEEXT = @EXEEXT@
    113 F77 = @F77@
    114 FFLAGS = @FFLAGS@
    115111GPROF = @GPROF@
    116112GTK2_CFLAGS = @GTK2_CFLAGS@
    … …  
    127123LIBOBJS = @LIBOBJS@
    128124LIBS = @LIBS@
    129 LIBTOOL = @LIBTOOL@
    130 LN_S = @LN_S@
    131125LTLIBOBJS = @LTLIBOBJS@
    132126MAKEINFO = @MAKEINFO@
    … …  
    148142SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    149143VERSION = @VERSION@
    150 ac_ct_AR = @ac_ct_AR@
    151144ac_ct_CC = @ac_ct_CC@
    152145ac_ct_CXX = @ac_ct_CXX@
    153 ac_ct_F77 = @ac_ct_F77@
    154146ac_ct_RANLIB = @ac_ct_RANLIB@
    155147ac_ct_STRIP = @ac_ct_STRIP@
    … …  
    194186target_vendor = @target_vendor@
    195187MAINSRCDIR = ../../..
    196 noinst_LTLIBRARIES = libORXimporter.la
    197 libORXimporter_la_SOURCES = model.cc \
    198                             objModel.cc \
    199                             primitive_model.cc \
    200                             md2Model.cc \
    201                             material.cc \
    202                             texture.cc
     188noinst_LIBRARIES = libORXimporter.a
     189libORXimporter_a_SOURCES = model.cc \
     190                           objModel.cc \
     191                           primitive_model.cc \
     192                           md2Model.cc \
     193                           material.cc \
     194                           texture.cc
    203195
    204196noinst_HEADERS = abstract_model.h \
    … …  
    215207
    216208.SUFFIXES:
    217 .SUFFIXES: .cc .lo .o .obj
     209.SUFFIXES: .cc .o .obj
    218210$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    219211        @for dep in $?; do \
    … …  
    246238        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    247239
    248 clean-noinstLTLIBRARIES:
    249         -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
    250         @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
    251           dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    252           test "$$dir" != "$$p" || dir=.; \
    253           echo "rm -f \"$${dir}/so_locations\""; \
    254           rm -f "$${dir}/so_locations"; \
    255         done
    256 libORXimporter.la: $(libORXimporter_la_OBJECTS) $(libORXimporter_la_DEPENDENCIES)
    257         $(CXXLINK)  $(libORXimporter_la_LDFLAGS) $(libORXimporter_la_OBJECTS) $(libORXimporter_la_LIBADD) $(LIBS)
     240clean-noinstLIBRARIES:
     241        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
     242libORXimporter.a: $(libORXimporter_a_OBJECTS) $(libORXimporter_a_DEPENDENCIES)
     243        -rm -f libORXimporter.a
     244        $(libORXimporter_a_AR) libORXimporter.a $(libORXimporter_a_OBJECTS) $(libORXimporter_a_LIBADD)
     245        $(RANLIB) libORXimporter.a
    258246
    259247mostlyclean-compile:
    … …  
    263251        -rm -f *.tab.c
    264252
    265 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Plo@am__quote@
    266 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md2Model.Plo@am__quote@
    267 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Plo@am__quote@
    268 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objModel.Plo@am__quote@
    269 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primitive_model.Plo@am__quote@
    270 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Plo@am__quote@
     253@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
     254@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md2Model.Po@am__quote@
     255@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@
     256@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objModel.Po@am__quote@
     257@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primitive_model.Po@am__quote@
     258@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@
    271259
    272260.cc.o:
    … …  
    285273@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    286274@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    287 
    288 .cc.lo:
    289 @am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    290 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    291 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    292 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
    293 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    294 @am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
    295 
    296 mostlyclean-libtool:
    297         -rm -f *.lo
    298 
    299 clean-libtool:
    300         -rm -rf .libs _libs
    301 
    302 distclean-libtool:
    303         -rm -f libtool
    304275uninstall-info-am:
    305276
    … …  
    381352check-am: all-am
    382353check: check-am
    383 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
     354all-am: Makefile $(LIBRARIES) $(HEADERS)
    384355installdirs:
    385356install: install-am
    … …  
    409380clean: clean-am
    410381
    411 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
    412         mostlyclean-am
     382clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
    413383
    414384distclean: distclean-am
    … …  
    416386        -rm -f Makefile
    417387distclean-am: clean-am distclean-compile distclean-generic \
    418         distclean-libtool distclean-tags
     388        distclean-tags
    419389
    420390dvi: dvi-am
    … …  
    445415mostlyclean: mostlyclean-am
    446416
    447 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    448         mostlyclean-libtool
     417mostlyclean-am: mostlyclean-compile mostlyclean-generic
    449418
    450419pdf: pdf-am
    … …  
    459428
    460429.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    461         clean-libtool clean-noinstLTLIBRARIES ctags distclean \
    462         distclean-compile distclean-generic distclean-libtool \
    463         distclean-tags distdir dvi dvi-am html html-am info info-am \
    464         install install-am install-data install-data-am install-exec \
    465         install-exec-am install-info install-info-am install-man \
    466         install-strip installcheck installcheck-am installdirs \
    467         maintainer-clean maintainer-clean-generic mostlyclean \
    468         mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    469         pdf pdf-am ps ps-am tags uninstall uninstall-am \
    470         uninstall-info-am
     430        clean-noinstLIBRARIES ctags distclean distclean-compile \
     431        distclean-generic distclean-tags distdir dvi dvi-am html \
     432        html-am info info-am install install-am install-data \
     433        install-data-am install-exec install-exec-am install-info \
     434        install-info-am install-man install-strip installcheck \
     435        installcheck-am installdirs maintainer-clean \
     436        maintainer-clean-generic mostlyclean mostlyclean-compile \
     437        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
     438        uninstall-am uninstall-info-am
    471439
    472440include $(MAINSRCDIR)/defs/include_paths.am
Note: See TracChangeset for help on using the changeset viewer.