Changeset 72

Show
Ignore:
Timestamp:
04/29/08 10:36:22
Author:
mhadji
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • spatialindex/trunk/src/Makefile.in

    r44 r72  
    1 # Makefile.in generated by automake 1.10 from Makefile.am. 
     1# Makefile.in generated by automake 1.9.2 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006  Free Software Foundation, Inc. 
     5# 2003, 2004  Free Software Foundation, Inc. 
    66# This Makefile.in is free software; the Free Software Foundation 
    77# gives unlimited permission to copy and/or distribute it, 
    …… 
    1414 
    1515@SET_MAKE@ 
     16srcdir = @srcdir@ 
     17top_srcdir = @top_srcdir@ 
    1618VPATH = @srcdir@ 
    1719pkgdatadir = $(datadir)/@PACKAGE@ 
    1820pkglibdir = $(libdir)/@PACKAGE@ 
    1921pkgincludedir = $(includedir)/@PACKAGE@ 
     22top_builddir = .. 
    2023am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd 
     24INSTALL = @INSTALL@ 
    2125install_sh_DATA = $(install_sh) -c -m 644 
    2226install_sh_PROGRAM = $(install_sh) -c 
    …… 
    4448RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ 
    4549        html-recursive info-recursive install-data-recursive \ 
    46         install-dvi-recursive install-exec-recursive \ 
    47         install-html-recursive install-info-recursive \ 
    48         install-pdf-recursive install-ps-recursive install-recursive \ 
    49         installcheck-recursive installdirs-recursive pdf-recursive \ 
    50         ps-recursive uninstall-recursive 
    51 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ 
    52   distclean-recursive maintainer-clean-recursive 
     50        install-exec-recursive install-info-recursive \ 
     51        install-recursive installcheck-recursive installdirs-recursive \ 
     52        pdf-recursive ps-recursive uninstall-info-recursive \ 
     53        uninstall-recursive 
    5354ETAGS = etags 
    5455CTAGS = ctags 
    …… 
    5657DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 
    5758ACLOCAL = @ACLOCAL@ 
     59AMDEP_FALSE = @AMDEP_FALSE@ 
     60AMDEP_TRUE = @AMDEP_TRUE@ 
    5861AMTAR = @AMTAR@ 
    5962AR = @AR@ 
    …… 
    8285F77 = @F77@ 
    8386FFLAGS = @FFLAGS@ 
    84 GREP = @GREP@ 
    85 INSTALL = @INSTALL@ 
    8687INSTALL_DATA = @INSTALL_DATA@ 
    8788INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
    …… 
    9596LTLIBOBJS = @LTLIBOBJS@ 
    9697MAKEINFO = @MAKEINFO@ 
    97 MKDIR_P = @MKDIR_P@ 
    9898OBJEXT = @OBJEXT@ 
    9999PACKAGE = @PACKAGE@ 
    …… 
    109109STRIP = @STRIP@ 
    110110VERSION = @VERSION@ 
    111 abs_builddir = @abs_builddir@ 
    112 abs_srcdir = @abs_srcdir@ 
    113 abs_top_builddir = @abs_top_builddir@ 
    114 abs_top_srcdir = @abs_top_srcdir@ 
     111ac_ct_AR = @ac_ct_AR@ 
    115112ac_ct_CC = @ac_ct_CC@ 
    116113ac_ct_CXX = @ac_ct_CXX@ 
    117114ac_ct_F77 = @ac_ct_F77@ 
     115ac_ct_RANLIB = @ac_ct_RANLIB@ 
     116ac_ct_STRIP = @ac_ct_STRIP@ 
     117am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ 
     118am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ 
     119am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ 
     120am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ 
    118121am__include = @am__include@ 
    119122am__leading_dot = @am__leading_dot@ 
    …… 
    127130build_os = @build_os@ 
    128131build_vendor = @build_vendor@ 
    129 builddir = @builddir@ 
    130132datadir = @datadir@ 
    131 datarootdir = @datarootdir@ 
    132 docdir = @docdir@ 
    133 dvidir = @dvidir@ 
    134133exec_prefix = @exec_prefix@ 
    135134host = @host@ 
    …… 
    138137host_os = @host_os@ 
    139138host_vendor = @host_vendor@ 
    140 htmldir = @htmldir@ 
    141139includedir = @includedir@ 
    142140infodir = @infodir@ 
    …… 
    144142libdir = @libdir@ 
    145143libexecdir = @libexecdir@ 
    146 localedir = @localedir@ 
    147144localstatedir = @localstatedir@ 
    148145mandir = @mandir@ 
    149146mkdir_p = @mkdir_p@ 
    150147oldincludedir = @oldincludedir@ 
    151 pdfdir = @pdfdir@ 
    152148prefix = @prefix@ 
    153149program_transform_name = @program_transform_name@ 
    154 psdir = @psdir@ 
    155150sbindir = @sbindir@ 
    156151sharedstatedir = @sharedstatedir@ 
    157 srcdir = @srcdir@ 
    158152sysconfdir = @sysconfdir@ 
    159153target_alias = @target_alias@ 
    160 top_builddir = @top_builddir@ 
    161 top_srcdir = @top_srcdir@ 
    162154SUBDIRS = storagemanager spatialindex rtree mvrtree tprtree tools 
    163155all: all-recursive 
    …… 
    200192        -rm -rf .libs _libs 
    201193 
     194distclean-libtool: 
     195        -rm -f libtool 
     196uninstall-info-am: 
     197 
    202198# This directory's subdirectories are mostly independent; you can cd 
    203199# into them and run `make' without going through this Makefile. 
    …… 
    207203# (2) otherwise, pass the desired values on the `make' command line. 
    208204$(RECURSIVE_TARGETS): 
    209         @failcom='exit 1'; \ 
    210         for f in x $$MAKEFLAGS; do \ 
    211           case $$f in \ 
    212             *=* | --[!k]*);; \ 
    213             *k*) failcom='fail=yes';; \ 
    214           esac; \ 
    215         done; \ 
     205        @set fnord $$MAKEFLAGS; amf=$$2; \ 
    216206        dot_seen=no; \ 
    217207        target=`echo $@ | sed s/-recursive//`; \ 
    …… 
    225215          fi; \ 
    226216          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ 
    227           || eval $$failcom; \ 
     217          || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ 
    228218        done; \ 
    229219        if test "$$dot_seen" = "no"; then \ 
    …… 
    231221        fi; test -z "$$fail" 
    232222 
    233 $(RECURSIVE_CLEAN_TARGETS): 
    234         @failcom='exit 1'; \ 
    235         for f in x $$MAKEFLAGS; do \ 
    236           case $$f in \ 
    237             *=* | --[!k]*);; \ 
    238             *k*) failcom='fail=yes';; \ 
    239           esac; \ 
    240         done; \ 
     223mostlyclean-recursive clean-recursive distclean-recursive \ 
     224maintainer-clean-recursive: 
     225        @set fnord $$MAKEFLAGS; amf=$$2; \ 
    241226        dot_seen=no; \ 
    242227        case "$@" in \ 
    …… 
    259244          fi; \ 
    260245          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ 
    261           || eval $$failcom; \ 
     246          || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ 
    262247        done && test -z "$$fail" 
    263248tags-recursive: 
    …… 
    332317 
    333318distdir: $(DISTFILES) 
    334         @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ 
    335         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ 
    336         list='$(DISTFILES)'; \ 
    337           dist_files=`for file in $$list; do echo $$file; done | \ 
    338           sed -e "s|^$$srcdirstrip/||;t" \ 
    339               -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ 
    340         case $$dist_files in \ 
    341           */*) $(MKDIR_P) `echo "$$dist_files" | \ 
    342                            sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ 
    343                            sort -u` ;; \ 
    344         esac; \ 
    345         for file in $$dist_files; do \ 
     319        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ 
     320        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ 
     321        list='$(DISTFILES)'; for file in $$list; do \ 
     322          case $$file in \ 
     323            $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ 
     324            $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ 
     325          esac; \ 
    346326          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ 
     327          dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ 
     328          if test "$$dir" != "$$file" && test "$$dir" != "."; then \ 
     329            dir="/$$dir"; \ 
     330            $(mkdir_p) "$(distdir)$$dir"; \ 
     331          else \ 
     332            dir=''; \ 
     333          fi; \ 
    347334          if test -d $$d/$$file; then \ 
    348             dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ 
    349335            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ 
    350336              cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ 
    …… 
    360346          if test "$$subdir" = .; then :; else \ 
    361347            test -d "$(distdir)/$$subdir" \ 
    362             || $(MKDIR_P) "$(distdir)/$$subdir" \ 
     348            || $(mkdir_p) "$(distdir)/$$subdir" \ 
    363349            || exit 1; \ 
    364350            distdir=`$(am__cd) $(distdir) && pwd`; \ 
    …… 
    368354                top_distdir="$$top_distdir" \ 
    369355                distdir="$$distdir/$$subdir" \ 
    370                 am__remove_distdir=: \ 
    371                 am__skip_length_check=: \ 
    372356                distdir) \ 
    373357              || exit 1; \ 
    …… 
    409393distclean: distclean-recursive 
    410394        -rm -f Makefile 
    411 distclean-am: clean-am distclean-generic distclean-tags 
     395distclean-am: clean-am distclean-generic distclean-libtool \ 
     396        distclean-tags 
    412397 
    413398dvi: dvi-recursive 
    …… 
    423408install-data-am: 
    424409 
    425 install-dvi: install-dvi-recursive 
    426  
    427410install-exec-am: 
    428411 
    429 install-html: install-html-recursive 
    430  
    431412install-info: install-info-recursive 
    432413 
    433414install-man: 
    434  
    435 install-pdf: install-pdf-recursive 
    436  
    437 install-ps: install-ps-recursive 
    438415 
    439416installcheck-am: 
    …… 
    455432ps-am: 
    456433 
    457 uninstall-am: 
    458  
    459 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ 
    460         install-strip 
    461  
    462 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ 
    463         all all-am check check-am clean clean-generic clean-libtool \ 
    464         ctags ctags-recursive distclean distclean-generic \ 
    465         distclean-libtool distclean-tags distdir dvi dvi-am html \ 
     434uninstall-am: uninstall-info-am 
     435 
     436uninstall-info: uninstall-info-recursive 
     437 
     438.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ 
     439        clean clean-generic clean-libtool clean-recursive ctags \ 
     440        ctags-recursive distclean distclean-generic distclean-libtool \ 
     441        distclean-recursive distclean-tags distdir dvi dvi-am html \ 
    466442        html-am info info-am install install-am install-data \ 
    467         install-data-am install-dvi install-dvi-am install-exec \ 
    468         install-exec-am install-html install-html-am install-info \ 
    469         install-info-am install-man install-pdf install-pdf-am \ 
    470         install-ps install-ps-am install-strip installcheck \ 
     443        install-data-am install-exec install-exec-am install-info \ 
     444        install-info-am install-man install-strip installcheck \ 
    471445        installcheck-am installdirs installdirs-am maintainer-clean \ 
    472         maintainer-clean-generic mostlyclean mostlyclean-generic \ 
    473         mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ 
    474         uninstall uninstall-am 
     446        maintainer-clean-generic maintainer-clean-recursive \ 
     447        mostlyclean mostlyclean-generic mostlyclean-libtool \ 
     448        mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ 
     449        uninstall uninstall-am uninstall-info-am 
    475450 
    476451# Tell versions [3.59,3.63) of GNU make to not export all variables. 

  • spatialindex/trunk/src/mvrtree/Makefile.in

    r45 r72  
    1 # Makefile.in generated by automake 1.10 from Makefile.am. 
     1# Makefile.in generated by automake 1.9.2 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006  Free Software Foundation, Inc. 
     5# 2003, 2004  Free Software Foundation, Inc. 
    66# This Makefile.in is free software; the Free Software Foundation 
    77# gives unlimited permission to copy and/or distribute it, 
    …… 
    1515@SET_MAKE@ 
    1616 
     17SOURCES = $(libmvrtree_la_SOURCES) 
     18 
     19srcdir = @srcdir@ 
     20top_srcdir = @top_srcdir@ 
    1721VPATH = @srcdir@ 
    1822pkgdatadir = $(datadir)/@PACKAGE@ 
    1923pkglibdir = $(libdir)/@PACKAGE@ 
    2024pkgincludedir = $(includedir)/@PACKAGE@ 
     25top_builddir = ../.. 
    2126am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd 
     27INSTALL = @INSTALL@ 
    2228install_sh_DATA = $(install_sh) -c -m 644 
    2329install_sh_PROGRAM = $(install_sh) -c 
    …… 
    4652        Statistics.lo 
    4753libmvrtree_la_OBJECTS = $(am_libmvrtree_la_OBJECTS) 
    48 DEFAULT_INCLUDES = -I.@am__isrc@ 
     54DEFAULT_INCLUDES = -I. -I$(srcdir) 
    4955depcomp = $(SHELL) $(top_srcdir)/depcomp 
    5056am__depfiles_maybe = depfiles 
    5157CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 
    5258        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) 
    53 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ 
    54         --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 
    55         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) 
     59LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \ 
     60        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ 
     61        $(AM_CXXFLAGS) $(CXXFLAGS) 
    5662CXXLD = $(CXX) 
    57 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ 
    58         --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ 
    59         $(LDFLAGS) -o $@ 
     63CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \ 
     64        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ 
    6065COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ 
    6166        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 
    62 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ 
    63         --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 
    64         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 
     67LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \ 
     68        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ 
     69        $(AM_CFLAGS) $(CFLAGS) 
    6570CCLD = $(CC) 
    66 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ 
    67         --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ 
    68         $(LDFLAGS) -o $@ 
     71LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ 
     72        $(AM_LDFLAGS) $(LDFLAGS) -o $@ 
    6973SOURCES = $(libmvrtree_la_SOURCES) 
    7074DIST_SOURCES = $(libmvrtree_la_SOURCES) 
    …… 
    7377DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 
    7478ACLOCAL = @ACLOCAL@ 
     79AMDEP_FALSE = @AMDEP_FALSE@ 
     80AMDEP_TRUE = @AMDEP_TRUE@ 
    7581AMTAR = @AMTAR@ 
    7682AR = @AR@ 
    …… 
    99105F77 = @F77@ 
    100106FFLAGS = @FFLAGS@ 
    101 GREP = @GREP@ 
    102 INSTALL = @INSTALL@ 
    103107INSTALL_DATA = @INSTALL_DATA@ 
    104108INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
    …… 
    112116LTLIBOBJS = @LTLIBOBJS@ 
    113117MAKEINFO = @MAKEINFO@ 
    114 MKDIR_P = @MKDIR_P@ 
    115118OBJEXT = @OBJEXT@ 
    116119PACKAGE = @PACKAGE@ 
    …… 
    126129STRIP = @STRIP@ 
    127130VERSION = @VERSION@ 
    128 abs_builddir = @abs_builddir@ 
    129 abs_srcdir = @abs_srcdir@ 
    130 abs_top_builddir = @abs_top_builddir@ 
    131 abs_top_srcdir = @abs_top_srcdir@ 
     131ac_ct_AR = @ac_ct_AR@ 
    132132ac_ct_CC = @ac_ct_CC@ 
    133133ac_ct_CXX = @ac_ct_CXX@ 
    134134ac_ct_F77 = @ac_ct_F77@ 
     135ac_ct_RANLIB = @ac_ct_RANLIB@ 
     136ac_ct_STRIP = @ac_ct_STRIP@ 
     137am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ 
     138am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ 
     139am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ 
     140am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ 
    135141am__include = @am__include@ 
    136142am__leading_dot = @am__leading_dot@ 
    …… 
    144150build_os = @build_os@ 
    145151build_vendor = @build_vendor@ 
    146 builddir = @builddir@ 
    147152datadir = @datadir@ 
    148 datarootdir = @datarootdir@ 
    149 docdir = @docdir@ 
    150 dvidir = @dvidir@ 
    151153exec_prefix = @exec_prefix@ 
    152154host = @host@ 
    …… 
    155157host_os = @host_os@ 
    156158host_vendor = @host_vendor@ 
    157 htmldir = @htmldir@ 
    158159includedir = @includedir@ 
    159160infodir = @infodir@ 
    …… 
    161162libdir = @libdir@ 
    162163libexecdir = @libexecdir@ 
    163 localedir = @localedir@ 
    164164localstatedir = @localstatedir@ 
    165165mandir = @mandir@ 
    166166mkdir_p = @mkdir_p@ 
    167167oldincludedir = @oldincludedir@ 
    168 pdfdir = @pdfdir@ 
    169168prefix = @prefix@ 
    170169program_transform_name = @program_transform_name@ 
    171 psdir = @psdir@ 
    172170sbindir = @sbindir@ 
    173171sharedstatedir = @sharedstatedir@ 
    174 srcdir = @srcdir@ 
    175172sysconfdir = @sysconfdir@ 
    176173target_alias = @target_alias@ 
    177 top_builddir = @top_builddir@ 
    178 top_srcdir = @top_srcdir@ 
    179174noinst_LTLIBRARIES = libmvrtree.la 
    180175INCLUDES = -I../../include  
    …… 
    223218        done 
    224219libmvrtree.la: $(libmvrtree_la_OBJECTS) $(libmvrtree_la_DEPENDENCIES)  
    225         $(CXXLINK)  $(libmvrtree_la_OBJECTS) $(libmvrtree_la_LIBADD) $(LIBS) 
     220        $(CXXLINK)  $(libmvrtree_la_LDFLAGS) $(libmvrtree_la_OBJECTS) $(libmvrtree_la_LIBADD) $(LIBS) 
    226221 
    227222mostlyclean-compile: 
    …… 
    238233 
    239234.cc.o: 
    240 @am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 
    241 @am__fastdepCXX_TRUE@   mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 
     235@am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ 
     236@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi 
    242237@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 
    243238@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 
    …… 
    245240 
    246241.cc.obj: 
    247 @am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` 
    248 @am__fastdepCXX_TRUE@   mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 
     242@am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ 
     243@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi 
    249244@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 
    250245@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 
    …… 
    252247 
    253248.cc.lo: 
    254 @am__fastdepCXX_TRUE@   $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 
    255 @am__fastdepCXX_TRUE@   mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo 
     249@am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ 
     250@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi 
    256251@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ 
    257252@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 
    …… 
    263258clean-libtool: 
    264259        -rm -rf .libs _libs 
     260 
     261distclean-libtool: 
     262        -rm -f libtool 
     263uninstall-info-am: 
    265264 
    266265ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) 
    …… 
    313312 
    314313distdir: $(DISTFILES) 
    315         @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ 
    316         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ 
    317         list='$(DISTFILES)'; \ 
    318           dist_files=`for file in $$list; do echo $$file; done | \ 
    319           sed -e "s|^$$srcdirstrip/||;t" \ 
    320               -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ 
    321         case $$dist_files in \ 
    322           */*) $(MKDIR_P) `echo "$$dist_files" | \ 
    323                            sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ 
    324                            sort -u` ;; \ 
    325         esac; \ 
    326         for file in $$dist_files; do \ 
     314        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ 
     315        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ 
     316        list='$(DISTFILES)'; for file in $$list; do \ 
     317          case $$file in \ 
     318            $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ 
     319            $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ 
     320          esac; \ 
    327321          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ 
     322          dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ 
     323          if test "$$dir" != "$$file" && test "$$dir" != "."; then \ 
     324            dir="/$$dir"; \ 
     325            $(mkdir_p) "$(distdir)$$dir"; \ 
     326          else \ 
     327            dir=''; \ 
     328          fi; \ 
    328329          if test -d $$d/$$file; then \ 
    329             dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ 
    330330            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ 
    331331              cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ 
    …… 
    375375        -rm -f Makefile 
    376376distclean-am: clean-am distclean-compile distclean-generic \ 
    377         distclean-tags 
     377        distclean-libtool distclean-tags 
    378378 
    379379dvi: dvi-am 
    …… 
    389389install-data-am: 
    390390 
    391 install-dvi: install-dvi-am 
    392  
    393391install-exec-am: 
    394392 
    395 install-html: install-html-am 
    396  
    397393install-info: install-info-am 
    398394 
    399395install-man: 
    400  
    401 install-pdf: install-pdf-am 
    402  
    403 install-ps: install-ps-am 
    404396 
    405397installcheck-am: 
    …… 
    423415ps-am: 
    424416 
    425 uninstall-am: 
    426  
    427 .MAKE: install-am install-strip 
     417uninstall-am: uninstall-info-am 
    428418 
    429419.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ 
    …… 
    431421        distclean-compile distclean-generic distclean-libtool \ 
    432422        distclean-tags distdir dvi dvi-am html html-am info info-am \ 
    433         install install-am install-data install-data-am install-dvi \ 
    434         install-dvi-am install-exec install-exec-am install-html \ 
    435         install-html-am install-info install-info-am install-man \ 
    436         install-pdf install-pdf-am install-ps install-ps-am \ 
     423        install install-am install-data install-data-am install-exec \ 
     424        install-exec-am install-info install-info-am install-man \ 
    437425        install-strip installcheck installcheck-am installdirs \ 
    438426        maintainer-clean maintainer-clean-generic mostlyclean \ 
    439427        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ 
    440         pdf pdf-am ps ps-am tags uninstall uninstall-am 
     428        pdf pdf-am ps ps-am tags uninstall uninstall-am \ 
     429        uninstall-info-am 
    441430 
    442431# Tell versions [3.59,3.63) of GNU make to not export all variables. 

  • spatialindex/trunk/src/mvrtree/Node.cc

    r67 r72  
    795795                                        } 
    796796                                        // duplicate entries have been removed and the set is sorted 
    797         //                              size_t SiCounts[Si.size() - 1]; 
    798 //                                      bzero(SiCounts, (Si.size() - 1) * sizeof(size_t)); 
    799                     size_t *SiCounts; 
    800                     SiCounts = (size_t*) malloc((Si.size()-1)*sizeof(size_t)); 
    801                      
     797                                        size_t* SiCounts = new size_t[Si.size() - 1]; 
     798                                        bzero(SiCounts, (Si.size() - 1) * sizeof(size_t)); 
     799 
    802800                                        for (size_t cSiblingChild = 0; cSiblingChild < sibling->m_children; cSiblingChild++) 
    803801                                        { 
    …… 
    837835                                                if (good) Sdel.push_back(toCheck[cCheck]); 
    838836                                        } 
     837 
     838                                        delete[] SiCounts; 
    839839 
    840840                                        if (Sdel.empty()) continue; 

  • spatialindex/trunk/src/rtree/Makefile.in

    r45 r72  
    1 # Makefile.in generated by automake 1.10 from Makefile.am. 
     1# Makefile.in generated by automake 1.9.2 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006  Free Software Foundation, Inc. 
     5# 2003, 2004  Free Software Foundation, Inc. 
    66# This Makefile.in is free software; the Free Software Foundation 
    77# gives unlimited permission to copy and/or distribute it, 
    …… 
    1515@SET_MAKE@ 
    1616 
     17SOURCES = $(librtree_la_SOURCES) 
     18 
     19srcdir = @srcdir@ 
     20top_srcdir = @top_srcdir@ 
    1721VPATH = @srcdir@ 
    1822pkgdatadir = $(datadir)/@PACKAGE@ 
    1923pkglibdir = $(libdir)/@PACKAGE@ 
    2024pkgincludedir = $(includedir)/@PACKAGE@ 
     25top_builddir = ../.. 
    2126am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd 
     27INSTALL = @INSTALL@ 
    2228install_sh_DATA = $(install_sh) -c -m 644 
    2329install_sh_PROGRAM = $(install_sh) -c 
    …… 
    4652        RTree.lo Statistics.lo 
    4753librtree_la_OBJECTS = $(am_librtree_la_OBJECTS) 
    48 DEFAULT_INCLUDES = -I.@am__isrc@ 
     54DEFAULT_INCLUDES = -I. -I$(srcdir) 
    4955depcomp = $(SHELL) $(top_srcdir)/depcomp 
    5056am__depfiles_maybe = depfiles 
    5157CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 
    5258        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) 
    53 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ 
    54         --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 
    55         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) 
     59LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \ 
     60        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ 
     61        $(AM_CXXFLAGS) $(CXXFLAGS) 
    5662CXXLD = $(CXX) 
    57 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ 
    58         --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ 
    59         $(LDFLAGS) -o $@ 
     63CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \ 
     64        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ 
    6065COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ 
    6166        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 
    62 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ 
    63         --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 
    64         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 
     67LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \ 
     68        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ 
     69        $(AM_CFLAGS) $(CFLAGS) 
    6570CCLD = $(CC) 
    66 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ 
    67         --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ 
    68         $(LDFLAGS) -o $@ 
     71LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ 
     72        $(AM_LDFLAGS) $(LDFLAGS) -o $@ 
    6973SOURCES = $(librtree_la_SOURCES) 
    7074DIST_SOURCES = $(librtree_la_SOURCES) 
    …… 
    7377DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 
    7478ACLOCAL = @ACLOCAL@ 
     79AMDEP_FALSE = @AMDEP_FALSE@ 
     80AMDEP_TRUE = @AMDEP_TRUE@ 
    7581AMTAR = @AMTAR@ 
    7682AR = @AR@ 
    …… 
    99105F77 = @F77@ 
    100106FFLAGS = @FFLAGS@ 
    101 GREP = @GREP@ 
    102 INSTALL = @INSTALL@ 
    103107INSTALL_DATA = @INSTALL_DATA@ 
    104108INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
    …… 
    112116LTLIBOBJS = @LTLIBOBJS@ 
    113117MAKEINFO = @MAKEINFO@ 
    114 MKDIR_P = @MKDIR_P@ 
    115118OBJEXT = @OBJEXT@ 
    116119PACKAGE = @PACKAGE@ 
    …… 
    126129STRIP = @STRIP@ 
    127130VERSION = @VERSION@ 
    128 abs_builddir = @abs_builddir@ 
    129 abs_srcdir = @abs_srcdir@ 
    130 abs_top_builddir = @abs_top_builddir@ 
    131 abs_top_srcdir = @abs_top_srcdir@ 
     131ac_ct_AR = @ac_ct_AR@ 
    132132ac_ct_CC = @ac_ct_CC@ 
    133133ac_ct_CXX = @ac_ct_CXX@ 
    134134ac_ct_F77 = @ac_ct_F77@ 
     135ac_ct_RANLIB = @ac_ct_RANLIB@ 
     136ac_ct_STRIP = @ac_ct_STRIP@ 
     137am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ 
     138am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ 
     139am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ 
     140am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ 
    135141am__include = @am__include@ 
    136142am__leading_dot = @am__leading_dot@ 
    …… 
    144150build_os = @build_os@ 
    145151build_vendor = @build_vendor@ 
    146 builddir = @builddir@ 
    147152datadir = @datadir@ 
    148 datarootdir = @datarootdir@ 
    149 docdir = @docdir@ 
    150 dvidir = @dvidir@ 
    151153exec_prefix = @exec_prefix@ 
    152154host = @host@ 
    …… 
    155157host_os = @host_os@ 
    156158host_vendor = @host_vendor@ 
    157 htmldir = @htmldir@ 
    158159includedir = @includedir@ 
    159160infodir = @infodir@ 
    …… 
    161162libdir = @libdir@ 
    162163libexecdir = @libexecdir@ 
    163 localedir = @localedir@ 
    164164localstatedir = @localstatedir@ 
    165165mandir = @mandir@ 
    166166mkdir_p = @mkdir_p@ 
    167167oldincludedir = @oldincludedir@ 
    168 pdfdir = @pdfdir@ 
    169168prefix = @prefix@ 
    170169program_transform_name = @program_transform_name@ 
    171 psdir = @psdir@ 
    172170sbindir = @sbindir@ 
    173171sharedstatedir = @sharedstatedir@ 
    174 srcdir = @srcdir@ 
    175172sysconfdir = @sysconfdir@ 
    176173target_alias = @target_alias@ 
    177 top_builddir = @top_builddir@ 
    178 top_srcdir = @top_srcdir@ 
    179174noinst_LTLIBRARIES = librtree.la 
    180175INCLUDES = -I../../include  
    …… 
    223218        done 
    224219librtree.la: $(librtree_la_OBJECTS) $(librtree_la_DEPENDENCIES)  
    225         $(CXXLINK)  $(librtree_la_OBJECTS) $(librtree_la_LIBADD) $(LIBS) 
     220        $(CXXLINK)  $(librtree_la_LDFLAGS) $(librtree_la_OBJECTS) $(librtree_la_LIBADD) $(LIBS) 
    226221 
    227222mostlyclean-compile: 
    …… 
    239234 
    240235.cc.o: 
    241 @am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 
    242 @am__fastdepCXX_TRUE@   mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 
     236@am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ 
     237@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi 
    243238@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 
    244239@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 
    …… 
    246241 
    247242.cc.obj: 
    248 @am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` 
    249 @am__fastdepCXX_TRUE@   mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 
     243@am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ 
     244@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi 
    250245@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 
    251246@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 
    …… 
    253248 
    254249.cc.lo: 
    255 @am__fastdepCXX_TRUE@   $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 
    256 @am__fastdepCXX_TRUE@   mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo 
     250@am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ 
     251@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi 
    257252@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ 
    258253@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 
    …… 
    264259clean-libtool: 
    265260        -rm -rf .libs _libs 
     261 
     262distclean-libtool: 
     263        -rm -f libtool 
     264uninstall-info-am: 
    266265 
    267266ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) 
    …… 
    314313 
    315314distdir: $(DISTFILES) 
    316         @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ 
    317         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ 
    318         list='$(DISTFILES)'; \ 
    319           dist_files=`for file in $$list; do echo $$file; done | \ 
    320           sed -e "s|^$$srcdirstrip/||;t" \ 
    321               -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ 
    322         case $$dist_files in \ 
    323           */*) $(MKDIR_P) `echo "$$dist_files" | \ 
    324                            sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ 
    325                            sort -u` ;; \ 
    326         esac; \ 
    327         for file in $$dist_files; do \ 
     315        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ 
     316        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ 
     317        list='$(DISTFILES)'; for file in $$list; do \ 
     318          case $$file in \ 
     319            $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ 
     320            $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ 
     321          esac; \ 
    328322          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ 
     323          dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ 
     324          if test "$$dir" != "$$file" && test "$$dir" != "."; then \ 
     325            dir="/$$dir"; \ 
     326            $(mkdir_p) "$(distdir)$$dir"; \ 
     327          else \ 
     328            dir=''; \ 
     329          fi; \ 
    329330          if test -d $$d/$$file; then \ 
    330             dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ 
    331331            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ 
    332332              cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ 
    …… 
    376376        -rm -f Makefile 
    377377distclean-am: clean-am distclean-compile distclean-generic \ 
    378         distclean-tags 
     378        distclean-libtool distclean-tags 
    379379 
    380380dvi: dvi-am 
    …… 
    390390install-data-am: 
    391391 
    392 install-dvi: install-dvi-am 
    393  
    394392install-exec-am: 
    395393 
    396 install-html: install-html-am 
    397  
    398394install-info: install-info-am 
    399395 
    400396install-man: 
    401  
    402 install-pdf: install-pdf-am 
    403  
    404 install-ps: install-ps-am 
    405397 
    406398installcheck-am: 
    …… 
    424416ps-am: 
    425417 
    426 uninstall-am: 
    427  
    428 .MAKE: install-am install-strip 
     418uninstall-am: uninstall-info-am 
    429419 
    430420.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ 
    …… 
    432422        distclean-compile distclean-generic distclean-libtool \ 
    433423        distclean-tags distdir dvi dvi-am html html-am info info-am \ 
    434         install install-am install-data install-data-am install-dvi \ 
    435         install-dvi-am install-exec install-exec-am install-html \ 
    436         install-html-am install-info install-info-am install-man \ 
    437         install-pdf install-pdf-am install-ps install-ps-am \ 
     424        install install-am install-data install-data-am install-exec \ 
     425        install-exec-am install-info install-info-am install-man \ 
    438426        install-strip installcheck installcheck-am installdirs \ 
    439427        maintainer-clean maintainer-clean-generic mostlyclean \ 
    440428        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ 
    441         pdf pdf-am ps ps-am tags uninstall uninstall-am 
     429        pdf pdf-am ps ps-am tags uninstall uninstall-am \ 
     430        uninstall-info-am 
    442431 
    443432# Tell versions [3.59,3.63) of GNU make to not export all variables. 

  • spatialindex/trunk/src/spatialindex/LineSegment.cc

    r70 r72  
    173173void LineSegment::getCenter(Point& out) const 
    174174{ 
    175         double coords = new double[m_dimension]; 
     175        double* coords = new double[m_dimension]; 
    176176        for (size_t cDim = 0; cDim < m_dimension; cDim++) 
    177177        { 
    …… 
    181181        } 
    182182 
     183        out = Point(coords, m_dimension); 
    183184        delete[] coords; 
    184         out = Point(coords, m_dimension); 
    185185} 
    186186 
    …… 
    192192void LineSegment::getMBR(Region& out) const 
    193193{ 
    194         double low = new double[m_dimension]; 
    195         double high = new double[m_dimension]; 
     194        double* low = new double[m_dimension]; 
     195        double* high = new double[m_dimension]; 
    196196        for (size_t cDim = 0; cDim < m_dimension; cDim++) 
    197197        { 
    …… 
    200200        } 
    201201 
     202        out = Region(low, high, m_dimension); 
    202203        delete[] low; 
    203204        delete[] high; 
    204         out = Region(low, high, m_dimension); 
    205205} 
    206206 

  • spatialindex/trunk/src/spatialindex/Makefile.in

    r45 r72  
    1 # Makefile.in generated by automake 1.10 from Makefile.am. 
     1# Makefile.in generated by automake 1.9.2 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006  Free Software Foundation, Inc. 
     5# 2003, 2004  Free Software Foundation, Inc. 
    66# This Makefile.in is free software; the Free Software Foundation 
    77# gives unlimited permission to copy and/or distribute it, 
    …… 
    1515@SET_MAKE@ 
    1616 
     17SOURCES = $(liblibrary_la_SOURCES) 
     18 
     19srcdir = @srcdir@ 
     20top_srcdir = @top_srcdir@ 
    1721VPATH = @srcdir@ 
    1822pkgdatadir = $(datadir)/@PACKAGE@ 
    1923pkglibdir = $(libdir)/@PACKAGE@ 
    2024pkgincludedir = $(includedir)/@PACKAGE@ 
     25top_builddir = ../.. 
    2126am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd 
     27INSTALL = @INSTALL@ 
    2228install_sh_DATA = $(install_sh) -c -m 644 
    2329install_sh_PROGRAM = $(install_sh) -c 
    …… 
    4753        SpatialIndexImpl.lo 
    4854liblibrary_la_OBJECTS = $(am_liblibrary_la_OBJECTS) 
    49 DEFAULT_INCLUDES = -I.@am__isrc@ 
     55DEFAULT_INCLUDES = -I. -I$(srcdir) 
    5056depcomp = $(SHELL) $(top_srcdir)/depcomp 
    5157am__depfiles_maybe = depfiles 
    5258CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 
    5359        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) 
    54 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ 
    55         --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 
    56         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) 
     60LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \ 
     61        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ 
     62        $(AM_CXXFLAGS) $(CXXFLAGS) 
    5763CXXLD = $(CXX) 
    58 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ 
    59         --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ 
    60         $(LDFLAGS) -o $@ 
     64CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \ 
     65        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ 
    6166COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ 
    6267        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 
    63 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ 
    64         --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 
    65         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 
     68LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \ 
     69        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ 
     70        $(AM_CFLAGS) $(CFLAGS) 
    6671CCLD = $(CC) 
    67 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ 
    68         --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ 
    69         $(LDFLAGS) -o $@ 
     72LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ 
     73        $(AM_LDFLAGS) $(LDFLAGS) -o $@ 
    7074SOURCES = $(liblibrary_la_SOURCES) 
    7175DIST_SOURCES = $(liblibrary_la_SOURCES) 
    …… 
    7478DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 
    7579ACLOCAL = @ACLOCAL@ 
     80AMDEP_FALSE = @AMDEP_FALSE@ 
     81AMDEP_TRUE = @AMDEP_TRUE@ 
    76<