Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5413 in orxonox.OLD for trunk/src/subprojects/testmain


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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/subprojects/testmain/Makefile.in

    r5412 r5413  
    6262CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6363        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    64 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
    65         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
    66         $(AM_CXXFLAGS) $(CXXFLAGS)
    6764CXXLD = $(CXX)
    68 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
    69         $(AM_LDFLAGS) $(LDFLAGS) -o $@
     65CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     66        -o $@
    7067SOURCES = $(testmain_SOURCES)
    7168DIST_SOURCES = $(testmain_SOURCES)
     
    7875AMDEP_TRUE = @AMDEP_TRUE@
    7976AMTAR = @AMTAR@
    80 AR = @AR@
    8177AUTOCONF = @AUTOCONF@
    8278AUTOHEADER = @AUTOHEADER@
     
    9187CURL_LIBS = @CURL_LIBS@
    9288CXX = @CXX@
    93 CXXCPP = @CXXCPP@
    9489CXXDEPMODE = @CXXDEPMODE@
    9590CXXFLAGS = @CXXFLAGS@
     
    10398DOXYGEN_FALSE = @DOXYGEN_FALSE@
    10499DOXYGEN_TRUE = @DOXYGEN_TRUE@
    105 ECHO = @ECHO@
    106100ECHO_C = @ECHO_C@
    107101ECHO_N = @ECHO_N@
     
    109103EGREP = @EGREP@
    110104EXEEXT = @EXEEXT@
    111 F77 = @F77@
    112 FFLAGS = @FFLAGS@
    113105GPROF = @GPROF@
    114106GTK2_CFLAGS = @GTK2_CFLAGS@
     
    125117LIBOBJS = @LIBOBJS@
    126118LIBS = @LIBS@
    127 LIBTOOL = @LIBTOOL@
    128 LN_S = @LN_S@
    129119LTLIBOBJS = @LTLIBOBJS@
    130120MAKEINFO = @MAKEINFO@
     
    146136SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    147137VERSION = @VERSION@
    148 ac_ct_AR = @ac_ct_AR@
    149138ac_ct_CC = @ac_ct_CC@
    150139ac_ct_CXX = @ac_ct_CXX@
    151 ac_ct_F77 = @ac_ct_F77@
    152140ac_ct_RANLIB = @ac_ct_RANLIB@
    153141ac_ct_STRIP = @ac_ct_STRIP@
     
    198186
    199187.SUFFIXES:
    200 .SUFFIXES: .cc .lo .o .obj
     188.SUFFIXES: .cc .o .obj
    201189$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    202190        @for dep in $?; do \
     
    234222          p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
    235223          if test -f $$p \
    236              || test -f $$p1 \
    237224          ; then \
    238225            f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
    239            echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
    240            $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
     226           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
     227           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
    241228          else :; fi; \
    242229        done
     
    251238
    252239clean-binPROGRAMS:
    253         @list='$(bin_PROGRAMS)'; for p in $$list; do \
    254           f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
    255           echo " rm -f $$p $$f"; \
    256           rm -f $$p $$f ; \
    257         done
     240        -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
    258241testmain$(EXEEXT): $(testmain_OBJECTS) $(testmain_DEPENDENCIES)
    259242        @rm -f testmain$(EXEEXT)
     
    283266@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    284267@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    285 
    286 .cc.lo:
    287 @am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    288 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    289 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    290 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
    291 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    292 @am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
    293 
    294 mostlyclean-libtool:
    295         -rm -f *.lo
    296 
    297 clean-libtool:
    298         -rm -rf .libs _libs
    299 
    300 distclean-libtool:
    301         -rm -f libtool
    302268uninstall-info-am:
    303269
     
    410376clean: clean-am
    411377
    412 clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
     378clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
    413379
    414380distclean: distclean-am
     
    416382        -rm -f Makefile
    417383distclean-am: clean-am distclean-compile distclean-generic \
    418         distclean-libtool distclean-tags
     384        distclean-tags
    419385
    420386dvi: dvi-am
     
    445411mostlyclean: mostlyclean-am
    446412
    447 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    448         mostlyclean-libtool
     413mostlyclean-am: mostlyclean-compile mostlyclean-generic
    449414
    450415pdf: pdf-am
     
    459424
    460425.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
    461         clean-generic clean-libtool ctags distclean distclean-compile \
    462         distclean-generic distclean-libtool distclean-tags distdir dvi \
    463         dvi-am html html-am info info-am install install-am \
    464         install-binPROGRAMS 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-binPROGRAMS uninstall-info-am
     426        clean-generic ctags distclean distclean-compile \
     427        distclean-generic distclean-tags distdir dvi dvi-am html \
     428        html-am info info-am install install-am install-binPROGRAMS \
     429        install-data install-data-am install-exec install-exec-am \
     430        install-info install-info-am install-man install-strip \
     431        installcheck installcheck-am installdirs maintainer-clean \
     432        maintainer-clean-generic mostlyclean mostlyclean-compile \
     433        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
     434        uninstall-am uninstall-binPROGRAMS uninstall-info-am
    471435
    472436include $(MAINSRCDIR)/defs/include_paths.am
Note: See TracChangeset for help on using the changeset viewer.