Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


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

Legend:

Unmodified
Added
Removed

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

    r5410 r5413  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LTLIBRARIES = libORXsound.la
     4noinst_LIBRARIES = libORXsound.a
    55
    6 libORXsound_la_SOURCES = sound_engine.cc \
    7                          sound_source.cc \
    8                          sound_buffer.cc \
    9                          ogg_player.cc
     6libORXsound_a_SOURCES = sound_engine.cc \
     7                        sound_source.cc \
     8                        sound_buffer.cc \
     9                        ogg_player.cc
    1010
    1111noinst_HEADERS = sound_engine.h \

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

    r5412 r5413  
    1616
    1717
    18 SOURCES = $(libORXsound_la_SOURCES)
     18SOURCES = $(libORXsound_a_SOURCES)
    1919
    2020srcdir = @srcdir@
    … …  
    4949CONFIG_HEADER = $(top_builddir)/config.h
    5050CONFIG_CLEAN_FILES =
    51 LTLIBRARIES = $(noinst_LTLIBRARIES)
    52 libORXsound_la_LIBADD =
    53 am_libORXsound_la_OBJECTS = sound_engine.lo sound_source.lo \
    54         sound_buffer.lo ogg_player.lo
    55 libORXsound_la_OBJECTS = $(am_libORXsound_la_OBJECTS)
     51LIBRARIES = $(noinst_LIBRARIES)
     52AR = ar
     53ARFLAGS = cru
     54libORXsound_a_AR = $(AR) $(ARFLAGS)
     55libORXsound_a_LIBADD =
     56am_libORXsound_a_OBJECTS = sound_engine.$(OBJEXT) \
     57        sound_source.$(OBJEXT) sound_buffer.$(OBJEXT) \
     58        ogg_player.$(OBJEXT)
     59libORXsound_a_OBJECTS = $(am_libORXsound_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)/ogg_player.Plo \
    60 @AMDEP_TRUE@    ./$(DEPDIR)/sound_buffer.Plo \
    61 @AMDEP_TRUE@    ./$(DEPDIR)/sound_engine.Plo \
    62 @AMDEP_TRUE@    ./$(DEPDIR)/sound_source.Plo
     63@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ogg_player.Po \
     64@AMDEP_TRUE@    ./$(DEPDIR)/sound_buffer.Po \
     65@AMDEP_TRUE@    ./$(DEPDIR)/sound_engine.Po \
     66@AMDEP_TRUE@    ./$(DEPDIR)/sound_source.Po
    6367CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6468        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    65 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
    66         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
    67         $(AM_CXXFLAGS) $(CXXFLAGS)
    6869CXXLD = $(CXX)
    69 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
    70         $(AM_LDFLAGS) $(LDFLAGS) -o $@
    71 SOURCES = $(libORXsound_la_SOURCES)
    72 DIST_SOURCES = $(libORXsound_la_SOURCES)
     70CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     71        -o $@
     72SOURCES = $(libORXsound_a_SOURCES)
     73DIST_SOURCES = $(libORXsound_a_SOURCES)
    7374HEADERS = $(noinst_HEADERS)
    7475ETAGS = etags
    … …  
    7980AMDEP_TRUE = @AMDEP_TRUE@
    8081AMTAR = @AMTAR@
    81 AR = @AR@
    8282AUTOCONF = @AUTOCONF@
    8383AUTOHEADER = @AUTOHEADER@
    … …  
    9292CURL_LIBS = @CURL_LIBS@
    9393CXX = @CXX@
    94 CXXCPP = @CXXCPP@
    9594CXXDEPMODE = @CXXDEPMODE@
    9695CXXFLAGS = @CXXFLAGS@
    … …  
    104103DOXYGEN_FALSE = @DOXYGEN_FALSE@
    105104DOXYGEN_TRUE = @DOXYGEN_TRUE@
    106 ECHO = @ECHO@
    107105ECHO_C = @ECHO_C@
    108106ECHO_N = @ECHO_N@
    … …  
    110108EGREP = @EGREP@
    111109EXEEXT = @EXEEXT@
    112 F77 = @F77@
    113 FFLAGS = @FFLAGS@
    114110GPROF = @GPROF@
    115111GTK2_CFLAGS = @GTK2_CFLAGS@
    … …  
    126122LIBOBJS = @LIBOBJS@
    127123LIBS = @LIBS@
    128 LIBTOOL = @LIBTOOL@
    129 LN_S = @LN_S@
    130124LTLIBOBJS = @LTLIBOBJS@
    131125MAKEINFO = @MAKEINFO@
    … …  
    147141SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    148142VERSION = @VERSION@
    149 ac_ct_AR = @ac_ct_AR@
    150143ac_ct_CC = @ac_ct_CC@
    151144ac_ct_CXX = @ac_ct_CXX@
    152 ac_ct_F77 = @ac_ct_F77@
    153145ac_ct_RANLIB = @ac_ct_RANLIB@
    154146ac_ct_STRIP = @ac_ct_STRIP@
    … …  
    193185target_vendor = @target_vendor@
    194186MAINSRCDIR = ../..
    195 noinst_LTLIBRARIES = libORXsound.la
    196 libORXsound_la_SOURCES = sound_engine.cc \
    197                          sound_source.cc \
    198                          sound_buffer.cc \
    199                          ogg_player.cc
     187noinst_LIBRARIES = libORXsound.a
     188libORXsound_a_SOURCES = sound_engine.cc \
     189                        sound_source.cc \
     190                        sound_buffer.cc \
     191                        ogg_player.cc
    200192
    201193noinst_HEADERS = sound_engine.h \
    … …  
    207199
    208200.SUFFIXES:
    209 .SUFFIXES: .cc .lo .o .obj
     201.SUFFIXES: .cc .o .obj
    210202$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    211203        @for dep in $?; do \
    … …  
    238230        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    239231
    240 clean-noinstLTLIBRARIES:
    241         -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
    242         @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
    243           dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    244           test "$$dir" != "$$p" || dir=.; \
    245           echo "rm -f \"$${dir}/so_locations\""; \
    246           rm -f "$${dir}/so_locations"; \
    247         done
    248 libORXsound.la: $(libORXsound_la_OBJECTS) $(libORXsound_la_DEPENDENCIES)
    249         $(CXXLINK)  $(libORXsound_la_LDFLAGS) $(libORXsound_la_OBJECTS) $(libORXsound_la_LIBADD) $(LIBS)
     232clean-noinstLIBRARIES:
     233        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
     234libORXsound.a: $(libORXsound_a_OBJECTS) $(libORXsound_a_DEPENDENCIES)
     235        -rm -f libORXsound.a
     236        $(libORXsound_a_AR) libORXsound.a $(libORXsound_a_OBJECTS) $(libORXsound_a_LIBADD)
     237        $(RANLIB) libORXsound.a
    250238
    251239mostlyclean-compile:
    … …  
    255243        -rm -f *.tab.c
    256244
    257 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ogg_player.Plo@am__quote@
    258 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sound_buffer.Plo@am__quote@
    259 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sound_engine.Plo@am__quote@
    260 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sound_source.Plo@am__quote@
     245@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ogg_player.Po@am__quote@
     246@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sound_buffer.Po@am__quote@
     247@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sound_engine.Po@am__quote@
     248@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sound_source.Po@am__quote@
    261249
    262250.cc.o:
    … …  
    275263@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    276264@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    277 
    278 .cc.lo:
    279 @am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    280 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    281 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    282 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
    283 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    284 @am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
    285 
    286 mostlyclean-libtool:
    287         -rm -f *.lo
    288 
    289 clean-libtool:
    290         -rm -rf .libs _libs
    291 
    292 distclean-libtool:
    293         -rm -f libtool
    294265uninstall-info-am:
    295266
    … …  
    371342check-am: all-am
    372343check: check-am
    373 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
     344all-am: Makefile $(LIBRARIES) $(HEADERS)
    374345installdirs:
    375346install: install-am
    … …  
    399370clean: clean-am
    400371
    401 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
    402         mostlyclean-am
     372clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
    403373
    404374distclean: distclean-am
    … …  
    406376        -rm -f Makefile
    407377distclean-am: clean-am distclean-compile distclean-generic \
    408         distclean-libtool distclean-tags
     378        distclean-tags
    409379
    410380dvi: dvi-am
    … …  
    435405mostlyclean: mostlyclean-am
    436406
    437 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    438         mostlyclean-libtool
     407mostlyclean-am: mostlyclean-compile mostlyclean-generic
    439408
    440409pdf: pdf-am
    … …  
    449418
    450419.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    451         clean-libtool clean-noinstLTLIBRARIES ctags distclean \
    452         distclean-compile distclean-generic distclean-libtool \
    453         distclean-tags distdir dvi dvi-am html html-am info info-am \
    454         install install-am install-data install-data-am install-exec \
    455         install-exec-am install-info install-info-am install-man \
    456         install-strip installcheck installcheck-am installdirs \
    457         maintainer-clean maintainer-clean-generic mostlyclean \
    458         mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    459         pdf pdf-am ps ps-am tags uninstall uninstall-am \
    460         uninstall-info-am
     420        clean-noinstLIBRARIES ctags distclean distclean-compile \
     421        distclean-generic distclean-tags distdir dvi dvi-am html \
     422        html-am info info-am install install-am install-data \
     423        install-data-am install-exec install-exec-am install-info \
     424        install-info-am install-man install-strip installcheck \
     425        installcheck-am installdirs maintainer-clean \
     426        maintainer-clean-generic mostlyclean mostlyclean-compile \
     427        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
     428        uninstall-am uninstall-info-am
    461429
    462430include $(MAINSRCDIR)/defs/include_paths.am
Note: See TracChangeset for help on using the changeset viewer.