Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


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

Legend:

Unmodified
Added
Removed

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

    r5410 r5413  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LTLIBRARIES = libORXshell.la
     4noinst_LIBRARIES = libORXshell.a
    55
    6 libORXshell_la_SOURCES = shell.cc \
    7                          shell_buffer.cc \
    8                          shell_input.cc \
    9                          shell_command.cc \
    10                          shell_completion.cc
     6libORXshell_a_SOURCES = shell.cc \
     7                        shell_buffer.cc \
     8                        shell_input.cc \
     9                        shell_command.cc \
     10                        shell_completion.cc
    1111
    1212

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

    r5412 r5413  
    1616
    1717
    18 SOURCES = $(libORXshell_la_SOURCES)
     18SOURCES = $(libORXshell_a_SOURCES)
    1919
    2020srcdir = @srcdir@
    … …  
    4949CONFIG_HEADER = $(top_builddir)/config.h
    5050CONFIG_CLEAN_FILES =
    51 LTLIBRARIES = $(noinst_LTLIBRARIES)
    52 libORXshell_la_LIBADD =
    53 am_libORXshell_la_OBJECTS = shell.lo shell_buffer.lo shell_input.lo \
    54         shell_command.lo shell_completion.lo
    55 libORXshell_la_OBJECTS = $(am_libORXshell_la_OBJECTS)
     51LIBRARIES = $(noinst_LIBRARIES)
     52AR = ar
     53ARFLAGS = cru
     54libORXshell_a_AR = $(AR) $(ARFLAGS)
     55libORXshell_a_LIBADD =
     56am_libORXshell_a_OBJECTS = shell.$(OBJEXT) shell_buffer.$(OBJEXT) \
     57        shell_input.$(OBJEXT) shell_command.$(OBJEXT) \
     58        shell_completion.$(OBJEXT)
     59libORXshell_a_OBJECTS = $(am_libORXshell_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)/shell.Plo \
    60 @AMDEP_TRUE@    ./$(DEPDIR)/shell_buffer.Plo \
    61 @AMDEP_TRUE@    ./$(DEPDIR)/shell_command.Plo \
    62 @AMDEP_TRUE@    ./$(DEPDIR)/shell_completion.Plo \
    63 @AMDEP_TRUE@    ./$(DEPDIR)/shell_input.Plo
     63@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/shell.Po \
     64@AMDEP_TRUE@    ./$(DEPDIR)/shell_buffer.Po \
     65@AMDEP_TRUE@    ./$(DEPDIR)/shell_command.Po \
     66@AMDEP_TRUE@    ./$(DEPDIR)/shell_completion.Po \
     67@AMDEP_TRUE@    ./$(DEPDIR)/shell_input.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 = $(libORXshell_la_SOURCES)
    73 DIST_SOURCES = $(libORXshell_la_SOURCES)
     71CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     72        -o $@
     73SOURCES = $(libORXshell_a_SOURCES)
     74DIST_SOURCES = $(libORXshell_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 = libORXshell.la
    197 libORXshell_la_SOURCES = shell.cc \
    198                          shell_buffer.cc \
    199                          shell_input.cc \
    200                          shell_command.cc \
    201                          shell_completion.cc
     188noinst_LIBRARIES = libORXshell.a
     189libORXshell_a_SOURCES = shell.cc \
     190                        shell_buffer.cc \
     191                        shell_input.cc \
     192                        shell_command.cc \
     193                        shell_completion.cc
    202194
    203195noinst_HEADERS = shell.h \
    … …  
    210202
    211203.SUFFIXES:
    212 .SUFFIXES: .cc .lo .o .obj
     204.SUFFIXES: .cc .o .obj
    213205$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    214206        @for dep in $?; do \
    … …  
    241233        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    242234
    243 clean-noinstLTLIBRARIES:
    244         -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
    245         @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
    246           dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    247           test "$$dir" != "$$p" || dir=.; \
    248           echo "rm -f \"$${dir}/so_locations\""; \
    249           rm -f "$${dir}/so_locations"; \
    250         done
    251 libORXshell.la: $(libORXshell_la_OBJECTS) $(libORXshell_la_DEPENDENCIES)
    252         $(CXXLINK)  $(libORXshell_la_LDFLAGS) $(libORXshell_la_OBJECTS) $(libORXshell_la_LIBADD) $(LIBS)
     235clean-noinstLIBRARIES:
     236        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
     237libORXshell.a: $(libORXshell_a_OBJECTS) $(libORXshell_a_DEPENDENCIES)
     238        -rm -f libORXshell.a
     239        $(libORXshell_a_AR) libORXshell.a $(libORXshell_a_OBJECTS) $(libORXshell_a_LIBADD)
     240        $(RANLIB) libORXshell.a
    253241
    254242mostlyclean-compile:
    … …  
    258246        -rm -f *.tab.c
    259247
    260 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell.Plo@am__quote@
    261 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_buffer.Plo@am__quote@
    262 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_command.Plo@am__quote@
    263 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_completion.Plo@am__quote@
    264 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_input.Plo@am__quote@
     248@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell.Po@am__quote@
     249@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_buffer.Po@am__quote@
     250@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_command.Po@am__quote@
     251@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_completion.Po@am__quote@
     252@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_input.Po@am__quote@
    265253
    266254.cc.o:
    … …  
    279267@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    280268@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    281 
    282 .cc.lo:
    283 @am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    284 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    285 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    286 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
    287 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    288 @am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
    289 
    290 mostlyclean-libtool:
    291         -rm -f *.lo
    292 
    293 clean-libtool:
    294         -rm -rf .libs _libs
    295 
    296 distclean-libtool:
    297         -rm -f libtool
    298269uninstall-info-am:
    299270
    … …  
    375346check-am: all-am
    376347check: check-am
    377 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
     348all-am: Makefile $(LIBRARIES) $(HEADERS)
    378349installdirs:
    379350install: install-am
    … …  
    403374clean: clean-am
    404375
    405 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
    406         mostlyclean-am
     376clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
    407377
    408378distclean: distclean-am
    … …  
    410380        -rm -f Makefile
    411381distclean-am: clean-am distclean-compile distclean-generic \
    412         distclean-libtool distclean-tags
     382        distclean-tags
    413383
    414384dvi: dvi-am
    … …  
    439409mostlyclean: mostlyclean-am
    440410
    441 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    442         mostlyclean-libtool
     411mostlyclean-am: mostlyclean-compile mostlyclean-generic
    443412
    444413pdf: pdf-am
    … …  
    453422
    454423.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    455         clean-libtool clean-noinstLTLIBRARIES ctags distclean \
    456         distclean-compile distclean-generic distclean-libtool \
    457         distclean-tags distdir dvi dvi-am html html-am info info-am \
    458         install install-am install-data install-data-am install-exec \
    459         install-exec-am install-info install-info-am install-man \
    460         install-strip installcheck installcheck-am installdirs \
    461         maintainer-clean maintainer-clean-generic mostlyclean \
    462         mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    463         pdf pdf-am ps ps-am tags uninstall uninstall-am \
    464         uninstall-info-am
     424        clean-noinstLIBRARIES ctags distclean distclean-compile \
     425        distclean-generic distclean-tags distdir dvi dvi-am html \
     426        html-am info info-am install install-am install-data \
     427        install-data-am install-exec install-exec-am install-info \
     428        install-info-am install-man install-strip installcheck \
     429        installcheck-am installdirs maintainer-clean \
     430        maintainer-clean-generic mostlyclean mostlyclean-compile \
     431        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
     432        uninstall-am uninstall-info-am
    465433
    466434include $(MAINSRCDIR)/defs/include_paths.am
Note: See TracChangeset for help on using the changeset viewer.