Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


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

Legend:

Unmodified
Added
Removed

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

    r5413 r5450  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LIBRARIES = libORXcd.a
     4noinst_LTLIBRARIES = libORXcd.la
    55
    6 libORXcd_a_SOURCES = cd_engine.cc \
    7                      collision.cc \
    8                      obb.cc \
    9                      obb_tree.cc \
    10                      obb_tree_node.cc \
    11                      bv_tree.cc \
    12                      bv_tree_node.cc \
    13                      bounding_volume.cc \
    14                      bounding_sphere.cc
     6libORXcd_la_SOURCES = cd_engine.cc \
     7                      collision.cc \
     8                      obb.cc \
     9                      obb_tree.cc \
     10                      obb_tree_node.cc \
     11                      bv_tree.cc \
     12                      bv_tree_node.cc \
     13                      bounding_volume.cc \
     14                      bounding_sphere.cc
    1515
    1616

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

    r5413 r5450  
    1616
    1717
    18 SOURCES = $(libORXcd_a_SOURCES)
     18SOURCES = $(libORXcd_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 libORXcd_a_AR = $(AR) $(ARFLAGS)
    55 libORXcd_a_LIBADD =
    56 am_libORXcd_a_OBJECTS = cd_engine.$(OBJEXT) collision.$(OBJEXT) \
    57         obb.$(OBJEXT) obb_tree.$(OBJEXT) obb_tree_node.$(OBJEXT) \
    58         bv_tree.$(OBJEXT) bv_tree_node.$(OBJEXT) \
    59         bounding_volume.$(OBJEXT) bounding_sphere.$(OBJEXT)
    60 libORXcd_a_OBJECTS = $(am_libORXcd_a_OBJECTS)
     51LTLIBRARIES = $(noinst_LTLIBRARIES)
     52libORXcd_la_LIBADD =
     53am_libORXcd_la_OBJECTS = cd_engine.lo collision.lo obb.lo obb_tree.lo \
     54        obb_tree_node.lo bv_tree.lo bv_tree_node.lo bounding_volume.lo \
     55        bounding_sphere.lo
     56libORXcd_la_OBJECTS = $(am_libORXcd_la_OBJECTS)
    6157DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    6258depcomp = $(SHELL) $(top_srcdir)/depcomp
    6359am__depfiles_maybe = depfiles
    64 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bounding_sphere.Po \
    65 @AMDEP_TRUE@    ./$(DEPDIR)/bounding_volume.Po \
    66 @AMDEP_TRUE@    ./$(DEPDIR)/bv_tree.Po ./$(DEPDIR)/bv_tree_node.Po \
    67 @AMDEP_TRUE@    ./$(DEPDIR)/cd_engine.Po ./$(DEPDIR)/collision.Po \
    68 @AMDEP_TRUE@    ./$(DEPDIR)/obb.Po ./$(DEPDIR)/obb_tree.Po \
    69 @AMDEP_TRUE@    ./$(DEPDIR)/obb_tree_node.Po
     60@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bounding_sphere.Plo \
     61@AMDEP_TRUE@    ./$(DEPDIR)/bounding_volume.Plo \
     62@AMDEP_TRUE@    ./$(DEPDIR)/bv_tree.Plo \
     63@AMDEP_TRUE@    ./$(DEPDIR)/bv_tree_node.Plo \
     64@AMDEP_TRUE@    ./$(DEPDIR)/cd_engine.Plo \
     65@AMDEP_TRUE@    ./$(DEPDIR)/collision.Plo ./$(DEPDIR)/obb.Plo \
     66@AMDEP_TRUE@    ./$(DEPDIR)/obb_tree.Plo \
     67@AMDEP_TRUE@    ./$(DEPDIR)/obb_tree_node.Plo
    7068CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    7169        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     70LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
     71        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     72        $(AM_CXXFLAGS) $(CXXFLAGS)
    7273CXXLD = $(CXX)
    73 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    74         -o $@
    75 SOURCES = $(libORXcd_a_SOURCES)
    76 DIST_SOURCES = $(libORXcd_a_SOURCES)
     74CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
     75        $(AM_LDFLAGS) $(LDFLAGS) -o $@
     76SOURCES = $(libORXcd_la_SOURCES)
     77DIST_SOURCES = $(libORXcd_la_SOURCES)
    7778HEADERS = $(noinst_HEADERS)
    7879ETAGS = etags
    … …  
    8384AMDEP_TRUE = @AMDEP_TRUE@
    8485AMTAR = @AMTAR@
     86AR = @AR@
    8587AUTOCONF = @AUTOCONF@
    8688AUTOHEADER = @AUTOHEADER@
    … …  
    9597CURL_LIBS = @CURL_LIBS@
    9698CXX = @CXX@
     99CXXCPP = @CXXCPP@
    97100CXXDEPMODE = @CXXDEPMODE@
    98101CXXFLAGS = @CXXFLAGS@
    … …  
    106109DOXYGEN_FALSE = @DOXYGEN_FALSE@
    107110DOXYGEN_TRUE = @DOXYGEN_TRUE@
     111ECHO = @ECHO@
    108112ECHO_C = @ECHO_C@
    109113ECHO_N = @ECHO_N@
    … …  
    111115EGREP = @EGREP@
    112116EXEEXT = @EXEEXT@
     117F77 = @F77@
     118FFLAGS = @FFLAGS@
    113119GPROF = @GPROF@
    114120GTK2_CFLAGS = @GTK2_CFLAGS@
    … …  
    125131LIBOBJS = @LIBOBJS@
    126132LIBS = @LIBS@
     133LIBTOOL = @LIBTOOL@
     134LN_S = @LN_S@
    127135LTLIBOBJS = @LTLIBOBJS@
    128136MAKEINFO = @MAKEINFO@
    … …  
    144152SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    145153VERSION = @VERSION@
     154ac_ct_AR = @ac_ct_AR@
    146155ac_ct_CC = @ac_ct_CC@
    147156ac_ct_CXX = @ac_ct_CXX@
     157ac_ct_F77 = @ac_ct_F77@
    148158ac_ct_RANLIB = @ac_ct_RANLIB@
    149159ac_ct_STRIP = @ac_ct_STRIP@
    … …  
    188198target_vendor = @target_vendor@
    189199MAINSRCDIR = ../..
    190 noinst_LIBRARIES = libORXcd.a
    191 libORXcd_a_SOURCES = cd_engine.cc \
    192                      collision.cc \
    193                      obb.cc \
    194                      obb_tree.cc \
    195                      obb_tree_node.cc \
    196                      bv_tree.cc \
    197                      bv_tree_node.cc \
    198                      bounding_volume.cc \
    199                      bounding_sphere.cc
     200noinst_LTLIBRARIES = libORXcd.la
     201libORXcd_la_SOURCES = cd_engine.cc \
     202                      collision.cc \
     203                      obb.cc \
     204                      obb_tree.cc \
     205                      obb_tree_node.cc \
     206                      bv_tree.cc \
     207                      bv_tree_node.cc \
     208                      bounding_volume.cc \
     209                      bounding_sphere.cc
    200210
    201211noinst_HEADERS = cd_engine.h \
    … …  
    214224
    215225.SUFFIXES:
    216 .SUFFIXES: .cc .o .obj
     226.SUFFIXES: .cc .lo .o .obj
    217227$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    218228        @for dep in $?; do \
    … …  
    245255        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    246256
    247 clean-noinstLIBRARIES:
    248         -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
    249 libORXcd.a: $(libORXcd_a_OBJECTS) $(libORXcd_a_DEPENDENCIES)
    250         -rm -f libORXcd.a
    251         $(libORXcd_a_AR) libORXcd.a $(libORXcd_a_OBJECTS) $(libORXcd_a_LIBADD)
    252         $(RANLIB) libORXcd.a
     257clean-noinstLTLIBRARIES:
     258        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
     259        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
     260          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
     261          test "$$dir" != "$$p" || dir=.; \
     262          echo "rm -f \"$${dir}/so_locations\""; \
     263          rm -f "$${dir}/so_locations"; \
     264        done
     265libORXcd.la: $(libORXcd_la_OBJECTS) $(libORXcd_la_DEPENDENCIES)
     266        $(CXXLINK)  $(libORXcd_la_LDFLAGS) $(libORXcd_la_OBJECTS) $(libORXcd_la_LIBADD) $(LIBS)
    253267
    254268mostlyclean-compile:
    … …  
    258272        -rm -f *.tab.c
    259273
    260 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bounding_sphere.Po@am__quote@
    261 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bounding_volume.Po@am__quote@
    262 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bv_tree.Po@am__quote@
    263 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bv_tree_node.Po@am__quote@
    264 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cd_engine.Po@am__quote@
    265 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision.Po@am__quote@
    266 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obb.Po@am__quote@
    267 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obb_tree.Po@am__quote@
    268 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obb_tree_node.Po@am__quote@
     274@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bounding_sphere.Plo@am__quote@
     275@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bounding_volume.Plo@am__quote@
     276@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bv_tree.Plo@am__quote@
     277@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bv_tree_node.Plo@am__quote@
     278@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cd_engine.Plo@am__quote@
     279@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision.Plo@am__quote@
     280@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obb.Plo@am__quote@
     281@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obb_tree.Plo@am__quote@
     282@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obb_tree_node.Plo@am__quote@
    269283
    270284.cc.o:
    … …  
    283297@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    284298@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     299
     300.cc.lo:
     301@am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
     302@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     303@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
     304@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
     305@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     306@am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
     307
     308mostlyclean-libtool:
     309        -rm -f *.lo
     310
     311clean-libtool:
     312        -rm -rf .libs _libs
     313
     314distclean-libtool:
     315        -rm -f libtool
    285316uninstall-info-am:
    286317
    … …  
    362393check-am: all-am
    363394check: check-am
    364 all-am: Makefile $(LIBRARIES) $(HEADERS)
     395all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    365396installdirs:
    366397install: install-am
    … …  
    390421clean: clean-am
    391422
    392 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
     423clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
     424        mostlyclean-am
    393425
    394426distclean: distclean-am
    … …  
    396428        -rm -f Makefile
    397429distclean-am: clean-am distclean-compile distclean-generic \
    398         distclean-tags
     430        distclean-libtool distclean-tags
    399431
    400432dvi: dvi-am
    … …  
    425457mostlyclean: mostlyclean-am
    426458
    427 mostlyclean-am: mostlyclean-compile mostlyclean-generic
     459mostlyclean-am: mostlyclean-compile mostlyclean-generic \
     460        mostlyclean-libtool
    428461
    429462pdf: pdf-am
    … …  
    438471
    439472.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    440         clean-noinstLIBRARIES ctags distclean distclean-compile \
    441         distclean-generic distclean-tags distdir dvi dvi-am html \
    442         html-am info info-am install install-am install-data \
    443         install-data-am install-exec install-exec-am install-info \
    444         install-info-am install-man install-strip installcheck \
    445         installcheck-am installdirs maintainer-clean \
    446         maintainer-clean-generic mostlyclean mostlyclean-compile \
    447         mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
    448         uninstall-am uninstall-info-am
     473        clean-libtool clean-noinstLTLIBRARIES ctags distclean \
     474        distclean-compile distclean-generic distclean-libtool \
     475        distclean-tags distdir dvi dvi-am html html-am info info-am \
     476        install install-am install-data install-data-am install-exec \
     477        install-exec-am install-info install-info-am install-man \
     478        install-strip installcheck installcheck-am installdirs \
     479        maintainer-clean maintainer-clean-generic mostlyclean \
     480        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
     481        pdf pdf-am ps ps-am tags uninstall uninstall-am \
     482        uninstall-info-am
    449483
    450484include $(MAINSRCDIR)/defs/include_paths.am
Note: See TracChangeset for help on using the changeset viewer.