Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


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

Legend:

Unmodified
Added
Removed

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

    r5410 r5413  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LTLIBRARIES = libORXevent.la
     4noinst_LIBRARIES = libORXevent.a
    55
    6 libORXevent_la_SOURCES = event.cc \
    7                          event_handler.cc \
    8                          event_listener.cc \
    9                          key_mapper.cc \
    10                          key_names.cc
     6libORXevent_a_SOURCES = event.cc \
     7                        event_handler.cc \
     8                        event_listener.cc \
     9                        key_mapper.cc \
     10                        key_names.cc
    1111
    1212

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

    r5412 r5413  
    1616
    1717
    18 SOURCES = $(libORXevent_la_SOURCES)
     18SOURCES = $(libORXevent_a_SOURCES)
    1919
    2020srcdir = @srcdir@
    … …  
    4949CONFIG_HEADER = $(top_builddir)/config.h
    5050CONFIG_CLEAN_FILES =
    51 LTLIBRARIES = $(noinst_LTLIBRARIES)
    52 libORXevent_la_LIBADD =
    53 am_libORXevent_la_OBJECTS = event.lo event_handler.lo \
    54         event_listener.lo key_mapper.lo key_names.lo
    55 libORXevent_la_OBJECTS = $(am_libORXevent_la_OBJECTS)
     51LIBRARIES = $(noinst_LIBRARIES)
     52AR = ar
     53ARFLAGS = cru
     54libORXevent_a_AR = $(AR) $(ARFLAGS)
     55libORXevent_a_LIBADD =
     56am_libORXevent_a_OBJECTS = event.$(OBJEXT) event_handler.$(OBJEXT) \
     57        event_listener.$(OBJEXT) key_mapper.$(OBJEXT) \
     58        key_names.$(OBJEXT)
     59libORXevent_a_OBJECTS = $(am_libORXevent_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)/event.Plo \
    60 @AMDEP_TRUE@    ./$(DEPDIR)/event_handler.Plo \
    61 @AMDEP_TRUE@    ./$(DEPDIR)/event_listener.Plo \
    62 @AMDEP_TRUE@    ./$(DEPDIR)/key_mapper.Plo \
    63 @AMDEP_TRUE@    ./$(DEPDIR)/key_names.Plo
     63@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/event.Po \
     64@AMDEP_TRUE@    ./$(DEPDIR)/event_handler.Po \
     65@AMDEP_TRUE@    ./$(DEPDIR)/event_listener.Po \
     66@AMDEP_TRUE@    ./$(DEPDIR)/key_mapper.Po ./$(DEPDIR)/key_names.Po
    6467CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6568        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    66 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
    67         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
    68         $(AM_CXXFLAGS) $(CXXFLAGS)
    6969CXXLD = $(CXX)
    70 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
    71         $(AM_LDFLAGS) $(LDFLAGS) -o $@
    72 SOURCES = $(libORXevent_la_SOURCES)
    73 DIST_SOURCES = $(libORXevent_la_SOURCES)
     70CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     71        -o $@
     72SOURCES = $(libORXevent_a_SOURCES)
     73DIST_SOURCES = $(libORXevent_a_SOURCES)
    7474HEADERS = $(noinst_HEADERS)
    7575ETAGS = etags
    … …  
    8080AMDEP_TRUE = @AMDEP_TRUE@
    8181AMTAR = @AMTAR@
    82 AR = @AR@
    8382AUTOCONF = @AUTOCONF@
    8483AUTOHEADER = @AUTOHEADER@
    … …  
    9392CURL_LIBS = @CURL_LIBS@
    9493CXX = @CXX@
    95 CXXCPP = @CXXCPP@
    9694CXXDEPMODE = @CXXDEPMODE@
    9795CXXFLAGS = @CXXFLAGS@
    … …  
    105103DOXYGEN_FALSE = @DOXYGEN_FALSE@
    106104DOXYGEN_TRUE = @DOXYGEN_TRUE@
    107 ECHO = @ECHO@
    108105ECHO_C = @ECHO_C@
    109106ECHO_N = @ECHO_N@
    … …  
    111108EGREP = @EGREP@
    112109EXEEXT = @EXEEXT@
    113 F77 = @F77@
    114 FFLAGS = @FFLAGS@
    115110GPROF = @GPROF@
    116111GTK2_CFLAGS = @GTK2_CFLAGS@
    … …  
    127122LIBOBJS = @LIBOBJS@
    128123LIBS = @LIBS@
    129 LIBTOOL = @LIBTOOL@
    130 LN_S = @LN_S@
    131124LTLIBOBJS = @LTLIBOBJS@
    132125MAKEINFO = @MAKEINFO@
    … …  
    148141SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    149142VERSION = @VERSION@
    150 ac_ct_AR = @ac_ct_AR@
    151143ac_ct_CC = @ac_ct_CC@
    152144ac_ct_CXX = @ac_ct_CXX@
    153 ac_ct_F77 = @ac_ct_F77@
    154145ac_ct_RANLIB = @ac_ct_RANLIB@
    155146ac_ct_STRIP = @ac_ct_STRIP@
    … …  
    194185target_vendor = @target_vendor@
    195186MAINSRCDIR = ../..
    196 noinst_LTLIBRARIES = libORXevent.la
    197 libORXevent_la_SOURCES = event.cc \
    198                          event_handler.cc \
    199                          event_listener.cc \
    200                          key_mapper.cc \
    201                          key_names.cc
     187noinst_LIBRARIES = libORXevent.a
     188libORXevent_a_SOURCES = event.cc \
     189                        event_handler.cc \
     190                        event_listener.cc \
     191                        key_mapper.cc \
     192                        key_names.cc
    202193
    203194noinst_HEADERS = event.h \
    … …  
    211202
    212203.SUFFIXES:
    213 .SUFFIXES: .cc .lo .o .obj
     204.SUFFIXES: .cc .o .obj
    214205$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    215206        @for dep in $?; do \
    … …  
    242233        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    243234
    244 clean-noinstLTLIBRARIES:
    245         -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
    246         @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
    247           dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    248           test "$$dir" != "$$p" || dir=.; \
    249           echo "rm -f \"$${dir}/so_locations\""; \
    250           rm -f "$${dir}/so_locations"; \
    251         done
    252 libORXevent.la: $(libORXevent_la_OBJECTS) $(libORXevent_la_DEPENDENCIES)
    253         $(CXXLINK)  $(libORXevent_la_LDFLAGS) $(libORXevent_la_OBJECTS) $(libORXevent_la_LIBADD) $(LIBS)
     235clean-noinstLIBRARIES:
     236        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
     237libORXevent.a: $(libORXevent_a_OBJECTS) $(libORXevent_a_DEPENDENCIES)
     238        -rm -f libORXevent.a
     239        $(libORXevent_a_AR) libORXevent.a $(libORXevent_a_OBJECTS) $(libORXevent_a_LIBADD)
     240        $(RANLIB) libORXevent.a
    254241
    255242mostlyclean-compile:
    … …  
    259246        -rm -f *.tab.c
    260247
    261 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event.Plo@am__quote@
    262 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event_handler.Plo@am__quote@
    263 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event_listener.Plo@am__quote@
    264 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key_mapper.Plo@am__quote@
    265 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key_names.Plo@am__quote@
     248@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event.Po@am__quote@
     249@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event_handler.Po@am__quote@
     250@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event_listener.Po@am__quote@
     251@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key_mapper.Po@am__quote@
     252@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key_names.Po@am__quote@
    266253
    267254.cc.o:
    … …  
    280267@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    281268@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    282 
    283 .cc.lo:
    284 @am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    285 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    286 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    287 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
    288 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    289 @am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
    290 
    291 mostlyclean-libtool:
    292         -rm -f *.lo
    293 
    294 clean-libtool:
    295         -rm -rf .libs _libs
    296 
    297 distclean-libtool:
    298         -rm -f libtool
    299269uninstall-info-am:
    300270
    … …  
    376346check-am: all-am
    377347check: check-am
    378 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
     348all-am: Makefile $(LIBRARIES) $(HEADERS)
    379349installdirs:
    380350install: install-am
    … …  
    404374clean: clean-am
    405375
    406 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
    407         mostlyclean-am
     376clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
    408377
    409378distclean: distclean-am
    … …  
    411380        -rm -f Makefile
    412381distclean-am: clean-am distclean-compile distclean-generic \
    413         distclean-libtool distclean-tags
     382        distclean-tags
    414383
    415384dvi: dvi-am
    … …  
    440409mostlyclean: mostlyclean-am
    441410
    442 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    443         mostlyclean-libtool
     411mostlyclean-am: mostlyclean-compile mostlyclean-generic
    444412
    445413pdf: pdf-am
    … …  
    454422
    455423.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    456         clean-libtool clean-noinstLTLIBRARIES ctags distclean \
    457         distclean-compile distclean-generic distclean-libtool \
    458         distclean-tags distdir dvi dvi-am html html-am info info-am \
    459         install install-am install-data install-data-am install-exec \
    460         install-exec-am install-info install-info-am install-man \
    461         install-strip installcheck installcheck-am installdirs \
    462         maintainer-clean maintainer-clean-generic mostlyclean \
    463         mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    464         pdf pdf-am ps ps-am tags uninstall uninstall-am \
    465         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
    466433
    467434include $(MAINSRCDIR)/defs/include_paths.am
Note: See TracChangeset for help on using the changeset viewer.