Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


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

orxonox/trunk: removed LIBTOOL again

Location:
trunk/src/lib/graphics/spatial_separation
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

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

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

    r5452 r5463  
    1616
    1717
    18 SOURCES = $(libORXquadtree_la_SOURCES)
     18SOURCES = $(libORXquadtree_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 libORXquadtree_la_LIBADD =
    55 am_libORXquadtree_la_OBJECTS = quadtree.lo quadtree_node.lo \
    56         spatial_separation.lo
    57 libORXquadtree_la_OBJECTS = $(am_libORXquadtree_la_OBJECTS)
     51LIBRARIES = $(noinst_LIBRARIES)
     52AR = ar
     53ARFLAGS = cru
     54libORXquadtree_a_AR = $(AR) $(ARFLAGS)
     55libORXquadtree_a_LIBADD =
     56am_libORXquadtree_a_OBJECTS = quadtree.$(OBJEXT) \
     57        quadtree_node.$(OBJEXT) spatial_separation.$(OBJEXT)
     58libORXquadtree_a_OBJECTS = $(am_libORXquadtree_a_OBJECTS)
    5859DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    5960depcomp = $(SHELL) $(top_srcdir)/depcomp
    6061am__depfiles_maybe = depfiles
    61 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/quadtree.Plo \
    62 @AMDEP_TRUE@    ./$(DEPDIR)/quadtree_node.Plo \
    63 @AMDEP_TRUE@    ./$(DEPDIR)/spatial_separation.Plo
     62@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/quadtree.Po \
     63@AMDEP_TRUE@    ./$(DEPDIR)/quadtree_node.Po \
     64@AMDEP_TRUE@    ./$(DEPDIR)/spatial_separation.Po
    6465CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6566        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    66 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
    67         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
    68         $(AM_CXXFLAGS) $(CXXFLAGS)
    6967CXXLD = $(CXX)
    70 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
    71         $(AM_LDFLAGS) $(LDFLAGS) -o $@
    72 SOURCES = $(libORXquadtree_la_SOURCES)
    73 DIST_SOURCES = $(libORXquadtree_la_SOURCES)
     68CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     69        -o $@
     70SOURCES = $(libORXquadtree_a_SOURCES)
     71DIST_SOURCES = $(libORXquadtree_a_SOURCES)
    7472HEADERS = $(noinst_HEADERS)
    7573ETAGS = etags
    … …  
    8078AMDEP_TRUE = @AMDEP_TRUE@
    8179AMTAR = @AMTAR@
    82 AR = @AR@
    8380AUTOCONF = @AUTOCONF@
    8481AUTOHEADER = @AUTOHEADER@
    … …  
    9390CURL_LIBS = @CURL_LIBS@
    9491CXX = @CXX@
    95 CXXCPP = @CXXCPP@
    9692CXXDEPMODE = @CXXDEPMODE@
    9793CXXFLAGS = @CXXFLAGS@
    … …  
    105101DOXYGEN_FALSE = @DOXYGEN_FALSE@
    106102DOXYGEN_TRUE = @DOXYGEN_TRUE@
    107 ECHO = @ECHO@
    108103ECHO_C = @ECHO_C@
    109104ECHO_N = @ECHO_N@
    … …  
    111106EGREP = @EGREP@
    112107EXEEXT = @EXEEXT@
    113 F77 = @F77@
    114 FFLAGS = @FFLAGS@
    115108GPROF = @GPROF@
    116109GTK2_CFLAGS = @GTK2_CFLAGS@
    … …  
    127120LIBOBJS = @LIBOBJS@
    128121LIBS = @LIBS@
    129 LIBTOOL = @LIBTOOL@
    130 LN_S = @LN_S@
    131122LTLIBOBJS = @LTLIBOBJS@
    132123MAKEINFO = @MAKEINFO@
    … …  
    148139SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    149140VERSION = @VERSION@
    150 ac_ct_AR = @ac_ct_AR@
    151141ac_ct_CC = @ac_ct_CC@
    152142ac_ct_CXX = @ac_ct_CXX@
    153 ac_ct_F77 = @ac_ct_F77@
    154143ac_ct_RANLIB = @ac_ct_RANLIB@
    155144ac_ct_STRIP = @ac_ct_STRIP@
    … …  
    194183target_vendor = @target_vendor@
    195184MAINSRCDIR = ../../..
    196 pkglib_LTLIBRARIES = libORXquadtree.la
    197 libORXquadtree_la_SOURCES = quadtree.cc \
    198                             quadtree_node.cc \
    199                             spatial_separation.cc
     185noinst_LIBRARIES = libORXquadtree.a
     186libORXquadtree_a_SOURCES = quadtree.cc \
     187                           quadtree_node.cc \
     188                           spatial_separation.cc
    200189
    201190noinst_HEADERS = quadtree.h \
    … …  
    206195
    207196.SUFFIXES:
    208 .SUFFIXES: .cc .lo .o .obj
     197.SUFFIXES: .cc .o .obj
    209198$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    210199        @for dep in $?; do \
    … …  
    216205          esac; \
    217206        done; \
    218         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/spatial_separation/Makefile'; \
     207        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/spatial_separation/Makefile'; \
    219208        cd $(top_srcdir) && \
    220           $(AUTOMAKE) --foreign  src/lib/graphics/spatial_separation/Makefile
     209          $(AUTOMAKE) --gnu  src/lib/graphics/spatial_separation/Makefile
    221210.PRECIOUS: Makefile
    222211Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    236225$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    237226        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    238 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
    239         @$(NORMAL_INSTALL)
    240         test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
    241         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    242           if test -f $$p; then \
    243             f="`echo $$p | sed -e 's|^.*/||'`"; \
    244             echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
    245             $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
    246           else :; fi; \
    247         done
    248 
    249 uninstall-pkglibLTLIBRARIES:
    250         @$(NORMAL_UNINSTALL)
    251         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    252             p="`echo $$p | sed -e 's|^.*/||'`"; \
    253           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
    254           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
    255         done
    256 
    257 clean-pkglibLTLIBRARIES:
    258         -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
    259         @list='$(pkglib_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
    265 libORXquadtree.la: $(libORXquadtree_la_OBJECTS) $(libORXquadtree_la_DEPENDENCIES)
    266         $(CXXLINK) -rpath $(pkglibdir) $(libORXquadtree_la_LDFLAGS) $(libORXquadtree_la_OBJECTS) $(libORXquadtree_la_LIBADD) $(LIBS)
     227
     228clean-noinstLIBRARIES:
     229        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
     230libORXquadtree.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
    267234
    268235mostlyclean-compile:
    … …  
    272239        -rm -f *.tab.c
    273240
    274 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quadtree.Plo@am__quote@
    275 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quadtree_node.Plo@am__quote@
    276 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spatial_separation.Plo@am__quote@
     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@
    277244
    278245.cc.o:
    … …  
    291258@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    292259@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    293 
    294 .cc.lo:
    295 @am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    296 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    297 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    298 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
    299 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    300 @am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
    301 
    302 mostlyclean-libtool:
    303         -rm -f *.lo
    304 
    305 clean-libtool:
    306         -rm -rf .libs _libs
    307 
    308 distclean-libtool:
    309         -rm -f libtool
    310260uninstall-info-am:
    311261
    … …  
    387337check-am: all-am
    388338check: check-am
    389 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
     339all-am: Makefile $(LIBRARIES) $(HEADERS)
    390340installdirs:
    391         for dir in "$(DESTDIR)$(pkglibdir)"; do \
    392           test -z "$$dir" || $(mkdir_p) "$$dir"; \
    393         done
    394341install: install-am
    395342install-exec: install-exec-am
    … …  
    418365clean: clean-am
    419366
    420 clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
    421         mostlyclean-am
     367clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
    422368
    423369distclean: distclean-am
    … …  
    425371        -rm -f Makefile
    426372distclean-am: clean-am distclean-compile distclean-generic \
    427         distclean-libtool distclean-tags
     373        distclean-tags
    428374
    429375dvi: dvi-am
    … …  
    439385install-data-am:
    440386
    441 install-exec-am: install-pkglibLTLIBRARIES
     387install-exec-am:
    442388
    443389install-info: install-info-am
    … …  
    454400mostlyclean: mostlyclean-am
    455401
    456 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    457         mostlyclean-libtool
     402mostlyclean-am: mostlyclean-compile mostlyclean-generic
    458403
    459404pdf: pdf-am
    … …  
    465410ps-am:
    466411
    467 uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
     412uninstall-am: uninstall-info-am
    468413
    469414.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    470         clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
    471         distclean-compile distclean-generic distclean-libtool \
    472         distclean-tags distdir dvi dvi-am html html-am info info-am \
    473         install install-am install-data install-data-am install-exec \
    474         install-exec-am install-info install-info-am install-man \
    475         install-pkglibLTLIBRARIES install-strip installcheck \
     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 \
    476420        installcheck-am installdirs maintainer-clean \
    477421        maintainer-clean-generic mostlyclean mostlyclean-compile \
    478         mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    479         tags uninstall uninstall-am uninstall-info-am \
    480         uninstall-pkglibLTLIBRARIES
     422        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
     423        uninstall-am uninstall-info-am
    481424
    482425include $(MAINSRCDIR)/defs/include_paths.am
Note: See TracChangeset for help on using the changeset viewer.