Changeset 73

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

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • spatialindex/trunk/include/Makefile.in

    r44 r73  
    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 
     17srcdir = @srcdir@ 
     18top_srcdir = @top_srcdir@ 
    1719VPATH = @srcdir@ 
    1820pkgdatadir = $(datadir)/@PACKAGE@ 
    1921pkglibdir = $(libdir)/@PACKAGE@ 
    2022pkgincludedir = $(includedir)/@PACKAGE@ 
     23top_builddir = .. 
    2124am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd 
     25INSTALL = @INSTALL@ 
    2226install_sh_DATA = $(install_sh) -c -m 644 
    2327install_sh_PROGRAM = $(install_sh) -c 
    …… 
    4650RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ 
    4751        html-recursive info-recursive install-data-recursive \ 
    48         install-dvi-recursive install-exec-recursive \ 
    49         install-html-recursive install-info-recursive \ 
    50         install-pdf-recursive install-ps-recursive install-recursive \ 
    51         installcheck-recursive installdirs-recursive pdf-recursive \ 
    52         ps-recursive uninstall-recursive 
     52        install-exec-recursive install-info-recursive \ 
     53        install-recursive installcheck-recursive installdirs-recursive \ 
     54        pdf-recursive ps-recursive uninstall-info-recursive \ 
     55        uninstall-recursive 
    5356am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; 
    5457am__vpath_adj = case $$p in \ 
    …… 
    6063spatialindexHEADERS_INSTALL = $(INSTALL_HEADER) 
    6164HEADERS = $(spatialindex_HEADERS) 
    62 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ 
    63   distclean-recursive maintainer-clean-recursive 
    6465ETAGS = etags 
    6566CTAGS = ctags 
    …… 
    6768DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 
    6869ACLOCAL = @ACLOCAL@ 
     70AMDEP_FALSE = @AMDEP_FALSE@ 
     71AMDEP_TRUE = @AMDEP_TRUE@ 
    6972AMTAR = @AMTAR@ 
    7073AR = @AR@ 
    …… 
    9396F77 = @F77@ 
    9497FFLAGS = @FFLAGS@ 
    95 GREP = @GREP@ 
    96 INSTALL = @INSTALL@ 
    9798INSTALL_DATA = @INSTALL_DATA@ 
    9899INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
    …… 
    106107LTLIBOBJS = @LTLIBOBJS@ 
    107108MAKEINFO = @MAKEINFO@ 
    108 MKDIR_P = @MKDIR_P@ 
    109109OBJEXT = @OBJEXT@ 
    110110PACKAGE = @PACKAGE@ 
    …… 
    120120STRIP = @STRIP@ 
    121121VERSION = @VERSION@ 
    122 abs_builddir = @abs_builddir@ 
    123 abs_srcdir = @abs_srcdir@ 
    124 abs_top_builddir = @abs_top_builddir@ 
    125 abs_top_srcdir = @abs_top_srcdir@ 
     122ac_ct_AR = @ac_ct_AR@ 
    126123ac_ct_CC = @ac_ct_CC@ 
    127124ac_ct_CXX = @ac_ct_CXX@ 
    128125ac_ct_F77 = @ac_ct_F77@ 
     126ac_ct_RANLIB = @ac_ct_RANLIB@ 
     127ac_ct_STRIP = @ac_ct_STRIP@ 
     128am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ 
     129am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ 
     130am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ 
     131am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ 
    129132am__include = @am__include@ 
    130133am__leading_dot = @am__leading_dot@ 
    …… 
    138141build_os = @build_os@ 
    139142build_vendor = @build_vendor@ 
    140 builddir = @builddir@ 
    141143datadir = @datadir@ 
    142 datarootdir = @datarootdir@ 
    143 docdir = @docdir@ 
    144 dvidir = @dvidir@ 
    145144exec_prefix = @exec_prefix@ 
    146145host = @host@ 
    …… 
    149148host_os = @host_os@ 
    150149host_vendor = @host_vendor@ 
    151 htmldir = @htmldir@ 
    152150includedir = @includedir@ 
    153151infodir = @infodir@ 
    …… 
    155153libdir = @libdir@ 
    156154libexecdir = @libexecdir@ 
    157 localedir = @localedir@ 
    158155localstatedir = @localstatedir@ 
    159156mandir = @mandir@ 
    160157mkdir_p = @mkdir_p@ 
    161158oldincludedir = @oldincludedir@ 
    162 pdfdir = @pdfdir@ 
    163159prefix = @prefix@ 
    164160program_transform_name = @program_transform_name@ 
    165 psdir = @psdir@ 
    166161sbindir = @sbindir@ 
    167162sharedstatedir = @sharedstatedir@ 
    168 srcdir = @srcdir@ 
    169163sysconfdir = @sysconfdir@ 
    170164target_alias = @target_alias@ 
    171 top_builddir = @top_builddir@ 
    172 top_srcdir = @top_srcdir@ 
    173165SUBDIRS = tools 
    174166spatialindexdir = $(includedir)/spatialindex 
    …… 
    223215clean-libtool: 
    224216        -rm -rf .libs _libs 
     217 
     218distclean-libtool: 
     219        -rm -f libtool 
     220uninstall-info-am: 
    225221install-spatialindexHEADERS: $(spatialindex_HEADERS) 
    226222        @$(NORMAL_INSTALL) 
    227         test -z "$(spatialindexdir)" || $(MKDIR_P) "$(DESTDIR)$(spatialindexdir)" 
     223        test -z "$(spatialindexdir)" || $(mkdir_p) "$(DESTDIR)$(spatialindexdir)" 
    228224        @list='$(spatialindex_HEADERS)'; for p in $$list; do \ 
    229225          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ 
    …… 
    248244# (2) otherwise, pass the desired values on the `make' command line. 
    249245$(RECURSIVE_TARGETS): 
    250         @failcom='exit 1'; \ 
    251         for f in x $$MAKEFLAGS; do \ 
    252           case $$f in \ 
    253             *=* | --[!k]*);; \ 
    254             *k*) failcom='fail=yes';; \ 
    255           esac; \ 
    256         done; \ 
     246        @set fnord $$MAKEFLAGS; amf=$$2; \ 
    257247        dot_seen=no; \ 
    258248        target=`echo $@ | sed s/-recursive//`; \ 
    …… 
    266256          fi; \ 
    267257          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ 
    268           || eval $$failcom; \ 
     258          || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ 
    269259        done; \ 
    270260        if test "$$dot_seen" = "no"; then \ 
    …… 
    272262        fi; test -z "$$fail" 
    273263 
    274 $(RECURSIVE_CLEAN_TARGETS): 
    275         @failcom='exit 1'; \ 
    276         for f in x $$MAKEFLAGS; do \ 
    277           case $$f in \ 
    278             *=* | --[!k]*);; \ 
    279             *k*) failcom='fail=yes';; \ 
    280           esac; \ 
    281         done; \ 
     264mostlyclean-recursive clean-recursive distclean-recursive \ 
     265maintainer-clean-recursive: 
     266        @set fnord $$MAKEFLAGS; amf=$$2; \ 
    282267        dot_seen=no; \ 
    283268        case "$@" in \ 
    …… 
    300285          fi; \ 
    301286          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ 
    302           || eval $$failcom; \ 
     287          || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ 
    303288        done && test -z "$$fail" 
    304289tags-recursive: 
    …… 
    373358 
    374359distdir: $(DISTFILES) 
    375         @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ 
    376         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ 
    377         list='$(DISTFILES)'; \ 
    378           dist_files=`for file in $$list; do echo $$file; done | \ 
    379           sed -e "s|^$$srcdirstrip/||;t" \ 
    380               -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ 
    381         case $$dist_files in \ 
    382           */*) $(MKDIR_P) `echo "$$dist_files" | \ 
    383                            sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ 
    384                            sort -u` ;; \ 
    385         esac; \ 
    386         for file in $$dist_files; do \ 
     360        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ 
     361        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ 
     362        list='$(DISTFILES)'; for file in $$list; do \ 
     363          case $$file in \ 
     364            $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ 
     365            $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ 
     366          esac; \ 
    387367          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ 
     368          dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ 
     369          if test "$$dir" != "$$file" && test "$$dir" != "."; then \ 
     370            dir="/$$dir"; \ 
     371            $(mkdir_p) "$(distdir)$$dir"; \ 
     372          else \ 
     373            dir=''; \ 
     374          fi; \ 
    388375          if test -d $$d/$$file; then \ 
    389             dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ 
    390376            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ 
    391377              cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ 
    …… 
    401387          if test "$$subdir" = .; then :; else \ 
    402388            test -d "$(distdir)/$$subdir" \ 
    403             || $(MKDIR_P) "$(distdir)/$$subdir" \ 
     389            || $(mkdir_p) "$(distdir)/$$subdir" \ 
    404390            || exit 1; \ 
    405391            distdir=`$(am__cd) $(distdir) && pwd`; \ 
    …… 
    409395                top_distdir="$$top_distdir" \ 
    410396                distdir="$$distdir/$$subdir" \ 
    411                 am__remove_distdir=: \ 
    412                 am__skip_length_check=: \ 
    413397                distdir) \ 
    414398              || exit 1; \ 
    …… 
    421405installdirs-am: 
    422406        for dir in "$(DESTDIR)$(spatialindexdir)"; do \ 
    423           test -z "$$dir" || $(MKDIR_P) "$$dir"; \ 
     407          test -z "$$dir" || $(mkdir_p) "$$dir"; \ 
    424408        done 
    425409install: install-recursive 
    …… 
    453437distclean: distclean-recursive 
    454438        -rm -f Makefile 
    455 distclean-am: clean-am distclean-generic distclean-tags 
     439distclean-am: clean-am distclean-generic distclean-libtool \ 
     440        distclean-tags 
    456441 
    457442dvi: dvi-recursive 
    …… 
    467452install-data-am: install-spatialindexHEADERS 
    468453 
    469 install-dvi: install-dvi-recursive 
    470  
    471454install-exec-am: 
    472455 
    473 install-html: install-html-recursive 
    474  
    475456install-info: install-info-recursive 
    476457 
    477458install-man: 
    478  
    479 install-pdf: install-pdf-recursive 
    480  
    481 install-ps: install-ps-recursive 
    482459 
    483460installcheck-am: 
    …… 
    499476ps-am: 
    500477 
    501 uninstall-am: uninstall-spatialindexHEADERS 
    502  
    503 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ 
    504         install-strip 
    505  
    506 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ 
    507         all all-am check check-am clean clean-generic clean-libtool \ 
    508         ctags ctags-recursive distclean distclean-generic \ 
    509         distclean-libtool distclean-tags distdir dvi dvi-am html \ 
     478uninstall-am: uninstall-info-am uninstall-spatialindexHEADERS 
     479 
     480uninstall-info: uninstall-info-recursive 
     481 
     482.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ 
     483        clean clean-generic clean-libtool clean-recursive ctags \ 
     484        ctags-recursive distclean distclean-generic distclean-libtool \ 
     485        distclean-recursive distclean-tags distdir dvi dvi-am html \ 
    510486        html-am info info-am install install-am install-data \ 
    511         install-data-am install-dvi install-dvi-am install-exec \ 
    512         install-exec-am install-html install-html-am install-info \ 
    513         install-info-am install-man install-pdf install-pdf-am \ 
    514         install-ps install-ps-am install-spatialindexHEADERS \ 
     487        install-data-am install-exec install-exec-am install-info \ 
     488        install-info-am install-man install-spatialindexHEADERS \ 
    515489        install-strip installcheck installcheck-am installdirs \ 
    516490        installdirs-am maintainer-clean maintainer-clean-generic \ 
    517         mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ 
    518         ps ps-am tags tags-recursive uninstall uninstall-am \ 
     491        maintainer-clean-recursive mostlyclean mostlyclean-generic \ 
     492        mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ 
     493        tags tags-recursive uninstall uninstall-am uninstall-info-am \ 
    519494        uninstall-spatialindexHEADERS 
    520495 

  • spatialindex/trunk/include/SpatialIndex.h

    r67 r73  
    2525#include "tools/Tools.h" 
    2626using namespace Tools; 
    27 // 
    28 //# if !HAVE_MEMCPY 
    29 //#  define memcpy(d, s, n) bcopy ((s), (d), (n)) 
    30 //#  define memmove(d, s, n) bcopy ((s), (d), (n)) 
    31 //# endif 
    32 // 
     27 
    3328# if !HAVE_BZERO 
    3429#  define bzero(d, n) memset((d), 0, (n)) 
    …… 
    3833        #define M_PI_2 1.57079632679489661922 
    3934#endif 
    40  
    4135 
    4236namespace SpatialIndex 

  • spatialindex/trunk/include/tools/Makefile.in

    r44 r73  
    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 
     17srcdir = @srcdir@ 
     18top_srcdir = @top_srcdir@ 
    1719VPATH = @srcdir@ 
    1820pkgdatadir = $(datadir)/@PACKAGE@ 
    1921pkglibdir = $(libdir)/@PACKAGE@ 
    2022pkgincludedir = $(includedir)/@PACKAGE@ 
     23top_builddir = ../.. 
    2124am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd 
     25INSTALL = @INSTALL@ 
    2226install_sh_DATA = $(install_sh) -c -m 644 
    2327install_sh_PROGRAM = $(install_sh) -c 
    …… 
    5761DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 
    5862ACLOCAL = @ACLOCAL@ 
     63AMDEP_FALSE = @AMDEP_FALSE@ 
     64AMDEP_TRUE = @AMDEP_TRUE@ 
    5965AMTAR = @AMTAR@ 
    6066AR = @AR@ 
    …… 
    8389F77 = @F77@ 
    8490FFLAGS = @FFLAGS@ 
    85 GREP = @GREP@ 
    86 INSTALL = @INSTALL@ 
    8791INSTALL_DATA = @INSTALL_DATA@ 
    8892INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
    …… 
    96100LTLIBOBJS = @LTLIBOBJS@ 
    97101MAKEINFO = @MAKEINFO@ 
    98 MKDIR_P = @MKDIR_P@ 
    99102OBJEXT = @OBJEXT@ 
    100103PACKAGE = @PACKAGE@ 
    …… 
    110113STRIP = @STRIP@ 
    111114VERSION = @VERSION@ 
    112 abs_builddir = @abs_builddir@ 
    113 abs_srcdir = @abs_srcdir@ 
    114 abs_top_builddir = @abs_top_builddir@ 
    115 abs_top_srcdir = @abs_top_srcdir@ 
     115ac_ct_AR = @ac_ct_AR@ 
    116116ac_ct_CC = @ac_ct_CC@ 
    117117ac_ct_CXX = @ac_ct_CXX@ 
    118118ac_ct_F77 = @ac_ct_F77@ 
     119ac_ct_RANLIB = @ac_ct_RANLIB@ 
     120ac_ct_STRIP = @ac_ct_STRIP@ 
     121am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ 
     122am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ 
     123am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ 
     124am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ 
    119125am__include = @am__include@ 
    120126am__leading_dot = @am__leading_dot@ 
    …… 
    128134build_os = @build_os@ 
    129135build_vendor = @build_vendor@ 
    130 builddir = @builddir@ 
    131136datadir = @datadir@ 
    132 datarootdir = @datarootdir@ 
    133 docdir = @docdir@ 
    134 dvidir = @dvidir@ 
    135137exec_prefix = @exec_prefix@ 
    136138host = @host@ 
    …… 
    139141host_os = @host_os@ 
    140142host_vendor = @host_vendor@ 
    141 htmldir = @htmldir@ 
    142143includedir = @includedir@ 
    143144infodir = @infodir@ 
    …… 
    145146libdir = @libdir@ 
    146147libexecdir = @libexecdir@ 
    147 localedir = @localedir@ 
    148148localstatedir = @localstatedir@ 
    149149mandir = @mandir@ 
    150150mkdir_p = @mkdir_p@ 
    151151oldincludedir = @oldincludedir@ 
    152 pdfdir = @pdfdir@ 
    153152prefix = @prefix@ 
    154153program_transform_name = @program_transform_name@ 
    155 psdir = @psdir@ 
    156154sbindir = @sbindir@ 
    157155sharedstatedir = @sharedstatedir@ 
    158 srcdir = @srcdir@ 
    159156sysconfdir = @sysconfdir@ 
    160157target_alias = @target_alias@ 
    161 top_builddir = @top_builddir@ 
    162 top_srcdir = @top_srcdir@ 
    163158spatialindexdir = $(includedir)/spatialindex/tools 
    164159dist_spatialindex_HEADERS = Tools.h \ 
    …… 
    206201clean-libtool: 
    207202        -rm -rf .libs _libs 
     203 
     204distclean-libtool: 
     205        -rm -f libtool 
     206uninstall-info-am: 
    208207install-dist_spatialindexHEADERS: $(dist_spatialindex_HEADERS) 
    209208        @$(NORMAL_INSTALL) 
    210         test -z "$(spatialindexdir)" || $(MKDIR_P) "$(DESTDIR)$(spatialindexdir)" 
     209        test -z "$(spatialindexdir)" || $(mkdir_p) "$(DESTDIR)$(spatialindexdir)" 
    211210        @list='$(dist_spatialindex_HEADERS)'; for p in $$list; do \ 
    212211          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ 
    …… 
    273272 
    274273distdir: $(DISTFILES) 
    275         @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ 
    276         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ 
    277         list='$(DISTFILES)'; \ 
    278           dist_files=`for file in $$list; do echo $$file; done | \ 
    279           sed -e "s|^$$srcdirstrip/||;t" \ 
    280               -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ 
    281         case $$dist_files in \ 
    282           */*) $(MKDIR_P) `echo "$$dist_files" | \ 
    283                            sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ 
    284                            sort -u` ;; \ 
    285         esac; \ 
    286         for file in $$dist_files; do \ 
     274        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ 
     275        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ 
     276        list='$(DISTFILES)'; for file in $$list; do \ 
     277          case $$file in \ 
     278            $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ 
     279            $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ 
     280          esac; \ 
    287281          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ 
     282          dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ 
     283          if test "$$dir" != "$$file" && test "$$dir" != "."; then \ 
     284            dir="/$$dir"; \ 
     285            $(mkdir_p) "$(distdir)$$dir"; \ 
     286          else \ 
     287            dir=''; \ 
     288          fi; \ 
    288289          if test -d $$d/$$file; then \ 
    289             dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ 
    290290            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ 
    291291              cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ 
    …… 
    303303installdirs: 
    304304        for dir in "$(DESTDIR)$(spatialindexdir)"; do \ 
    305           test -z "$$dir" || $(MKDIR_P) "$$dir"; \ 
     305          test -z "$$dir" || $(mkdir_p) "$$dir"; \ 
    306306        done 
    307307install: install-am 
    …… 
    335335distclean: distclean-am 
    336336        -rm -f Makefile 
    337 distclean-am: clean-am distclean-generic distclean-tags 
     337distclean-am: clean-am distclean-generic distclean-libtool \ 
     338        distclean-tags 
    338339 
    339340dvi: dvi-am 
    …… 
    349350install-data-am: install-dist_spatialindexHEADERS 
    350351 
    351 install-dvi: install-dvi-am 
    352  
    353352install-exec-am: 
    354353 
    355 install-html: install-html-am 
    356  
    357354install-info: install-info-am 
    358355 
    359356install-man: 
    360  
    361 install-pdf: install-pdf-am 
    362  
    363 install-ps: install-ps-am 
    364357 
    365358installcheck-am: 
    …… 
    381374ps-am: 
    382375 
    383 uninstall-am: uninstall-dist_spatialindexHEADERS 
    384  
    385 .MAKE: install-am install-strip 
     376uninstall-am: uninstall-dist_spatialindexHEADERS uninstall-info-am 
    386377 
    387378.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ 
    …… 
    389380        distclean-libtool distclean-tags distdir dvi dvi-am html \ 
    390381        html-am info info-am install install-am install-data \ 
    391         install-data-am install-dist_spatialindexHEADERS install-dvi \ 
    392         install-dvi-am install-exec install-exec-am install-html \ 
    393         install-html-am install-info install-info-am install-man \ 
    394         install-pdf install-pdf-am install-ps install-ps-am \ 
     382        install-data-am install-dist_spatialindexHEADERS install-exec \ 
     383        install-exec-am install-info install-info-am install-man \ 
    395384        install-strip installcheck installcheck-am installdirs \ 
    396385        maintainer-clean maintainer-clean-generic mostlyclean \ 
    397386        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ 
    398         tags uninstall uninstall-am uninstall-dist_spatialindexHEADERS 
     387        tags uninstall uninstall-am uninstall-dist_spatialindexHEADERS \ 
     388        uninstall-info-am 
    399389 
    400390# Tell versions [3.59,3.63) of GNU make to not export all variables. 

  • spatialindex/trunk/include/tools/Tools.h

    r67 r73  
    2424 
    2525#ifdef _MSC_VER 
    26    typedef signed char            int8_t; 
    27    typedef short int              int16_t; 
    28    typedef int                    int32_t; 
    29    typedef __int64                 int64_t; 
    30    typedef unsigned char          uint8_t; 
    31    typedef unsigned short int      uint16_t; 
    32    typedef unsigned int            uint32_t; 
    33    typedef unsigned __int64        uint64_t; 
     26   typedef __int8 int8_t; 
     27   typedef __int16 int16_t; 
     28   typedef __int32 int32_t; 
     29   typedef __int64 int64_t; 
     30   typedef unsigned __int8 uint8_t; 
     31   typedef unsigned __int16 uint16_t; 
     32   typedef unsigned __int32 uint32_t; 
     33   typedef unsigned __int64 uint64_t; 
    3434#else 
    3535   #include <stdint.h>           
    3636#endif 
    3737 
    38 //#include <stdint.h> 
    3938#include <assert.h> 
    4039#include <iostream>