Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


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

orxonox/trunk: removed LIBTOOL again

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

Legend:

Unmodified
Added
Removed

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

    r5452 r5463  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 pkglib_LTLIBRARIES = libORXcd.la
     4noinst_LIBRARIES = libORXcd.a
    55
    6 libORXcd_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
     6libORXcd_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
    1515
    1616

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

    r5452 r5463  
    1616
    1717
    18 SOURCES = $(libORXcd_la_SOURCES)
     18SOURCES = $(libORXcd_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 libORXcd_la_LIBADD =
    55 am_libORXcd_la_OBJECTS = cd_engine.lo collision.lo obb.lo obb_tree.lo \
    56         obb_tree_node.lo bv_tree.lo bv_tree_node.lo bounding_volume.lo \
    57         bounding_sphere.lo
    58 libORXcd_la_OBJECTS = $(am_libORXcd_la_OBJECTS)
     51LIBRARIES = $(noinst_LIBRARIES)
     52AR = ar
     53ARFLAGS = cru
     54libORXcd_a_AR = $(AR) $(ARFLAGS)
     55libORXcd_a_LIBADD =
     56am_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)
     60libORXcd_a_OBJECTS = $(am_libORXcd_a_OBJECTS)
    5961DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    6062depcomp = $(SHELL) $(top_srcdir)/depcomp
    6163am__depfiles_maybe = depfiles
    62 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bounding_sphere.Plo \
    63 @AMDEP_TRUE@    ./$(DEPDIR)/bounding_volume.Plo \
    64 @AMDEP_TRUE@    ./$(DEPDIR)/bv_tree.Plo \
    65 @AMDEP_TRUE@    ./$(DEPDIR)/bv_tree_node.Plo \
    66 @AMDEP_TRUE@    ./$(DEPDIR)/cd_engine.Plo \
    67 @AMDEP_TRUE@    ./$(DEPDIR)/collision.Plo ./$(DEPDIR)/obb.Plo \
    68 @AMDEP_TRUE@    ./$(DEPDIR)/obb_tree.Plo \
    69 @AMDEP_TRUE@    ./$(DEPDIR)/obb_tree_node.Plo
     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
    7070CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    7171        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    72 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
    73         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
    74         $(AM_CXXFLAGS) $(CXXFLAGS)
    7572CXXLD = $(CXX)
    76 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
    77         $(AM_LDFLAGS) $(LDFLAGS) -o $@
    78 SOURCES = $(libORXcd_la_SOURCES)
    79 DIST_SOURCES = $(libORXcd_la_SOURCES)
     73CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     74        -o $@
     75SOURCES = $(libORXcd_a_SOURCES)
     76DIST_SOURCES = $(libORXcd_a_SOURCES)
    8077HEADERS = $(noinst_HEADERS)
    8178ETAGS = etags
    … …  
    8683AMDEP_TRUE = @AMDEP_TRUE@
    8784AMTAR = @AMTAR@
    88 AR = @AR@
    8985AUTOCONF = @AUTOCONF@
    9086AUTOHEADER = @AUTOHEADER@
    … …  
    9995CURL_LIBS = @CURL_LIBS@
    10096CXX = @CXX@
    101 CXXCPP = @CXXCPP@
    10297CXXDEPMODE = @CXXDEPMODE@
    10398CXXFLAGS = @CXXFLAGS@
    … …  
    111106DOXYGEN_FALSE = @DOXYGEN_FALSE@
    112107DOXYGEN_TRUE = @DOXYGEN_TRUE@
    113 ECHO = @ECHO@
    114108ECHO_C = @ECHO_C@
    115109ECHO_N = @ECHO_N@
    … …  
    117111EGREP = @EGREP@
    118112EXEEXT = @EXEEXT@
    119 F77 = @F77@
    120 FFLAGS = @FFLAGS@
    121113GPROF = @GPROF@
    122114GTK2_CFLAGS = @GTK2_CFLAGS@
    … …  
    133125LIBOBJS = @LIBOBJS@
    134126LIBS = @LIBS@
    135 LIBTOOL = @LIBTOOL@
    136 LN_S = @LN_S@
    137127LTLIBOBJS = @LTLIBOBJS@
    138128MAKEINFO = @MAKEINFO@
    … …  
    154144SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    155145VERSION = @VERSION@
    156 ac_ct_AR = @ac_ct_AR@
    157146ac_ct_CC = @ac_ct_CC@
    158147ac_ct_CXX = @ac_ct_CXX@
    159 ac_ct_F77 = @ac_ct_F77@
    160148ac_ct_RANLIB = @ac_ct_RANLIB@
    161149ac_ct_STRIP = @ac_ct_STRIP@
    … …  
    200188target_vendor = @target_vendor@
    201189MAINSRCDIR = ../..
    202 pkglib_LTLIBRARIES = libORXcd.la
    203 libORXcd_la_SOURCES = cd_engine.cc \
    204                       collision.cc \
    205                       obb.cc \
    206                       obb_tree.cc \
    207                       obb_tree_node.cc \
    208                       bv_tree.cc \
    209                       bv_tree_node.cc \
    210                       bounding_volume.cc \
    211                       bounding_sphere.cc
     190noinst_LIBRARIES = libORXcd.a
     191libORXcd_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
    212200
    213201noinst_HEADERS = cd_engine.h \
    … …  
    226214
    227215.SUFFIXES:
    228 .SUFFIXES: .cc .lo .o .obj
     216.SUFFIXES: .cc .o .obj
    229217$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    230218        @for dep in $?; do \
    … …  
    236224          esac; \
    237225        done; \
    238         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/collision_detection/Makefile'; \
     226        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/collision_detection/Makefile'; \
    239227        cd $(top_srcdir) && \
    240           $(AUTOMAKE) --foreign  src/lib/collision_detection/Makefile
     228          $(AUTOMAKE) --gnu  src/lib/collision_detection/Makefile
    241229.PRECIOUS: Makefile
    242230Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    256244$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    257245        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    258 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
    259         @$(NORMAL_INSTALL)
    260         test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
    261         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    262           if test -f $$p; then \
    263             f="`echo $$p | sed -e 's|^.*/||'`"; \
    264             echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
    265             $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
    266           else :; fi; \
    267         done
    268 
    269 uninstall-pkglibLTLIBRARIES:
    270         @$(NORMAL_UNINSTALL)
    271         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    272             p="`echo $$p | sed -e 's|^.*/||'`"; \
    273           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
    274           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
    275         done
    276 
    277 clean-pkglibLTLIBRARIES:
    278         -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
    279         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    280           dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    281           test "$$dir" != "$$p" || dir=.; \
    282           echo "rm -f \"$${dir}/so_locations\""; \
    283           rm -f "$${dir}/so_locations"; \
    284         done
    285 libORXcd.la: $(libORXcd_la_OBJECTS) $(libORXcd_la_DEPENDENCIES)
    286         $(CXXLINK) -rpath $(pkglibdir) $(libORXcd_la_LDFLAGS) $(libORXcd_la_OBJECTS) $(libORXcd_la_LIBADD) $(LIBS)
     246
     247clean-noinstLIBRARIES:
     248        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
     249libORXcd.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
    287253
    288254mostlyclean-compile:
    … …  
    292258        -rm -f *.tab.c
    293259
    294 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bounding_sphere.Plo@am__quote@
    295 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bounding_volume.Plo@am__quote@
    296 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bv_tree.Plo@am__quote@
    297 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bv_tree_node.Plo@am__quote@
    298 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cd_engine.Plo@am__quote@
    299 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision.Plo@am__quote@
    300 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obb.Plo@am__quote@
    301 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obb_tree.Plo@am__quote@
    302 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obb_tree_node.Plo@am__quote@
     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@
    303269
    304270.cc.o:
    … …  
    317283@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    318284@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    319 
    320 .cc.lo:
    321 @am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    322 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    323 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    324 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
    325 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    326 @am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
    327 
    328 mostlyclean-libtool:
    329         -rm -f *.lo
    330 
    331 clean-libtool:
    332         -rm -rf .libs _libs
    333 
    334 distclean-libtool:
    335         -rm -f libtool
    336285uninstall-info-am:
    337286
    … …  
    413362check-am: all-am
    414363check: check-am
    415 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
     364all-am: Makefile $(LIBRARIES) $(HEADERS)
    416365installdirs:
    417         for dir in "$(DESTDIR)$(pkglibdir)"; do \
    418           test -z "$$dir" || $(mkdir_p) "$$dir"; \
    419         done
    420366install: install-am
    421367install-exec: install-exec-am
    … …  
    444390clean: clean-am
    445391
    446 clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
    447         mostlyclean-am
     392clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
    448393
    449394distclean: distclean-am
    … …  
    451396        -rm -f Makefile
    452397distclean-am: clean-am distclean-compile distclean-generic \
    453         distclean-libtool distclean-tags
     398        distclean-tags
    454399
    455400dvi: dvi-am
    … …  
    465410install-data-am:
    466411
    467 install-exec-am: install-pkglibLTLIBRARIES
     412install-exec-am:
    468413
    469414install-info: install-info-am
    … …  
    480425mostlyclean: mostlyclean-am
    481426
    482 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    483         mostlyclean-libtool
     427mostlyclean-am: mostlyclean-compile mostlyclean-generic
    484428
    485429pdf: pdf-am
    … …  
    491435ps-am:
    492436
    493 uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
     437uninstall-am: uninstall-info-am
    494438
    495439.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    496         clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
    497         distclean-compile distclean-generic distclean-libtool \
    498         distclean-tags distdir dvi dvi-am html html-am info info-am \
    499         install install-am install-data install-data-am install-exec \
    500         install-exec-am install-info install-info-am install-man \
    501         install-pkglibLTLIBRARIES install-strip installcheck \
     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 \
    502445        installcheck-am installdirs maintainer-clean \
    503446        maintainer-clean-generic mostlyclean mostlyclean-compile \
    504         mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    505         tags uninstall uninstall-am uninstall-info-am \
    506         uninstall-pkglibLTLIBRARIES
     447        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
     448        uninstall-am uninstall-info-am
    507449
    508450include $(MAINSRCDIR)/defs/include_paths.am
Note: See TracChangeset for help on using the changeset viewer.