Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5450 in orxonox.OLD for trunk/src/lib/graphics/spatial_separation


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

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/graphics/spatial_separation/Makefile.am

    r5413 r5450  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LIBRARIES = libORXquadtree.a
     4noinst_LTLIBRARIES = libORXquadtree.la
    55
    6 libORXquadtree_a_SOURCES = quadtree.cc \
    7                            quadtree_node.cc \
    8                            spatial_separation.cc
     6libORXquadtree_la_SOURCES = quadtree.cc \
     7                            quadtree_node.cc \
     8                            spatial_separation.cc
    99
    1010noinst_HEADERS =  quadtree.h \

  • trunk/src/lib/graphics/spatial_separation/Makefile.in

    r5413 r5450  
    1616
    1717
    18 SOURCES = $(libORXquadtree_a_SOURCES)
     18SOURCES = $(libORXquadtree_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 libORXquadtree_a_AR = $(AR) $(ARFLAGS)
    55 libORXquadtree_a_LIBADD =
    56 am_libORXquadtree_a_OBJECTS = quadtree.$(OBJEXT) \
    57         quadtree_node.$(OBJEXT) spatial_separation.$(OBJEXT)
    58 libORXquadtree_a_OBJECTS = $(am_libORXquadtree_a_OBJECTS)
     51LTLIBRARIES = $(noinst_LTLIBRARIES)
     52libORXquadtree_la_LIBADD =
     53am_libORXquadtree_la_OBJECTS = quadtree.lo quadtree_node.lo \
     54        spatial_separation.lo
     55libORXquadtree_la_OBJECTS = $(am_libORXquadtree_la_OBJECTS)
    5956DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    6057depcomp = $(SHELL) $(top_srcdir)/depcomp
    6158am__depfiles_maybe = depfiles
    62 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/quadtree.Po \
    63 @AMDEP_TRUE@    ./$(DEPDIR)/quadtree_node.Po \
    64 @AMDEP_TRUE@    ./$(DEPDIR)/spatial_separation.Po
     59@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/quadtree.Plo \
     60@AMDEP_TRUE@    ./$(DEPDIR)/quadtree_node.Plo \
     61@AMDEP_TRUE@    ./$(DEPDIR)/spatial_separation.Plo
    6562CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6663        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     64LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
     65        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     66        $(AM_CXXFLAGS) $(CXXFLAGS)
    6767CXXLD = $(CXX)
    68 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    69         -o $@
    70 SOURCES = $(libORXquadtree_a_SOURCES)
    71 DIST_SOURCES = $(libORXquadtree_a_SOURCES)
     68CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
     69        $(AM_LDFLAGS) $(LDFLAGS) -o $@
     70SOURCES = $(libORXquadtree_la_SOURCES)
     71DIST_SOURCES = $(libORXquadtree_la_SOURCES)
    7272HEADERS = $(noinst_HEADERS)
    7373ETAGS = etags
    … …  
    7878AMDEP_TRUE = @AMDEP_TRUE@
    7979AMTAR = @AMTAR@
     80AR = @AR@
    8081AUTOCONF = @AUTOCONF@
    8182AUTOHEADER = @AUTOHEADER@
    … …  
    9091CURL_LIBS = @CURL_LIBS@
    9192CXX = @CXX@
     93CXXCPP = @CXXCPP@
    9294CXXDEPMODE = @CXXDEPMODE@
    9395CXXFLAGS = @CXXFLAGS@
    … …  
    101103DOXYGEN_FALSE = @DOXYGEN_FALSE@
    102104DOXYGEN_TRUE = @DOXYGEN_TRUE@
     105ECHO = @ECHO@
    103106ECHO_C = @ECHO_C@
    104107ECHO_N = @ECHO_N@
    … …  
    106109EGREP = @EGREP@
    107110EXEEXT = @EXEEXT@
     111F77 = @F77@
     112FFLAGS = @FFLAGS@
    108113GPROF = @GPROF@
    109114GTK2_CFLAGS = @GTK2_CFLAGS@
    … …  
    120125LIBOBJS = @LIBOBJS@
    121126LIBS = @LIBS@
     127LIBTOOL = @LIBTOOL@
     128LN_S = @LN_S@
    122129LTLIBOBJS = @LTLIBOBJS@
    123130MAKEINFO = @MAKEINFO@
    … …  
    139146SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    140147VERSION = @VERSION@
     148ac_ct_AR = @ac_ct_AR@
    141149ac_ct_CC = @ac_ct_CC@
    142150ac_ct_CXX = @ac_ct_CXX@
     151ac_ct_F77 = @ac_ct_F77@
    143152ac_ct_RANLIB = @ac_ct_RANLIB@
    144153ac_ct_STRIP = @ac_ct_STRIP@
    … …  
    183192target_vendor = @target_vendor@
    184193MAINSRCDIR = ../../..
    185 noinst_LIBRARIES = libORXquadtree.a
    186 libORXquadtree_a_SOURCES = quadtree.cc \
    187                            quadtree_node.cc \
    188                            spatial_separation.cc
     194noinst_LTLIBRARIES = libORXquadtree.la
     195libORXquadtree_la_SOURCES = quadtree.cc \
     196                            quadtree_node.cc \
     197                            spatial_separation.cc
    189198
    190199noinst_HEADERS = quadtree.h \
    … …  
    195204
    196205.SUFFIXES:
    197 .SUFFIXES: .cc .o .obj
     206.SUFFIXES: .cc .lo .o .obj
    198207$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    199208        @for dep in $?; do \
    … …  
    226235        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    227236
    228 clean-noinstLIBRARIES:
    229         -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
    230 libORXquadtree.a: $(libORXquadtree_a_OBJECTS) $(libORXquadtree_a_DEPENDENCIES)
    231         -rm -f libORXquadtree.a
    232         $(libORXquadtree_a_AR) libORXquadtree.a $(libORXquadtree_a_OBJECTS) $(libORXquadtree_a_LIBADD)
    233         $(RANLIB) libORXquadtree.a
     237clean-noinstLTLIBRARIES:
     238        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
     239        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
     240          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
     241          test "$$dir" != "$$p" || dir=.; \
     242          echo "rm -f \"$${dir}/so_locations\""; \
     243          rm -f "$${dir}/so_locations"; \
     244        done
     245libORXquadtree.la: $(libORXquadtree_la_OBJECTS) $(libORXquadtree_la_DEPENDENCIES)
     246        $(CXXLINK)  $(libORXquadtree_la_LDFLAGS) $(libORXquadtree_la_OBJECTS) $(libORXquadtree_la_LIBADD) $(LIBS)
    234247
    235248mostlyclean-compile:
    … …  
    239252        -rm -f *.tab.c
    240253
    241 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quadtree.Po@am__quote@
    242 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quadtree_node.Po@am__quote@
    243 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spatial_separation.Po@am__quote@
     254@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quadtree.Plo@am__quote@
     255@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quadtree_node.Plo@am__quote@
     256@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spatial_separation.Plo@am__quote@
    244257
    245258.cc.o:
    … …  
    258271@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    259272@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     273
     274.cc.lo:
     275@am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
     276@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     277@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
     278@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
     279@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     280@am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
     281
     282mostlyclean-libtool:
     283        -rm -f *.lo
     284
     285clean-libtool:
     286        -rm -rf .libs _libs
     287
     288distclean-libtool:
     289        -rm -f libtool
    260290uninstall-info-am:
    261291
    … …  
    337367check-am: all-am
    338368check: check-am
    339 all-am: Makefile $(LIBRARIES) $(HEADERS)
     369all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    340370installdirs:
    341371install: install-am
    … …  
    365395clean: clean-am
    366396
    367 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
     397clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
     398        mostlyclean-am
    368399
    369400distclean: distclean-am
    … …  
    371402        -rm -f Makefile
    372403distclean-am: clean-am distclean-compile distclean-generic \
    373         distclean-tags
     404        distclean-libtool distclean-tags
    374405
    375406dvi: dvi-am
    … …  
    400431mostlyclean: mostlyclean-am
    401432
    402 mostlyclean-am: mostlyclean-compile mostlyclean-generic
     433mostlyclean-am: mostlyclean-compile mostlyclean-generic \
     434        mostlyclean-libtool
    403435
    404436pdf: pdf-am
    … …  
    413445
    414446.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    415         clean-noinstLIBRARIES ctags distclean distclean-compile \
    416         distclean-generic distclean-tags distdir dvi dvi-am html \
    417         html-am info info-am install install-am install-data \
    418         install-data-am install-exec install-exec-am install-info \
    419         install-info-am install-man install-strip installcheck \
    420         installcheck-am installdirs maintainer-clean \
    421         maintainer-clean-generic mostlyclean mostlyclean-compile \
    422         mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
    423         uninstall-am uninstall-info-am
     447        clean-libtool clean-noinstLTLIBRARIES ctags distclean \
     448        distclean-compile distclean-generic distclean-libtool \
     449        distclean-tags distdir dvi dvi-am html html-am info info-am \
     450        install install-am install-data install-data-am install-exec \
     451        install-exec-am install-info install-info-am install-man \
     452        install-strip installcheck installcheck-am installdirs \
     453        maintainer-clean maintainer-clean-generic mostlyclean \
     454        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
     455        pdf pdf-am ps ps-am tags uninstall uninstall-am \
     456        uninstall-info-am
    424457
    425458include $(MAINSRCDIR)/defs/include_paths.am
Note: See TracChangeset for help on using the changeset viewer.