Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Nov 1, 2005, 11:09:15 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: removed LIBTOOL again

Location:
trunk/src/lib/sound
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r5452 r5463  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 pkglib_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

    r5452 r5463  
    1616
    1717
    18 SOURCES = $(libORXsound_la_SOURCES)
     18SOURCES = $(libORXsound_a_SOURCES)
    1919
    2020srcdir = @srcdir@
    … …  
    4949CONFIG_HEADER = $(top_builddir)/config.h
    5050CONFIG_CLEAN_FILES =
    51 am__installdirs = "$(DESTDIR)$(pkglibdir)"
    52 pkglibLTLIBRARIES_INSTALL = $(INSTALL)
    53 LTLIBRARIES = $(pkglib_LTLIBRARIES)
    54 libORXsound_la_LIBADD =
    55 am_libORXsound_la_OBJECTS = sound_engine.lo sound_source.lo \
    56         sound_buffer.lo ogg_player.lo
    57 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)
    5860DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    5961depcomp = $(SHELL) $(top_srcdir)/depcomp
    6062am__depfiles_maybe = depfiles
    61 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ogg_player.Plo \
    62 @AMDEP_TRUE@    ./$(DEPDIR)/sound_buffer.Plo \
    63 @AMDEP_TRUE@    ./$(DEPDIR)/sound_engine.Plo \
    64 @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
    6567CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6668        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    67 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
    68         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
    69         $(AM_CXXFLAGS) $(CXXFLAGS)
    7069CXXLD = $(CXX)
    71 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
    72         $(AM_LDFLAGS) $(LDFLAGS) -o $@
    73 SOURCES = $(libORXsound_la_SOURCES)
    74 DIST_SOURCES = $(libORXsound_la_SOURCES)
     70CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     71        -o $@
     72SOURCES = $(libORXsound_a_SOURCES)
     73DIST_SOURCES = $(libORXsound_a_SOURCES)
    7574HEADERS = $(noinst_HEADERS)
    7675ETAGS = etags
    … …  
    8180AMDEP_TRUE = @AMDEP_TRUE@
    8281AMTAR = @AMTAR@
    83 AR = @AR@
    8482AUTOCONF = @AUTOCONF@
    8583AUTOHEADER = @AUTOHEADER@
    … …  
    9492CURL_LIBS = @CURL_LIBS@
    9593CXX = @CXX@
    96 CXXCPP = @CXXCPP@
    9794CXXDEPMODE = @CXXDEPMODE@
    9895CXXFLAGS = @CXXFLAGS@
    … …  
    106103DOXYGEN_FALSE = @DOXYGEN_FALSE@
    107104DOXYGEN_TRUE = @DOXYGEN_TRUE@
    108 ECHO = @ECHO@
    109105ECHO_C = @ECHO_C@
    110106ECHO_N = @ECHO_N@
    … …  
    112108EGREP = @EGREP@
    113109EXEEXT = @EXEEXT@
    114 F77 = @F77@
    115 FFLAGS = @FFLAGS@
    116110GPROF = @GPROF@
    117111GTK2_CFLAGS = @GTK2_CFLAGS@
    … …  
    128122LIBOBJS = @LIBOBJS@
    129123LIBS = @LIBS@
    130 LIBTOOL = @LIBTOOL@
    131 LN_S = @LN_S@
    132124LTLIBOBJS = @LTLIBOBJS@
    133125MAKEINFO = @MAKEINFO@
    … …  
    149141SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    150142VERSION = @VERSION@
    151 ac_ct_AR = @ac_ct_AR@
    152143ac_ct_CC = @ac_ct_CC@
    153144ac_ct_CXX = @ac_ct_CXX@
    154 ac_ct_F77 = @ac_ct_F77@
    155145ac_ct_RANLIB = @ac_ct_RANLIB@
    156146ac_ct_STRIP = @ac_ct_STRIP@
    … …  
    195185target_vendor = @target_vendor@
    196186MAINSRCDIR = ../..
    197 pkglib_LTLIBRARIES = libORXsound.la
    198 libORXsound_la_SOURCES = sound_engine.cc \
    199                          sound_source.cc \
    200                          sound_buffer.cc \
    201                          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
    202192
    203193noinst_HEADERS = sound_engine.h \
    … …  
    209199
    210200.SUFFIXES:
    211 .SUFFIXES: .cc .lo .o .obj
     201.SUFFIXES: .cc .o .obj
    212202$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    213203        @for dep in $?; do \
    … …  
    219209          esac; \
    220210        done; \
    221         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/sound/Makefile'; \
     211        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/sound/Makefile'; \
    222212        cd $(top_srcdir) && \
    223           $(AUTOMAKE) --foreign  src/lib/sound/Makefile
     213          $(AUTOMAKE) --gnu  src/lib/sound/Makefile
    224214.PRECIOUS: Makefile
    225215Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    239229$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    240230        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    241 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
    242         @$(NORMAL_INSTALL)
    243         test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
    244         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    245           if test -f $$p; then \
    246             f="`echo $$p | sed -e 's|^.*/||'`"; \
    247             echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
    248             $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
    249           else :; fi; \
    250         done
    251 
    252 uninstall-pkglibLTLIBRARIES:
    253         @$(NORMAL_UNINSTALL)
    254         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    255             p="`echo $$p | sed -e 's|^.*/||'`"; \
    256           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
    257           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
    258         done
    259 
    260 clean-pkglibLTLIBRARIES:
    261         -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
    262         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    263           dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    264           test "$$dir" != "$$p" || dir=.; \
    265           echo "rm -f \"$${dir}/so_locations\""; \
    266           rm -f "$${dir}/so_locations"; \
    267         done
    268 libORXsound.la: $(libORXsound_la_OBJECTS) $(libORXsound_la_DEPENDENCIES)
    269         $(CXXLINK) -rpath $(pkglibdir) $(libORXsound_la_LDFLAGS) $(libORXsound_la_OBJECTS) $(libORXsound_la_LIBADD) $(LIBS)
     231
     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
    270238
    271239mostlyclean-compile:
    … …  
    275243        -rm -f *.tab.c
    276244
    277 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ogg_player.Plo@am__quote@
    278 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sound_buffer.Plo@am__quote@
    279 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sound_engine.Plo@am__quote@
    280 @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@
    281249
    282250.cc.o:
    … …  
    295263@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    296264@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    297 
    298 .cc.lo:
    299 @am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    300 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    301 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    302 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
    303 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    304 @am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
    305 
    306 mostlyclean-libtool:
    307         -rm -f *.lo
    308 
    309 clean-libtool:
    310         -rm -rf .libs _libs
    311 
    312 distclean-libtool:
    313         -rm -f libtool
    314265uninstall-info-am:
    315266
    … …  
    391342check-am: all-am
    392343check: check-am
    393 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
     344all-am: Makefile $(LIBRARIES) $(HEADERS)
    394345installdirs:
    395         for dir in "$(DESTDIR)$(pkglibdir)"; do \
    396           test -z "$$dir" || $(mkdir_p) "$$dir"; \
    397         done
    398346install: install-am
    399347install-exec: install-exec-am
    … …  
    422370clean: clean-am
    423371
    424 clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
    425         mostlyclean-am
     372clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
    426373
    427374distclean: distclean-am
    … …  
    429376        -rm -f Makefile
    430377distclean-am: clean-am distclean-compile distclean-generic \
    431         distclean-libtool distclean-tags
     378        distclean-tags
    432379
    433380dvi: dvi-am
    … …  
    443390install-data-am:
    444391
    445 install-exec-am: install-pkglibLTLIBRARIES
     392install-exec-am:
    446393
    447394install-info: install-info-am
    … …  
    458405mostlyclean: mostlyclean-am
    459406
    460 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    461         mostlyclean-libtool
     407mostlyclean-am: mostlyclean-compile mostlyclean-generic
    462408
    463409pdf: pdf-am
    … …  
    469415ps-am:
    470416
    471 uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
     417uninstall-am: uninstall-info-am
    472418
    473419.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    474         clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
    475         distclean-compile distclean-generic distclean-libtool \
    476         distclean-tags distdir dvi dvi-am html html-am info info-am \
    477         install install-am install-data install-data-am install-exec \
    478         install-exec-am install-info install-info-am install-man \
    479         install-pkglibLTLIBRARIES install-strip installcheck \
     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 \
    480425        installcheck-am installdirs maintainer-clean \
    481426        maintainer-clean-generic mostlyclean mostlyclean-compile \
    482         mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    483         tags uninstall uninstall-am uninstall-info-am \
    484         uninstall-pkglibLTLIBRARIES
     427        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
     428        uninstall-am uninstall-info-am
    485429
    486430include $(MAINSRCDIR)/defs/include_paths.am
Note: See TracChangeset for help on using the changeset viewer.