Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Oct 29, 2005, 4:29:07 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: building with LIBTOOL again, this time for real
Since now we link shared libraries together, there is no more problem with uninitialized global values

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

Legend:

Unmodified
Added
Removed

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

    r5413 r5450  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LIBRARIES = libORXsound.a
     4noinst_LTLIBRARIES = libORXsound.la
    55
    6 libORXsound_a_SOURCES = sound_engine.cc \
    7                         sound_source.cc \
    8                         sound_buffer.cc \
    9                         ogg_player.cc
     6libORXsound_la_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

    r5413 r5450  
    1616
    1717
    18 SOURCES = $(libORXsound_a_SOURCES)
     18SOURCES = $(libORXsound_la_SOURCES)
    1919
    2020srcdir = @srcdir@
    … …  
    4949CONFIG_HEADER = $(top_builddir)/config.h
    5050CONFIG_CLEAN_FILES =
    51 LIBRARIES = $(noinst_LIBRARIES)
    52 AR = ar
    53 ARFLAGS = cru
    54 libORXsound_a_AR = $(AR) $(ARFLAGS)
    55 libORXsound_a_LIBADD =
    56 am_libORXsound_a_OBJECTS = sound_engine.$(OBJEXT) \
    57         sound_source.$(OBJEXT) sound_buffer.$(OBJEXT) \
    58         ogg_player.$(OBJEXT)
    59 libORXsound_a_OBJECTS = $(am_libORXsound_a_OBJECTS)
     51LTLIBRARIES = $(noinst_LTLIBRARIES)
     52libORXsound_la_LIBADD =
     53am_libORXsound_la_OBJECTS = sound_engine.lo sound_source.lo \
     54        sound_buffer.lo ogg_player.lo
     55libORXsound_la_OBJECTS = $(am_libORXsound_la_OBJECTS)
    6056DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    6157depcomp = $(SHELL) $(top_srcdir)/depcomp
    6258am__depfiles_maybe = depfiles
    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
     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
    6763CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6864        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     65LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
     66        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     67        $(AM_CXXFLAGS) $(CXXFLAGS)
    6968CXXLD = $(CXX)
    70 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    71         -o $@
    72 SOURCES = $(libORXsound_a_SOURCES)
    73 DIST_SOURCES = $(libORXsound_a_SOURCES)
     69CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
     70        $(AM_LDFLAGS) $(LDFLAGS) -o $@
     71SOURCES = $(libORXsound_la_SOURCES)
     72DIST_SOURCES = $(libORXsound_la_SOURCES)
    7473HEADERS = $(noinst_HEADERS)
    7574ETAGS = etags
    … …  
    8079AMDEP_TRUE = @AMDEP_TRUE@
    8180AMTAR = @AMTAR@
     81AR = @AR@
    8282AUTOCONF = @AUTOCONF@
    8383AUTOHEADER = @AUTOHEADER@
    … …  
    9292CURL_LIBS = @CURL_LIBS@
    9393CXX = @CXX@
     94CXXCPP = @CXXCPP@
    9495CXXDEPMODE = @CXXDEPMODE@
    9596CXXFLAGS = @CXXFLAGS@
    … …  
    103104DOXYGEN_FALSE = @DOXYGEN_FALSE@
    104105DOXYGEN_TRUE = @DOXYGEN_TRUE@
     106ECHO = @ECHO@
    105107ECHO_C = @ECHO_C@
    106108ECHO_N = @ECHO_N@
    … …  
    108110EGREP = @EGREP@
    109111EXEEXT = @EXEEXT@
     112F77 = @F77@
     113FFLAGS = @FFLAGS@
    110114GPROF = @GPROF@
    111115GTK2_CFLAGS = @GTK2_CFLAGS@
    … …  
    122126LIBOBJS = @LIBOBJS@
    123127LIBS = @LIBS@
     128LIBTOOL = @LIBTOOL@
     129LN_S = @LN_S@
    124130LTLIBOBJS = @LTLIBOBJS@
    125131MAKEINFO = @MAKEINFO@
    … …  
    141147SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    142148VERSION = @VERSION@
     149ac_ct_AR = @ac_ct_AR@
    143150ac_ct_CC = @ac_ct_CC@
    144151ac_ct_CXX = @ac_ct_CXX@
     152ac_ct_F77 = @ac_ct_F77@
    145153ac_ct_RANLIB = @ac_ct_RANLIB@
    146154ac_ct_STRIP = @ac_ct_STRIP@
    … …  
    185193target_vendor = @target_vendor@
    186194MAINSRCDIR = ../..
    187 noinst_LIBRARIES = libORXsound.a
    188 libORXsound_a_SOURCES = sound_engine.cc \
    189                         sound_source.cc \
    190                         sound_buffer.cc \
    191                         ogg_player.cc
     195noinst_LTLIBRARIES = libORXsound.la
     196libORXsound_la_SOURCES = sound_engine.cc \
     197                         sound_source.cc \
     198                         sound_buffer.cc \
     199                         ogg_player.cc
    192200
    193201noinst_HEADERS = sound_engine.h \
    … …  
    199207
    200208.SUFFIXES:
    201 .SUFFIXES: .cc .o .obj
     209.SUFFIXES: .cc .lo .o .obj
    202210$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    203211        @for dep in $?; do \
    … …  
    230238        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    231239
    232 clean-noinstLIBRARIES:
    233         -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
    234 libORXsound.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
     240clean-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
     248libORXsound.la: $(libORXsound_la_OBJECTS) $(libORXsound_la_DEPENDENCIES)
     249        $(CXXLINK)  $(libORXsound_la_LDFLAGS) $(libORXsound_la_OBJECTS) $(libORXsound_la_LIBADD) $(LIBS)
    238250
    239251mostlyclean-compile:
    … …  
    243255        -rm -f *.tab.c
    244256
    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@
     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@
    249261
    250262.cc.o:
    … …  
    263275@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    264276@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
     286mostlyclean-libtool:
     287        -rm -f *.lo
     288
     289clean-libtool:
     290        -rm -rf .libs _libs
     291
     292distclean-libtool:
     293        -rm -f libtool
    265294uninstall-info-am:
    266295
    … …  
    342371check-am: all-am
    343372check: check-am
    344 all-am: Makefile $(LIBRARIES) $(HEADERS)
     373all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    345374installdirs:
    346375install: install-am
    … …  
    370399clean: clean-am
    371400
    372 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
     401clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
     402        mostlyclean-am
    373403
    374404distclean: distclean-am
    … …  
    376406        -rm -f Makefile
    377407distclean-am: clean-am distclean-compile distclean-generic \
    378         distclean-tags
     408        distclean-libtool distclean-tags
    379409
    380410dvi: dvi-am
    … …  
    405435mostlyclean: mostlyclean-am
    406436
    407 mostlyclean-am: mostlyclean-compile mostlyclean-generic
     437mostlyclean-am: mostlyclean-compile mostlyclean-generic \
     438        mostlyclean-libtool
    408439
    409440pdf: pdf-am
    … …  
    418449
    419450.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    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
     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
    429461
    430462include $(MAINSRCDIR)/defs/include_paths.am
Note: See TracChangeset for help on using the changeset viewer.