[geos-commits] [SCM] GEOS branch master updated. dae18d6c6555b4b129ec053af3a50f7045fd5413
git at osgeo.org
git at osgeo.org
Fri Jan 15 19:59:09 PST 2021
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".
The branch, master has been updated
via dae18d6c6555b4b129ec053af3a50f7045fd5413 (commit)
via 907d3b0b51484ddad0403217ac47c7bcc2a50eef (commit)
via 29802a665505aa5fa00f942754d6d16ddfed5823 (commit)
from 228ba06f8503132fa9d16509df0e1e843f2ab413 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit dae18d6c6555b4b129ec053af3a50f7045fd5413
Author: Daniel Baston <dbaston at gmail.com>
Date: Fri Jan 15 21:09:03 2021 -0500
[CMake] Disable issue-geos-837 test on 32-bit builds
diff --git a/tests/xmltester/CMakeLists.txt b/tests/xmltester/CMakeLists.txt
index b99cc0b..9b8040c 100644
--- a/tests/xmltester/CMakeLists.txt
+++ b/tests/xmltester/CMakeLists.txt
@@ -24,6 +24,7 @@ target_include_directories(test_xmltester
PRIVATE
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>/tinyxml)
+# Scan the directories of XML tests and create a test for each.
foreach(_testdir general issue misc robust validate)
file(GLOB_RECURSE _testfiles ${CMAKE_CURRENT_LIST_DIR}/tests/${_testdir}/*.xml CONFIGURE_DEPEND)
foreach(_testfile ${_testfiles})
@@ -31,6 +32,10 @@ foreach(_testdir general issue misc robust validate)
add_test(NAME ${_testdir}-${_testname} COMMAND test_xmltester -v --test-valid-output ${_testfile})
endforeach()
endforeach()
+
+# Disable tests that are known to fail on 32-bit systems.
+set_tests_properties(issue-issue-geos-837 PROPERTIES DISABLED $<EQUAL:4,${CMAKE_SIZEOF_VOID_P}>)
+
unset(_testdir)
unset(_testname)
unset(_testfile)
commit 907d3b0b51484ddad0403217ac47c7bcc2a50eef
Author: Daniel Baston <dbaston at gmail.com>
Date: Fri Jan 15 20:29:45 2021 -0500
[CMake] Add -ffloat-store to 32-bit build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d3dd8c..342da91 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -168,6 +168,11 @@ target_compile_options(geos_cxx_flags INTERFACE
"$<$<CXX_COMPILER_ID:MSVC>:/fp:precise>"
)
+# Use -ffloat-store for 32-bit builds (needed to make some tests pass)
+target_compile_options(geos_cxx_flags INTERFACE
+ $<$<AND:$<CXX_COMPILER_ID:GNU>,$<EQUAL:4,${CMAKE_SIZEOF_VOID_P}>>:-ffloat-store>
+)
+
#-----------------------------------------------------------------------------
# Target geos_cxx_flags: common compilation flags
#-----------------------------------------------------------------------------
commit 29802a665505aa5fa00f942754d6d16ddfed5823
Author: Daniel Baston <dbaston at gmail.com>
Date: Thu Jan 14 16:26:12 2021 -0500
Remove autotools configuration
diff --git a/.drone-1.0.yml b/.drone-1.0.yml
index 52b5357..73d30a2 100644
--- a/.drone-1.0.yml
+++ b/.drone-1.0.yml
@@ -16,8 +16,9 @@ steps:
image: *test-image
pull: always
commands:
- - ./autogen.sh
- - CXXFLAGS="-O0" ./configure
+ - mkdir build
+ - cd build
+ - CXXFLAGS="-O0" cmake ..
- make V=0
- name: check
image: *test-image
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2007c7f..04b9619 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,6 @@ on: [push, pull_request]
env:
BUILD_TYPE: 'Release'
- MAKEFLAGS: '-j2'
jobs:
linux:
@@ -26,18 +25,10 @@ jobs:
}
- {
compiler: g++,
- build: autotools,
- cxxstd: 11,
- arch: 64,
- packages: 'g++ automake doxygen git2cl',
- os: ubuntu-18.04
- }
- - {
- compiler: g++,
- build: autotools,
+ build: cmake,
cxxstd: 11,
arch: 32,
- packages: 'g++-4.8-multilib gcc-4.8-multilib g++-multilib gcc-multilib doxygen automake git2cl',
+ packages: 'g++-4.8-multilib gcc-4.8-multilib g++-multilib gcc-multilib cmake doxygen',
os: ubuntu-18.04
}
- {
@@ -88,26 +79,18 @@ jobs:
uses: actions/checkout at v2
- name: 'Build'
+ env:
+ CFLAGS: "-m${{ matrix.ci.arch }}"
+ CXXFLAGS: "-m${{ matrix.ci.arch }}"
run: |
set -e
- if [ ${{ matrix.ci.build }} == 'cmake' ];
- then
- mkdir build.cmake
- cd build.cmake
- cmake --version
- cmake -DCMAKE_CXX_COMPILER=${{ matrix.ci.compiler }} -DCMAKE_CXX_STANDARD=${{ matrix.ci.cxxstd }} -DBUILD_DOCUMENTATION=YES -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..
- make
- cmake --build . --target docs
- ctest --output-on-failure .
- else
- set -e
- ./autogen.sh
- mkdir build.autotools
- cd build.autotools
- CFLAGS="-std=c++${{ matrix.ci.cxxstd }} -m${{ matrix.ci.arch }}"
- ../configure CC=${{ matrix.ci.compiler }} CXX=${{ matrix.ci.compiler }} CXXFLAGS="$CFLAGS" CFLAGS="$CFLAGS"
- make && make check && make distcheck
- fi
+ mkdir build.cmake
+ cd build.cmake
+ cmake --version
+ cmake -DCMAKE_CXX_COMPILER=${{ matrix.ci.compiler }} -DCMAKE_CXX_STANDARD=${{ matrix.ci.cxxstd }} -DBUILD_DOCUMENTATION=YES -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..
+ cmake --build . -j 2
+ cmake --build . --target docs
+ ctest --output-on-failure .
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c0ce10c..65f76c7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,14 @@
before_script:
- apt-get update -qq
- - apt-get install -y --allow-unauthenticated build-essential autoconf automake libtool lsb-release
+ - apt-get install -y --allow-unauthenticated build-essential cmake lsb-release
- lsb_release -a
- uname -a
test:
script:
- - ./autogen.sh
- - ./configure
+ - mkdir build
+ - cd build
+ - cmake ..
- make V=0
- make check V=0
- install -m 755 /bin/true /usr/local/bin/git2cl
diff --git a/.travis.yml b/.travis.yml
index 0cac68f..707fc74 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,18 +51,6 @@ matrix:
addons:
apt:
sources: *sources
- packages: ['g++-7','ccache','git2cl','doxygen']
- env:
- - E="TOOL=autotools && CXX=g++-7 && ARCH=-m64 && CC=gcc-7"
-
- - os: linux
- cache:
- apt: true
- directories:
- - $HOME/.ccache
- addons:
- apt:
- sources: *sources
packages: ['g++-4.8','cmake','ccache','doxygen']
env:
- E="TOOL=cmake && BUILD_TYPE=Release && CXX=g++-4.8 && ARCH=-m64 && CC=gcc-4.8"
@@ -75,18 +63,6 @@ matrix:
addons:
apt:
sources: *sources
- packages: ['g++-4.8-multilib','gcc-4.8-multilib','g++-multilib','gcc-multilib','ccache','git2cl','doxygen']
- env:
- - E="TOOL=autotools && CXX=g++-4.8 && ARCH=-m32 && CC=gcc-4.8"
-
- - os: linux
- cache:
- apt: true
- directories:
- - $HOME/.ccache
- addons:
- apt:
- sources: *sources
packages: ['clang-3.9','cmake','ccache','doxygen']
env:
- E="TOOL=cmake && BUILD_TYPE=Release && CXX=clang++-3.9 && ARCH=-m64 && CC=clang-3.9"
@@ -104,21 +80,6 @@ matrix:
- E="TOOL=cmake && BUILD_TYPE=Release && CXX=clang++ && ARCH=-m64 && CC=clang"
- os: linux
- cache:
- apt: true
- directories:
- - $HOME/.ccache
- addons:
- apt:
- sources:
- - ubuntu-toolchain-r-test
- - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main'
- key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
- packages: ['clang-9', 'clang-tools-9', 'ccache','doxygen']
- env:
- - E="TOOL=autotools_scanbuild && BUILD_TYPE=Release && ARCH=-m64"
-
- - os: linux
dist: bionic
arch: arm64
cache:
@@ -148,9 +109,6 @@ matrix:
# env:
# - E="TOOL=cmake && BUILD_TYPE=Release && CXX=clang++ && CC=clang"
- allow_failures:
- - env: E="TOOL=autotools_scanbuild && BUILD_TYPE=Release && ARCH=-m64"
-
before_install:
- eval "${E}"
- export CXXFLAGS=${ARCH}
diff --git a/HOWTO_RELEASE b/HOWTO_RELEASE
index 2e356bc..2500fa5 100644
--- a/HOWTO_RELEASE
+++ b/HOWTO_RELEASE
@@ -18,12 +18,11 @@
5. Run 'make dist-bzip2'.
- $ ./autogen.sh && ./configure && make dist-bzip2
+ $ mkdir build && cd build && cmake .. && cmake --build . --target dist
6. Verify that you can un-pack and build the tarball.
- - autotools: ./configure && make check
- - cmake: mkdir build && cd build && cmake .. && make && make check
+ - mkdir build && cd build && cmake .. && make && make check
7. Copy the tarball to upload.osgeo.org:/osgeo/download/geos
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index dac8e06..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-# NOTE: Make sure that 'src' appears first.
-# 'capi' and 'doc' surely rely on availability of libgeos
-# which is built under 'src' and it seems that automake
-# is not able to detect required build order but blindly
-# relies on the order items in SUBDIRS appear.
-#
-
-# foreign is needed to avoid enforced ChangeLog in EXTRA_DIST
-# (we'll still take care of adding it ourselves)
-AUTOMAKE_OPTIONS = foreign
-
-SUBDIRS = \
- include \
- src \
- capi \
- doc \
- macros \
- tests \
- benchmarks \
- util \
- tools
-
-BUILT_SOURCES =
-
-EXTRA_DIST = \
- README.md \
- acsite.m4 \
- .editorconfig \
- Version.txt \
- CMakeLists.txt \
- cmake/cmake_uninstall.cmake.in \
- cmake/geos-config.cmake \
- cmake/FindMakeDistCheck.cmake
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = tools/geos.pc
-
-ACLOCAL_AMFLAGS = -I macros
-
-dist-hook: gen-ChangeLog
-
-gen-ChangeLog:
- cd $(distdir) && owd=`pwd` && \
- cd ../ && cd $(srcdir) && \
- if test -d .git; then \
- git log --pretty --numstat --summary | git2cl > $${owd}/ChangeLog; \
- elif test -d .svn; then \
- svn2cl --authors=authors.svn -i -o $${owd}/ChangeLog; \
- elif test -f ChangeLog; then \
- cp ChangeLog $${owd}/ChangeLog; \
- fi
-
-apidoc doxygen:
- cd doc && make $@
-
-doxygen-checked:
- ( set -o pipefail; \
- ! make doxygen 2>&1 > /dev/null | \
- grep -v '\(not documented\|ignoring unsupported tag\)'; \
- )
-
-authors.git: authors.svn
- cd $(srcdir) && sed -e 's/:/ = /' authors.svn > authors.git
-
-svnrebase: authors.git
- cd $(srcdir) && git svn rebase --authors-file authors.git
-
-VALGRIND = $(LIBTOOL) --mode=execute valgrind --leak-check=full --error-exitcode=1
-
-valgrindcheck:
- $(VALGRIND) tests/unit/geos_unit
-
-check-local:
- ! find $(srcdir) -name '*.cpp' -o -name '*.h' | \
- grep -v tests/xmltester/tinyxml | \
- xargs grep -n '[[:space:]]$$'
diff --git a/acsite.m4 b/acsite.m4
deleted file mode 100644
index 2b8d2df..0000000
--- a/acsite.m4
+++ /dev/null
@@ -1,55 +0,0 @@
-# This has been taken from postgres-9.1+ local macros
-# ( REL9_1_BETA2-1484-g293ec33 )
-
-# PGAC_TYPE_64BIT_INT(TYPE)
-# -------------------------
-# Check if TYPE is a working 64 bit integer type. Set HAVE_TYPE_64 to
-# yes or no respectively, and define HAVE_TYPE_64 if yes.
-AC_DEFUN([PGAC_TYPE_64BIT_INT],
-[define([Ac_define], [translit([have_$1_64], [a-z *], [A-Z_P])])dnl
-define([Ac_cachevar], [translit([pgac_cv_type_$1_64], [ *], [_p])])dnl
-AC_CACHE_CHECK([whether $1 is 64 bits], [Ac_cachevar],
-[AC_TRY_RUN(
-[typedef $1 ac_int64;
-
-/*
- * These are globals to discourage the compiler from folding all the
- * arithmetic tests down to compile-time constants.
- */
-ac_int64 a = 20000001;
-ac_int64 b = 40000005;
-
-int does_int64_work()
-{
- ac_int64 c,d;
-
- if (sizeof(ac_int64) != 8)
- return 0; /* definitely not the right size */
-
- /* Do perfunctory checks to see if 64-bit arithmetic seems to work */
- c = a * b;
- d = (c + b) / b;
- if (d != a+1)
- return 0;
- return 1;
-}
-main() {
- if (does_int64_work())
- exit(0);
- exit(-1);
-}],
-[Ac_cachevar=yes],
-[Ac_cachevar=no],
-[# If cross-compiling, check the size reported by the compiler and
-# trust that the arithmetic works.
-AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([], [sizeof($1) == 8])],
- Ac_cachevar=yes,
- Ac_cachevar=no)])])
-
-Ac_define=$Ac_cachevar
-if test x"$Ac_cachevar" = xyes ; then
- AC_DEFINE(Ac_define, 1, [Define to 1 if `]$1[' works and is 64 bits.])
-fi
-undefine([Ac_define])dnl
-undefine([Ac_cachevar])dnl
-])# PGAC_TYPE_64BIT_INT
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index b2950c1..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-#
-#
-# GEOS Bootstrapping Script
-#
-giveup()
-{
- echo
- echo " Something went wrong, giving up!"
- echo
- exit 1
-}
-
-OSTYPE=`uname -s`
-
-AUTOCONF=`which autoconf 2>/dev/null`
-if [ ! ${AUTOCONF} ]; then
- echo "Missing autoconf!"
- exit
-fi
-AUTOCONF_VER=`${AUTOCONF} --version | grep -E "^.*[0-9]$" | sed 's/^.* //'`
-
-AUTOHEADER=`which autoheader 2>/dev/null`
-if [ ! ${AUTOHEADER} ]; then
- echo "Missing autoheader!"
- exit
-fi
-
-for aclocal in aclocal aclocal-1.10 aclocal-1.9; do
- ACLOCAL=`which $aclocal 2>/dev/null`
- if test -x "${ACLOCAL}"; then
- break;
- fi
-done
-if [ ! ${ACLOCAL} ]; then
- echo "Missing aclocal!"
- exit
-fi
-ACLOCAL_VER=`${ACLOCAL} --version | grep -E "^.*[0-9]$" | sed 's/^.* //'`
-
-for automake in automake automake-1.10 automake-1.9; do
- AUTOMAKE=`which $automake 2>/dev/null`
- if test -x "${AUTOMAKE}"; then
- break;
- fi
-done
-if [ ! ${AUTOMAKE} ]; then
- echo "Missing automake!"
- exit
-fi
-AUTOMAKE_VER=`${AUTOMAKE} --version | grep -E "^.*[0-9]$" | sed 's/^.* //'`
-
-for libtoolize in libtoolize glibtoolize; do
- LIBTOOLIZE=`which $libtoolize 2>/dev/null`
- if test -x "${LIBTOOLIZE}"; then
- break;
- fi
-done
-if [ ! ${LIBTOOLIZE} ]; then
- echo "Missing libtoolize!"
- exit
-fi
-LIBTOOLIZE_VER=`${LIBTOOLIZE} --version | grep -E "^.*[0-9]\.[0-9]" | sed 's/^.* //'`
-
-AMOPTS="--add-missing --copy -Woverride"
-if test "$OSTYPE" = "IRIX" -o "$OSTYPE" = "IRIX64"; then
- AMOPTS=$AMOPTS" --include-deps";
-fi
-
-LTOPTS="--force --copy"
-echo "* Running ${LIBTOOLIZE} (${LIBTOOLIZE_VER})"
-echo " OPTIONS = ${LTOPTS}"
-${LIBTOOLIZE} ${LTOPTS} || giveup
-
-echo "* Running $ACLOCAL (${ACLOCAL_VER})"
-${ACLOCAL} -I macros || giveup
-
-echo "* Running ${AUTOHEADER} (${AUTOCONF_VER})"
-${AUTOHEADER} || giveup
-
-echo "* Running ${AUTOMAKE} (${AUTOMAKE_VER})"
-echo " OPTIONS = ${AMOPTS}"
-${AUTOMAKE} ${AMOPTS} || giveup
-
-echo "* Running ${AUTOCONF} (${AUTOCONF_VER})"
-${AUTOCONF} || giveup
-
-if test -f "${PWD}/configure"; then
- echo "======================================"
- echo "Now you are ready to run './configure'"
- echo "======================================"
-else
- echo " Failed to generate ./configure script!"
- giveup
-fi
-
diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am
deleted file mode 100644
index 82f124d..0000000
--- a/benchmarks/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS = \
- algorithm \
- operation \
- capi
-
-LIBS = $(top_builddir)/src/libgeos.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-noinst_PROGRAMS = ClassSizes
-
-ClassSizes_SOURCES = ClassSizes.cpp
-
-EXTRA_DIST = CMakeLists.txt
diff --git a/benchmarks/algorithm/Makefile.am b/benchmarks/algorithm/Makefile.am
deleted file mode 100644
index 226f3d8..0000000
--- a/benchmarks/algorithm/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-prefix=@prefix@
-top_srcdir=@top_srcdir@
-top_builddir=@top_builddir@
-
-noinst_PROGRAMS = \
- InteriorPointAreaPerfTest \
- VoronoiPerfTest \
- UnaryUnionSegmentsPerfTest
-
-InteriorPointAreaPerfTest_SOURCES = InteriorPointAreaPerfTest.cpp
-InteriorPointAreaPerfTest_LDADD = $(top_builddir)/src/libgeos.la
-
-VoronoiPerfTest_SOURCES = VoronoiPerfTest.cpp
-VoronoiPerfTest_LDADD = $(top_builddir)/src/libgeos.la
-
-UnaryUnionSegmentsPerfTest_SOURCES = UnaryUnionSegmentsPerfTest.cpp
-UnaryUnionSegmentsPerfTest_LDADD = $(top_builddir)/src/libgeos.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/src/io/markup
-
-EXTRA_DIST = CMakeLists.txt
diff --git a/benchmarks/capi/Makefile.am b/benchmarks/capi/Makefile.am
deleted file mode 100644
index 9463c3f..0000000
--- a/benchmarks/capi/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-prefix=@prefix@
-top_srcdir=@top_srcdir@
-top_builddir=@top_builddir@
-
-check_PROGRAMS = \
- memleak_mp_prep \
- GEOSPreparedContainsPerfTest \
- IntersectionPerfTest \
- UnaryOpPerfTest
-
-LIBS = $(top_builddir)/capi/libgeos_c.la
-AM_CPPFLAGS = -I$(top_builddir)/capi -I$(top_srcdir)/include
-
-memleak_mp_prep_SOURCES = memleak_mp_prep.c
-memleak_mp_prep_LDADD = $(LIBS)
-
-GEOSPreparedContainsPerfTest_SOURCES = GEOSPreparedContainsPerfTest.cpp
-GEOSPreparedContainsPerfTest_LDADD = $(top_builddir)/src/libgeos.la
-
-IntersectionPerfTest_SOURCES = IntersectionPerfTest.cpp
-IntersectionPerfTest_LDADD = $(top_builddir)/src/libgeos.la
-
-UnaryOpPerfTest_SOURCES = UnaryOpPerfTest.cpp
-UnaryOpPerfTest_LDADD = $(top_builddir)/src/libgeos.la
-
-EXTRA_DIST = CMakeLists.txt
diff --git a/benchmarks/operation/Makefile.am b/benchmarks/operation/Makefile.am
deleted file mode 100644
index 36ff948..0000000
--- a/benchmarks/operation/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS = \
- buffer \
- predicate
-
-EXTRA_DIST = CMakeLists.txt
-
diff --git a/benchmarks/operation/buffer/Makefile.am b/benchmarks/operation/buffer/Makefile.am
deleted file mode 100644
index f270b5f..0000000
--- a/benchmarks/operation/buffer/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-prefix=@prefix@
-top_srcdir=@top_srcdir@
-top_builddir=@top_builddir@
-
-noinst_PROGRAMS = IteratedBufferStressTest
-
-LIBS = $(top_builddir)/src/libgeos.la
-
-IteratedBufferStressTest_SOURCES = IteratedBufferStressTest.cpp
-IteratedBufferStressTest_LDADD = $(LIBS)
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-EXTRA_DIST = CMakeLists.txt
diff --git a/benchmarks/operation/predicate/Makefile.am b/benchmarks/operation/predicate/Makefile.am
deleted file mode 100644
index 621456e..0000000
--- a/benchmarks/operation/predicate/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-prefix=@prefix@
-top_srcdir=@top_srcdir@
-top_builddir=@top_builddir@
-
-noinst_PROGRAMS = RectangleIntersectsPerfTest
-
-LIBS = $(top_builddir)/src/libgeos.la
-
-RectangleIntersectsPerfTest_SOURCES = RectangleIntersectsPerfTest.cpp
-RectangleIntersectsPerfTest_LDADD = $(LIBS)
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-EXTRA_DIST = CMakeLists.txt
diff --git a/capi/Makefile.am b/capi/Makefile.am
deleted file mode 100644
index 3e5f7be..0000000
--- a/capi/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-prefix=@prefix@
-top_srcdir=@top_srcdir@
-GEOS_CAPI_VERSION="@VERSION at -CAPI-@CAPI_VERSION@"
-GEOS_JTS_PORT="@JTS_PORT@"
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-capidir = $(includedir)
-
-nodist_capi_HEADERS = \
- geos_c.h
-
-lib_LTLIBRARIES = libgeos_c.la
-
-DIR_SOURCES = \
- geos_c.cpp \
- geos_ts_c.cpp \
- $(NULL)
-
-libgeos_c_la_SOURCES = $(DIR_SOURCES)
-libgeos_c_la_CPPFLAGS = $(AM_CPPFLAGS) -DGEOS_CAPI_VERSION='$(GEOS_CAPI_VERSION)' -DGEOS_JTS_PORT='$(GEOS_JTS_PORT)'
-libgeos_c_la_LIBADD = $(top_builddir)/src/libgeos.la
-libgeos_c_la_LDFLAGS = \
- -version-info @CAPI_INTERFACE_CURRENT@:@CAPI_INTERFACE_REVISION@:@CAPI_INTERFACE_AGE@ \
- -no-undefined
-
-dist-local:
- cp -p $(DIST_SOURCES) Makefile.am Makefile.in $(distdir)
-
-EXTRA_DIST = CMakeLists.txt
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 91732b1..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,434 +0,0 @@
-dnl
-dnl configure.in - autoconf input template to produce ./configure script
-dnl
-dnl version 2.52 is required for Cygwin libtool support
-AC_PREREQ([2.63])
-
-dnl local vars to hold user's preferences --------------------------------
-AC_INIT([include/geos.h])
-AC_CANONICAL_SYSTEM
-
-AC_CONFIG_MACRO_DIR([macros])
-
-dnl
-dnl -- Release versions / C++ library SONAME will use these
-dnl -- encoding ABI break at every release
-dnl
-VERTXT=${srcdir}/Version.txt
-VERSION_MAJOR=`cat $VERTXT | awk -F= '/^GEOS_VERSION_MAJOR/ {print $2}'`
-VERSION_MINOR=`cat $VERTXT | awk -F= '/^GEOS_VERSION_MINOR/ {print $2}'`
-VERSION_PATCH=`cat $VERTXT | awk -F= '/^GEOS_VERSION_PATCH/ {print $2}'`
-PATCH_WORD=`cat $VERTXT | awk -F= '/^GEOS_PATCH_WORD/ {print $2}'`
-
-VERSION_PATCH=${VERSION_PATCH}${PATCH_WORD}
-VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
-VERSION_RELEASE=`echo "$VERSION" | sed -E 's/^([[0-9]+\.[0-9]+\.[0-9]+]).*$/\1/'`
-
-AC_MSG_CHECKING([for GEOS version])
-AC_MSG_RESULT(["$VERSION"])
-
-CAPI_INTERFACE_CURRENT=`cat $VERTXT | awk -F= '/^CAPI_INTERFACE_CURRENT/ {print $2}'`
-CAPI_INTERFACE_REVISION=`cat $VERTXT | awk -F= '/^CAPI_INTERFACE_REVISION/ {print $2}'`
-CAPI_INTERFACE_AGE=`cat $VERTXT | awk -F= '/^CAPI_INTERFACE_AGE/ {print $2}'`
-
-dnl CAPI_VERSION_MAJOR=$(($CAPI_INTERFACE_CURRENT-$CAPI_INTERFACE_AGE))
-dnl the following should be more portable
-CAPI_VERSION_MAJOR=`expr $CAPI_INTERFACE_CURRENT - $CAPI_INTERFACE_AGE`
-CAPI_VERSION_MINOR=$CAPI_INTERFACE_AGE
-CAPI_VERSION_PATCH=$CAPI_INTERFACE_REVISION
-CAPI_VERSION="$CAPI_VERSION_MAJOR.$CAPI_VERSION_MINOR.$CAPI_VERSION_PATCH"
-
-AC_MSG_CHECKING([for GEOS CAPI version])
-AC_MSG_RESULT(["$CAPI_VERSION"])
-
-AM_INIT_AUTOMAKE([geos], [$VERSION], [no-define])
-AM_MAINTAINER_MODE
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
-AC_CONFIG_HEADERS([include/config.h])
-AC_PROG_CC
-
-AC_CONFIG_LINKS([tools/astyle.sh:tools/astyle.sh])
-
-dnl -- JTS_PORT: the version of JTS this release is bound to
-dnl JTS_PORT=1.13.0
-JTS_PORT=`cat $VERTXT | awk -F= '/^JTS_PORT/ {print $2}'`
-
-DOXYGEN_LOGFILE=
-AC_SUBST(DOXYGEN_LOGFILE)
-
-dnl Hush warnings
-AC_DEFINE(USE_UNSTABLE_GEOS_CPP_API, [1], [We know])
-
-dnl use libtool ----------------------------------------------------------
-AC_LIBTOOL_DLOPEN
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
-
-dnl check for programs ----------------------------------------------------
-AC_PROG_CXX
-AC_ISC_POSIX
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-
-dnl function checks ------------------------------------------------------
-AC_FUNC_CLOSEDIR_VOID
-AC_FUNC_MEMCMP
-AC_FUNC_STRFTIME
-AC_FUNC_VPRINTF
-AC_FUNC_ALLOCA
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_CHECK_HEADERS([memory.h])
-AC_CHECK_HEADERS([unistd.h])
-AC_CHECK_HEADERS([ieeefp.h])
-AC_CHECK_HEADERS([sys/file.h])
-AC_CHECK_HEADERS([sys/time.h])
-AC_CHECK_FUNCS([strchr memcpy gettimeofday])
-AC_HEADER_STAT
-AC_STRUCT_TM
-AC_TYPE_SIZE_T
-AC_C_CONST
-
-dnl --------------------------------------------------------------------
-dnl - Check for inline and cassert settings
-dnl --------------------------------------------------------------------
-
-
-AC_ARG_ENABLE([inline],
- [ --disable-inline Disable inlining],
- [case "${enableval}" in
- yes) enable_inline=true ;;
- no) enable_inline=false ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-inline);;
- esac],
- [enable_inline=true]
-)
-
-AC_ARG_ENABLE([cassert],
- [ --disable-cassert Disable assertion checking],
- [case "${enableval}" in
- yes) enable_cassert=true ;;
- no) enable_cassert=false ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-cassert);;
- esac],
- [enable_cassert=true]
-)
-
-AC_ARG_ENABLE([glibcxx-debug],
- [ --enable-glibcxx-debug Enable libstdc++ debug mode],
- [case "${enableval}" in
- yes) enable_glibcxx_debug=true ;;
- no) enable_glibcxx_debug=false ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-glibcxx-debug);;
- esac],
- [enable_glibcxx_debug=false]
-)
-
-
-AC_MSG_CHECKING([if requested to force inline functions])
-INLINE_FLAGS=
-AC_SUBST(INLINE_FLAGS)
-if test x"$enable_inline" = xtrue; then
- INLINE_FLAGS="-DGEOS_INLINE"
- AM_CXXFLAGS="$AM_CXXFLAGS $INLINE_FLAGS"
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
-fi
-
-AC_MSG_CHECKING([if requested to enable assert macros])
-if test x"$enable_cassert" = xfalse; then
- AM_CXXFLAGS="$AM_CXXFLAGS -DNDEBUG"
- AC_MSG_RESULT([no])
-else
- AC_MSG_RESULT([yes])
-fi
-
-AC_MSG_CHECKING([if requested libstdc++ debug mode])
-if test x"$enable_glibcxx_debug" = xtrue; then
- AM_CXXFLAGS="$AM_CXXFLAGS -D_GLIBCXX_DEBUG=1 -D_GLIBCXX_DEBUG_PEDANTIC=1"
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
-fi
-
-
-dnl --------------------------------------------------------------------
-dnl - check whether user has requested overlayng
-dnl --------------------------------------------------------------------
-dnl
-dnl AC_ARG_ENABLE([overlayng],
-dnl [ --disable-overlayng Disable use of new overlay],
-dnl [case "${enableval}" in
-dnl yes) use_overlayng=true ;;
-dnl no) use_overlayng=false ;;
-dnl *) AC_MSG_ERROR(bad value ${enableval} for --disable-overlayng) ;;
-dnl esac],
-dnl [use_overlayng=true]
-dnl )
-dnl
-dnl if test x"$use_overlayng" = xtrue; then
-dnl OVERLAYNG_FLAGS=""
-dnl else
-dnl OVERLAYNG_FLAGS="-DDISABLE_OVERLAYNG"
-dnl fi
-
-dnl --------------------------------------------------------------------
-dnl - Append default C++ and C flags
-dnl --------------------------------------------------------------------
-AC_PROG_CXX
-AX_CXX_COMPILE_STDCXX(11, noext, mandatory)
-
-WARNFLAGS=""
-AC_LANG_PUSH([C++])
-dnl Available in GCC 5.1
-AX_CHECK_COMPILE_FLAG([-Wsuggest-override -Werror], [WARNFLAGS="$WARNFLAGS -Wsuggest-override"])
-dnl Available in clang 3.5
-AX_CHECK_COMPILE_FLAG([-Wmissing-override -Werror], [WARNFLAGS="$WARNFLAGS -Wmissing-override"])
-AC_LANG_POP([C++])
-
-dnl In order for AC_LIBTOOL_COMPILER_OPTION to use
-dnl the C compiler we need the hack below.
-dnl It is likely a bug in the libtool macro file to
-dnl require AC_LIBTOOL_LANG_CXX_CONFIG in *addition*
-dnl to AC_LANG(CXX) or AC_LANG_PUSH(CXX)/AC_LANG_POP()
-dnl
-AC_LIBTOOL_LANG_CXX_CONFIG
-
-dnl Set default AM_CXXFLAGS and AM_CFLAGS
-dnl -pedantic: ISO does not support long long
-dnl we add -Wno-long-long to avoid those messages
-AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -pedantic], [dummy_cv_pedantic], [-pedantic], [], [WARNFLAGS="$WARNFLAGS -pedantic"], [])
-AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -Wall], [dummy_cv_wall], [-Wall], [], [WARNFLAGS="$WARNFLAGS -Wall"], [])
-AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -Wno-long-long], [dummy_cv_wno_long_long], [-Wno-long-long], [], [WARNFLAGS="$WARNFLAGS -Wno-long-long"], [])
-
-dnl -----------------------------------------------------------------------------
-dnl To make numerical computation more stable, we use --ffloat-store
-dnl on 32-bit platforms
-NUMERICFLAGS=""
-dnl 32-bit platforms have a 4-byte pointer
-AC_CHECK_SIZEOF([void *])
-if test $ac_cv_sizeof_void_p -eq 4 ; then
- AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -ffloat-store], [dummy_cv_ffloat_store], [-ffloat-store], [], [NUMERICFLAGS="$NUMERICFLAGS -ffloat-store"], [])
-fi
-
-dnl -----------------------------------------------------------------------------
-dnl Add flags to prevent 'fused multiply-add' operations on targets (ARM64)
-dnl that allow it, as it breaks calculations in math/DD.cpp.
-dnl TODO: Replace DD calculations with 'long float' where target supports
-dnl true long float, and remove other cases where FMA causes regression
-dnl failures.
-dnl https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98207
-NUMERICFLAGS="$NUMERICFLAGS -ffp-contract=off"
-
-dnl -----------------------------------------------------------------------------
-HUSHWARNING="-DUSE_UNSTABLE_GEOS_CPP_API"
-DEFAULTFLAGS="${WARNFLAGS} ${NUMERICFLAGS} ${HUSHWARNING}"
-
-AM_CXXFLAGS="${AM_CXXFLAGS} ${DEFAULTFLAGS}"
-AM_CFLAGS="${AM_CFLAGS} ${DEFAULTFLAGS}"
-AC_SUBST(AM_CXXFLAGS)
-AC_SUBST(AM_CFLAGS)
-
-dnl --------------------------------------------------------------------
-
-LIBS=$save_LIBS
-
-dnl --------------------------------------------------------------------
-dnl - Look for a 64bit integer (do after CFLAGS is set)
-dnl --------------------------------------------------------------------
-
-dnl Find a working 64bit integer
-PGAC_TYPE_64BIT_INT([int64_t])
-if test x"$HAVE_INT64_T_64" = x"no" ; then
- PGAC_TYPE_64BIT_INT([long long int])
- if test x"$HAVE_LONG_LONG_INT_64" = x"no" ; then
- PGAC_TYPE_64BIT_INT([long int])
- if test x"$HAVE_LONG_INT_64" = x"no" ; then
- AC_MSG_WARN([Could not find a working 64bit int type, you may experience weird bugs (undefined behaviour)]);
- fi
- fi
-fi
-
-
-dnl --------------------------------------------------------------------
-dnl - do operating-system specific things
-dnl --------------------------------------------------------------------
-
-AC_MSG_CHECKING([OS-specific settings])
-
-case "${host_os}" in
- *darwin*)
- AC_MSG_RESULT([${host_os}])
- AC_MSG_CHECKING([for OS/X version])
- kernel=`uname -r`
-
- # "Darwin 9.6.0" is Mac OSX 10.5.6
- # "Darwin 10.x" would presumably be Mac OS X 10.6.x
- case "${kernel}" in
- 8.*)
- AC_MSG_RESULT([Mac OS X 10.4 Tiger])
- ;;
- 9.*)
- AC_MSG_RESULT([Mac OS X 10.5 Leopard])
- ;;
- 10.*)
-dnl AM_CXXFLAGS="$AM_CXXFLAGS -Wnon-virtual-dtor -Woverloaded-virtual"
- AC_MSG_RESULT([Mac OS X 10.6 Snow Leopard])
- ;;
- *)
- AC_MSG_RESULT([Mac OS X (Darwin ${kernel} kernel)])
- ;;
- esac
- ;;
-esac
-
-
-dnl things to substitute in output ----------------------------------------
-AC_SUBST(VERSION)
-AC_SUBST(VERSION_MAJOR)
-AC_SUBST(VERSION_MINOR)
-AC_SUBST(VERSION_PATCH)
-AC_SUBST(VERSION_RELEASE)
-AC_SUBST(JTS_PORT)
-AC_SUBST(CAPI_VERSION)
-AC_SUBST(CAPI_VERSION_MAJOR)
-AC_SUBST(CAPI_VERSION_MINOR)
-AC_SUBST(CAPI_VERSION_PATCH)
-AC_SUBST(CAPI_INTERFACE_CURRENT)
-AC_SUBST(CAPI_INTERFACE_REVISION)
-AC_SUBST(CAPI_INTERFACE_AGE)
-
-dnl pkg-config file -------------------------------------------------------
-AC_CONFIG_FILES([tools/geos.pc])
-
-dnl output stuff ----------------------------------------------------------
-
-AC_OUTPUT([
- Makefile
- capi/Makefile
- capi/geos_c.h
- doc/Doxyfile
- doc/Makefile
- macros/Makefile
- src/Makefile
- src/algorithm/Makefile
- src/algorithm/construct/Makefile
- src/algorithm/distance/Makefile
- src/algorithm/locate/Makefile
- src/deps/Makefile
- src/deps/ryu/Makefile
- src/edgegraph/Makefile
- src/geom/Makefile
- src/geom/prep/Makefile
- src/geom/util/Makefile
- src/geomgraph/Makefile
- src/geomgraph/index/Makefile
- include/Makefile
- include/geos/Makefile
- include/geos/algorithm/Makefile
- include/geos/algorithm/locate/Makefile
- include/geos/algorithm/distance/Makefile
- include/geos/algorithm/construct/Makefile
- include/geos/edgegraph/Makefile
- include/geos/geom/Makefile
- include/geos/geom/prep/Makefile
- include/geos/geom/util/Makefile
- include/geos/geomgraph/Makefile
- include/geos/geomgraph/index/Makefile
- include/geos/index/Makefile
- include/geos/index/bintree/Makefile
- include/geos/index/kdtree/Makefile
- include/geos/index/chain/Makefile
- include/geos/index/intervalrtree/Makefile
- include/geos/index/quadtree/Makefile
- include/geos/index/strtree/Makefile
- include/geos/index/sweepline/Makefile
- include/geos/io/Makefile
- include/geos/linearref/Makefile
- include/geos/math/Makefile
- include/geos/noding/Makefile
- include/geos/noding/snap/Makefile
- include/geos/noding/snapround/Makefile
- include/geos/operation/Makefile
- include/geos/operation/buffer/Makefile
- include/geos/operation/distance/Makefile
- include/geos/operation/intersection/Makefile
- include/geos/operation/linemerge/Makefile
- include/geos/operation/overlay/Makefile
- include/geos/operation/overlay/snap/Makefile
- include/geos/operation/overlayng/Makefile
- include/geos/operation/polygonize/Makefile
- include/geos/operation/predicate/Makefile
- include/geos/operation/relate/Makefile
- include/geos/operation/sharedpaths/Makefile
- include/geos/operation/union/Makefile
- include/geos/operation/valid/Makefile
- include/geos/planargraph/Makefile
- include/geos/planargraph/algorithm/Makefile
- include/geos/precision/Makefile
- include/geos/simplify/Makefile
- include/geos/triangulate/Makefile
- include/geos/triangulate/quadedge/Makefile
- include/geos/shape/Makefile
- include/geos/shape/fractal/Makefile
- include/geos/util/Makefile
- include/geos/version.h
- src/index/Makefile
- src/index/bintree/Makefile
- src/index/kdtree/Makefile
- src/index/chain/Makefile
- src/index/intervalrtree/Makefile
- src/index/quadtree/Makefile
- src/index/strtree/Makefile
- src/index/sweepline/Makefile
- src/io/Makefile
- src/linearref/Makefile
- src/math/Makefile
- src/noding/Makefile
- src/noding/snap/Makefile
- src/noding/snapround/Makefile
- src/operation/Makefile
- src/operation/buffer/Makefile
- src/operation/distance/Makefile
- src/operation/intersection/Makefile
- src/operation/linemerge/Makefile
- src/operation/overlay/Makefile
- src/operation/overlayng/Makefile
- src/operation/polygonize/Makefile
- src/operation/predicate/Makefile
- src/operation/relate/Makefile
- src/operation/sharedpaths/Makefile
- src/operation/union/Makefile
- src/operation/valid/Makefile
- src/planargraph/Makefile
- src/precision/Makefile
- src/simplify/Makefile
- src/triangulate/Makefile
- src/triangulate/quadedge/Makefile
- src/shape/Makefile
- src/shape/fractal/Makefile
- src/util/Makefile
- tests/Makefile
- tests/bigtest/Makefile
- tests/unit/Makefile
- benchmarks/Makefile
- benchmarks/algorithm/Makefile
- benchmarks/operation/Makefile
- benchmarks/operation/buffer/Makefile
- benchmarks/operation/predicate/Makefile
- benchmarks/capi/Makefile
- tests/xmltester/Makefile
- tests/geostest/Makefile
- tests/thread/Makefile
- tools/Makefile
- tools/geos-config
- tools/astyle/Makefile
- util/Makefile
- util/geosop/Makefile
- ])
-
-dnl AC_MSG_RESULT([ ------------ GEOS Build ------------ ])
-dnl AC_MSG_RESULT([ Version: ${VERSION}])
-dnl AC_MSG_RESULT([ Inlining: ${enable_inline}])
-dnl AC_MSG_RESULT([ ------------------------------------ ])
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 31723d3..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-prefix=@prefix@
-top_srcdir=@top_srcdir@
-top_builddir=@top_builddir@
-
-noinst_PROGRAMS = example
-
-LIBS = $(top_builddir)/src/libgeos.la
-
-example_SOURCES = example.cpp
-example_LDADD = $(LIBS)
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-DOXYGEN = doxygen
-
-doxygen-html apidoc doxygen: Doxyfile
- $(DOXYGEN) $<
-
-clean-local:
- rm -Rf doxygen_docs
-
-EXTRA_DIST = Doxyfile \
- CMakeLists.txt
diff --git a/include/Makefile.am b/include/Makefile.am
deleted file mode 100644
index c8e3434..0000000
--- a/include/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS = \
- geos
-
-include_HEADERS = \
- geos.h
-
-EXTRA_DIST = CMakeLists.txt
diff --git a/include/geos/Makefile.am b/include/geos/Makefile.am
deleted file mode 100644
index 09ba8db..0000000
--- a/include/geos/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS = \
- algorithm \
- edgegraph \
- geom \
- geomgraph \
- index \
- io \
- linearref \
- math \
- noding \
- operation \
- planargraph \
- precision \
- simplify \
- triangulate \
- shape \
- util
-
-EXTRA_DIST =
-
-geosdir = $(includedir)/geos
-
-geos_HEADERS = \
- constants.h \
- export.h \
- geom.h \
- inline.h \
- namespaces.h \
- profiler.h \
- unload.h \
- util.h
-
-nodist_geos_HEADERS = \
- version.h
diff --git a/include/geos/algorithm/Makefile.am b/include/geos/algorithm/Makefile.am
deleted file mode 100644
index 1d1360f..0000000
--- a/include/geos/algorithm/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS = \
- locate \
- distance \
- construct
-
-EXTRA_DIST =
-
-geosdir = $(includedir)/geos/algorithm
-
-geos_HEADERS = \
- Angle.h \
- Area.h \
- BoundaryNodeRule.h \
- CGAlgorithmsDD.h \
- CGAlgorithmsDD.inl \
- CentralEndpointIntersector.h \
- Centroid.h \
- ConvexHull.h \
- ConvexHull.inl \
- Distance.h \
- HCoordinate.h \
- InteriorPointArea.h \
- InteriorPointLine.h \
- InteriorPointPoint.h \
- Intersection.h \
- Length.h \
- LineIntersector.h \
- LineIntersector.inl \
- MinimumBoundingCircle.h \
- MinimumDiameter.h \
- NotRepresentableException.h \
- Orientation.h \
- PointLocation.h \
- PointLocator.h \
- RayCrossingCounter.h \
- RayCrossingCounterDD.h \
- RobustDeterminant.h
-
diff --git a/include/geos/algorithm/construct/Makefile.am b/include/geos/algorithm/construct/Makefile.am
deleted file mode 100644
index 5986e03..0000000
--- a/include/geos/algorithm/construct/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-EXTRA_DIST =
-
-geosdir = $(includedir)/geos/algorithm/construct
-
-geos_HEADERS = \
- LargestEmptyCircle.h \
- MaximumInscribedCircle.h
diff --git a/include/geos/algorithm/distance/Makefile.am b/include/geos/algorithm/distance/Makefile.am
deleted file mode 100644
index 7764b0e..0000000
--- a/include/geos/algorithm/distance/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-EXTRA_DIST =
-
-geosdir = $(includedir)/geos/algorithm/distance
-
-geos_HEADERS = \
- DiscreteHausdorffDistance.h \
- DiscreteFrechetDistance.h \
- DistanceToPoint.h \
- PointPairDistance.h
diff --git a/include/geos/algorithm/locate/Makefile.am b/include/geos/algorithm/locate/Makefile.am
deleted file mode 100644
index 91e5a24..0000000
--- a/include/geos/algorithm/locate/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-EXTRA_DIST =
-
-geosdir = $(includedir)/geos/algorithm/locate
-
-geos_HEADERS = \
- IndexedPointInAreaLocator.h \
- PointOnGeometryLocator.h \
- SimplePointInAreaLocator.h
diff --git a/include/geos/edgegraph/Makefile.am b/include/geos/edgegraph/Makefile.am
deleted file mode 100644
index 473aa45..0000000
--- a/include/geos/edgegraph/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-
-geosdir = $(includedir)/geos/edgegraph
-
-geos_HEADERS = \
- EdgeGraph.h \
- EdgeGraphBuilder.h \
- HalfEdge.h \
- MarkHalfEdge.h
diff --git a/include/geos/geom/Makefile.am b/include/geos/geom/Makefile.am
deleted file mode 100644
index d7afb62..0000000
--- a/include/geos/geom/Makefile.am
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS = \
- util \
- prep
-
-#EXTRA_DIST =
-
-geosdir = $(includedir)/geos/geom
-
-geos_HEADERS = \
- HeuristicOverlay.h \
- CoordinateArraySequenceFactory.h \
- CoordinateArraySequenceFactory.inl \
- CoordinateArraySequence.h \
- CoordinateFilter.h \
- Coordinate.h \
- Coordinate.inl \
- CoordinateList.h \
- CoordinateSequenceFactory.h \
- CoordinateSequenceFilter.h \
- CoordinateSequence.h \
- DefaultCoordinateSequenceFactory.h \
- Dimension.h \
- Envelope.h \
- Envelope.inl \
- FixedSizeCoordinateSequence.h \
- GeometryCollection.h \
- GeometryCollection.inl \
- GeometryComponentFilter.h \
- GeometryFactory.h \
- GeometryFactory.inl \
- GeometryFilter.h \
- Geometry.h \
- IntersectionMatrix.h \
- LinearRing.h \
- LineSegment.h \
- LineSegment.inl \
- LineString.h \
- Location.h \
- MultiLineString.h \
- MultiLineString.inl \
- MultiPoint.h \
- MultiPolygon.h \
- MultiPolygon.inl \
- Point.h \
- Polygon.h \
- Position.h \
- PrecisionModel.h \
- PrecisionModel.inl \
- Quadrant.h \
- Quadrant.inl \
- Triangle.h
diff --git a/include/geos/geom/prep/Makefile.am b/include/geos/geom/prep/Makefile.am
deleted file mode 100644
index edae9b0..0000000
--- a/include/geos/geom/prep/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-#SUBDIRS =
-
-#EXTRA_DIST =
-
-geosdir = $(includedir)/geos/geom/prep
-
-geos_HEADERS = \
- AbstractPreparedPolygonContains.h \
- BasicPreparedGeometry.h \
- PreparedGeometryFactory.h \
- PreparedGeometry.h \
- PreparedLineString.h \
- PreparedLineStringDistance.h \
- PreparedLineStringIntersects.h \
- PreparedLineStringNearestPoints.h \
- PreparedPoint.h \
- PreparedPolygonContains.h \
- PreparedPolygonContainsProperly.h \
- PreparedPolygonCovers.h \
- PreparedPolygonDistance.h \
- PreparedPolygon.h \
- PreparedPolygonIntersects.h \
- PreparedPolygonPredicate.h
diff --git a/include/geos/geom/util/Makefile.am b/include/geos/geom/util/Makefile.am
deleted file mode 100644
index 32cdd32..0000000
--- a/include/geos/geom/util/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-#SUBDIRS =
-
-#EXTRA_DIST =
-
-geosdir = $(includedir)/geos/geom/util
-
-geos_HEADERS = \
- ComponentCoordinateExtracter.h \
- CoordinateOperation.h \
- GeometryCombiner.h \
- GeometryEditor.h \
- GeometryEditorOperation.h \
- GeometryExtracter.h \
- GeometryTransformer.h \
- LinearComponentExtracter.h \
- PointExtracter.h \
- PolygonExtracter.h \
- ShortCircuitedGeometryVisitor.h \
- SineStarFactory.h \
- Densifier.h
diff --git a/include/geos/geomgraph/Makefile.am b/include/geos/geomgraph/Makefile.am
deleted file mode 100644
index 94d7265..0000000
--- a/include/geos/geomgraph/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS = index
-
-#EXTRA_DIST =
-
-geosdir = $(includedir)/geos/geomgraph
-
-geos_HEADERS = \
- Depth.h \
- Depth.inl \
- DirectedEdge.h \
- DirectedEdge.inl \
- DirectedEdgeStar.h \
- EdgeEnd.h \
- EdgeEndStar.h \
- Edge.h \
- EdgeIntersection.h \
- EdgeIntersectionList.h \
- EdgeList.h \
- EdgeNodingValidator.h \
- EdgeRing.h \
- GeometryGraph.h \
- GeometryGraph.inl \
- GraphComponent.h \
- Label.h \
- Label.inl \
- NodeFactory.h \
- Node.h \
- NodeMap.h \
- PlanarGraph.h \
- TopologyLocation.h \
- TopologyLocation.inl
diff --git a/include/geos/geomgraph/index/Makefile.am b/include/geos/geomgraph/index/Makefile.am
deleted file mode 100644
index 280fde3..0000000
--- a/include/geos/geomgraph/index/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-#SUBDIRS =
-
-#EXTRA_DIST =
-
-geosdir = $(includedir)/geos/geomgraph/index
-
-geos_HEADERS = \
- EdgeSetIntersector.h \
- MonotoneChain.h \
- MonotoneChainEdge.h \
- MonotoneChainIndexer.h \
- SegmentIntersector.h \
- SegmentIntersector.inl \
- SimpleEdgeSetIntersector.h \
- SimpleMCSweepLineIntersector.h \
- SimpleSweepLineIntersector.h \
- SweepLineEvent.h \
- SweepLineEventObj.h \
- SweepLineSegment.h
diff --git a/include/geos/index/Makefile.am b/include/geos/index/Makefile.am
deleted file mode 100644
index d9bc0d4..0000000
--- a/include/geos/index/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS = \
- intervalrtree \
- sweepline \
- strtree \
- quadtree \
- bintree \
- kdtree \
- chain
-
-EXTRA_DIST =
-
-geosdir = $(includedir)/geos/index
-
-geos_HEADERS = \
- ItemVisitor.h \
- SpatialIndex.h
diff --git a/include/geos/index/bintree/Makefile.am b/include/geos/index/bintree/Makefile.am
deleted file mode 100644
index b11bba3..0000000
--- a/include/geos/index/bintree/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-EXTRA_DIST =
-
-
-geosdir = $(includedir)/geos/index/bintree
-
-geos_HEADERS = \
- Bintree.h \
- Interval.h \
- Key.h \
- NodeBase.h \
- Node.h \
- Root.h
diff --git a/include/geos/index/chain/Makefile.am b/include/geos/index/chain/Makefile.am
deleted file mode 100644
index cf1952b..0000000
--- a/include/geos/index/chain/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-EXTRA_DIST =
-
-geosdir = $(includedir)/geos/index/chain
-
-geos_HEADERS = \
- MonotoneChain.h \
- MonotoneChainBuilder.h \
- MonotoneChainOverlapAction.h \
- MonotoneChainSelectAction.h
diff --git a/include/geos/index/intervalrtree/Makefile.am b/include/geos/index/intervalrtree/Makefile.am
deleted file mode 100644
index 25c63e3..0000000
--- a/include/geos/index/intervalrtree/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-EXTRA_DIST =
-
-geosdir = $(includedir)/geos/index/intervalrtree
-
-geos_HEADERS = \
- IntervalRTreeBranchNode.h \
- IntervalRTreeLeafNode.h \
- IntervalRTreeNode.h \
- SortedPackedIntervalRTree.h
diff --git a/include/geos/index/kdtree/Makefile.am b/include/geos/index/kdtree/Makefile.am
deleted file mode 100644
index 0c01057..0000000
--- a/include/geos/index/kdtree/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-EXTRA_DIST =
-
-
-geosdir = $(includedir)/geos/index/kdtree
-
-geos_HEADERS = \
- KdNode.h \
- KdNodeVisitor.h \
- KdTree.h
-
diff --git a/include/geos/index/quadtree/Makefile.am b/include/geos/index/quadtree/Makefile.am
deleted file mode 100644
index 04ace02..0000000
--- a/include/geos/index/quadtree/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-EXTRA_DIST =
-
-geosdir = $(includedir)/geos/index/quadtree
-
-geos_HEADERS = \
- IntervalSize.h \
- Key.h \
- NodeBase.h \
- Node.h \
- Quadtree.h \
- Root.h
diff --git a/include/geos/index/strtree/Makefile.am b/include/geos/index/strtree/Makefile.am
deleted file mode 100644
index 204059d..0000000
--- a/include/geos/index/strtree/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-EXTRA_DIST =
-
-geosdir = $(includedir)/geos/index/strtree
-
-geos_HEADERS = \
- AbstractNode.h \
- AbstractSTRtree.h \
- Boundable.h \
- BoundablePair.h \
- EnvelopeUtil.h \
- GeometryItemDistance.h \
- Interval.h \
- ItemBoundable.h \
- ItemDistance.h \
- SIRtree.h \
- STRtree.h \
- SimpleSTRtree.h \
- SimpleSTRnode.h \
- SimpleSTRdistance.h
diff --git a/include/geos/index/sweepline/Makefile.am b/include/geos/index/sweepline/Makefile.am
deleted file mode 100644
index c0bbab6..0000000
--- a/include/geos/index/sweepline/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-EXTRA_DIST =
-
-geosdir = $(includedir)/geos/index/sweepline
-
-geos_HEADERS = \
- SweepLineEvent.h \
- SweepLineIndex.h \
- SweepLineInterval.h \
- SweepLineOverlapAction.h
diff --git a/include/geos/io/Makefile.am b/include/geos/io/Makefile.am
deleted file mode 100644
index a59d32d..0000000
--- a/include/geos/io/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-EXTRA_DIST =
-
-geosdir = $(includedir)/geos/io
-
-geos_HEADERS = \
- ByteOrderDataInStream.h \
- ByteOrderDataInStream.inl \
- ByteOrderValues.h \
- CLocalizer.h \
- ParseException.h \
- StringTokenizer.h \
- WKBConstants.h \
- WKBReader.h \
- WKBWriter.h \
- WKTReader.h \
- WKTReader.inl \
- WKTWriter.h \
- Writer.h
diff --git a/include/geos/linearref/Makefile.am b/include/geos/linearref/Makefile.am
deleted file mode 100644
index 5a16f4e..0000000
--- a/include/geos/linearref/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-EXTRA_DIST =
-
-geosdir = $(includedir)/geos/linearref
-
-geos_HEADERS = \
- ExtractLineByLocation.h \
- LengthIndexedLine.h \
- LengthIndexOfPoint.h \
- LengthLocationMap.h \
- LinearIterator.h \
- LinearGeometryBuilder.h \
- LinearLocation.h \
- LocationIndexedLine.h \
- LocationIndexOfLine.h \
- LocationIndexOfPoint.h
diff --git a/include/geos/math/Makefile.am b/include/geos/math/Makefile.am
deleted file mode 100644
index 5396b95..0000000
--- a/include/geos/math/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-EXTRA_DIST =
-
-geosdir = $(includedir)/geos/math
-
-geos_HEADERS = \
- DD.h
diff --git a/include/geos/noding/Makefile.am b/include/geos/noding/Makefile.am
deleted file mode 100644
index bd32ea2..0000000
--- a/include/geos/noding/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS = \
- snapround \
- snap
-
-EXTRA_DIST =
-
-geosdir = $(includedir)/geos/noding
-
-geos_HEADERS = \
- BasicSegmentString.h \
- BasicSegmentString.inl \
- FastNodingValidator.h \
- FastSegmentSetIntersectionFinder.h \
- GeometryNoder.h \
- IntersectionAdder.h \
- IntersectionFinderAdder.h \
- IteratedNoder.h \
- MCIndexNoder.h \
- MCIndexNoder.inl \
- MCIndexSegmentSetMutualIntersector.h \
- NodableSegmentString.h \
- NodedSegmentString.h \
- NodedSegmentString.inl \
- Noder.h \
- NodingValidator.h \
- Octant.h \
- OrientedCoordinateArray.h \
- ScaledNoder.h \
- SegmentIntersectionDetector.h \
- SegmentIntersector.h \
- SegmentNode.h \
- SegmentNode.inl \
- SegmentNodeList.h \
- SegmentPointComparator.h \
- SegmentSetMutualIntersector.h \
- SegmentString.h \
- SegmentStringUtil.h \
- SimpleNoder.h \
- SinglePassNoder.h \
- NodingIntersectionFinder.h \
- NodingIntersectionFinder.inl \
- ValidatingNoder.h
diff --git a/include/geos/noding/snap/Makefile.am b/include/geos/noding/snap/Makefile.am
deleted file mode 100644
index de6c74c..0000000
--- a/include/geos/noding/snap/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-#SUBDIRS =
-
-#EXTRA_DIST =
-
-geosdir = $(includedir)/geos/noding/snap
-
-geos_HEADERS = \
- SnappingIntersectionAdder.h \
- SnappingNoder.h \
- SnappingPointIndex.h
diff --git a/include/geos/noding/snapround/Makefile.am b/include/geos/noding/snapround/Makefile.am
deleted file mode 100644
index df40461..0000000
--- a/include/geos/noding/snapround/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-#SUBDIRS =
-
-#EXTRA_DIST =
-
-geosdir = $(includedir)/geos/noding/snapround
-
-geos_HEADERS = \
- HotPixel.h \
- HotPixel.inl \
- HotPixelIndex.h \
- MCIndexPointSnapper.h \
- MCIndexSnapRounder.h \
- SnapRoundingNoder.h \
- SnapRoundingIntersectionAdder.h
diff --git a/include/geos/operation/Makefile.am b/include/geos/operation/Makefile.am
deleted file mode 100644
index d6927bf..0000000
--- a/include/geos/operation/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS = \
- buffer \
- distance \
- intersection \
- linemerge \
- polygonize \
- overlay \
- overlayng \
- predicate \
- relate \
- union \
- sharedpaths \
- valid
-
-#EXTRA_DIST =
-
-geosdir = $(includedir)/geos/operation
-
-geos_HEADERS = \
- GeometryGraphOperation.h \
- IsSimpleOp.h
diff --git a/include/geos/operation/buffer/Makefile.am b/include/geos/operation/buffer/Makefile.am
deleted file mode 100644
index fcfb3d4..0000000
--- a/include/geos/operation/buffer/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-#SUBDIRS =
-
-#EXTRA_DIST =
-
-geosdir = $(includedir)/geos/operation/buffer
-
-geos_HEADERS = \
- BufferBuilder.h \
- BufferInputLineSimplifier.h \
- BufferOp.h \
- BufferParameters.h \
- BufferSubgraph.h \
- OffsetCurveBuilder.h \
- OffsetCurveSetBuilder.h \
- OffsetSegmentGenerator.h \
- OffsetSegmentString.h \
- RightmostEdgeFinder.h \
- SubgraphDepthLocater.h
diff --git a/include/geos/operation/distance/Makefile.am b/include/geos/operation/distance/Makefile.am
deleted file mode 100644
index 16cff8f..0000000
--- a/include/geos/operation/distance/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-#SUBDIRS =
-
-#EXTRA_DIST =
-
-geosdir = $(includedir)/geos/operation/distance
-
-geos_HEADERS = \
- ConnectedElementLocationFilter.h \
- ConnectedElementPointFilter.h \
- DistanceOp.h \
- IndexedFacetDistance.h \
- FacetSequence.h \
- FacetSequenceTreeBuilder.h \
- GeometryLocation.h
diff --git a/include/geos/operation/intersection/Makefile.am b/include/geos/operation/intersection/Makefile.am
deleted file mode 100644
index 75d12f4..0000000
--- a/include/geos/operation/intersection/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-#SUBDIRS =
-
-#EXTRA_DIST =
-
-geosdir = $(includedir)/geos/operation/intersection
-
-geos_HEADERS = \
- Rectangle.h \
- RectangleIntersection.h \
- RectangleIntersectionBuilder.h
diff --git a/include/geos/operation/linemerge/Makefile.am b/include/geos/operation/linemerge/Makefile.am
deleted file mode 100644
index 5f290c5..0000000
--- a/include/geos/operation/linemerge/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-#SUBDIRS =
-
-#EXTRA_DIST =
-
-geosdir = $(includedir)/geos/operation/linemerge
-
-geos_HEADERS = \
- EdgeString.h \
- LineMergeDirectedEdge.h \
- LineMergeEdge.h \
- LineMergeGraph.h \
- LineMerger.h \
- LineSequencer.h
diff --git a/include/geos/operation/overlay/Makefile.am b/include/geos/operation/overlay/Makefile.am
deleted file mode 100644
index 6f2425f..0000000
--- a/include/geos/operation/overlay/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS = snap
-
-#EXTRA_DIST =
-
-geosdir = $(includedir)/geos/operation/overlay
-
-geos_HEADERS = \
- EdgeSetNoder.h \
- ElevationMatrixCell.h \
- ElevationMatrix.h \
- LineBuilder.h \
- MaximalEdgeRing.h \
- MinimalEdgeRing.h \
- MinimalEdgeRing.inl \
- OverlayNodeFactory.h \
- OverlayOp.h \
- PointBuilder.h \
- PolygonBuilder.h \
- validate/FuzzyPointLocator.h \
- validate/OffsetPointGenerator.h \
- validate/OverlayResultValidator.h
diff --git a/include/geos/operation/overlay/snap/Makefile.am b/include/geos/operation/overlay/snap/Makefile.am
deleted file mode 100644
index d95beb3..0000000
--- a/include/geos/operation/overlay/snap/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-#SUBDIRS =
-
-#EXTRA_DIST =
-
-geosdir = $(includedir)/geos/operation/overlay/snap
-
-geos_HEADERS = \
- GeometrySnapper.h \
- LineStringSnapper.h \
- SnapIfNeededOverlayOp.h \
- SnapOverlayOp.h
diff --git a/include/geos/operation/overlayng/Makefile.am b/include/geos/operation/overlayng/Makefile.am
deleted file mode 100644
index 1e56fe2..0000000
--- a/include/geos/operation/overlayng/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-#EXTRA_DIST =
-
-geosdir = $(includedir)/geos/operation/overlayng
-
-geos_HEADERS = \
- Edge.h \
- Edge.inl \
- EdgeKey.h \
- EdgeKey.inl \
- EdgeMerger.h \
- EdgeNodingBuilder.h \
- EdgeSourceInfo.h \
- ElevationModel.h \
- IndexedPointOnLineLocator.h \
- InputGeometry.h \
- IntersectionPointBuilder.h \
- LineBuilder.h \
- LineLimiter.h \
- MaximalEdgeRing.h \
- OverlayEdge.h \
- OverlayEdge.inl \
- OverlayEdgeRing.h \
- OverlayGraph.h \
- OverlayLabel.h \
- OverlayLabel.inl \
- OverlayLabeller.h \
- OverlayMixedPoints.h \
- OverlayPoints.h \
- OverlayNG.h \
- OverlayNGRobust.h \
- OverlayUtil.h \
- PolygonBuilder.h \
- PrecisionReducer.h \
- PrecisionUtil.h \
- RingClipper.h \
- RobustClipEnvelopeComputer.h \
- UnaryUnionNG.h
diff --git a/include/geos/operation/polygonize/Makefile.am b/include/geos/operation/polygonize/Makefile.am
deleted file mode 100644
index d55ed0d..0000000
--- a/include/geos/operation/polygonize/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-#SUBDIRS =
-
-#EXTRA_DIST =
-
-geosdir = $(includedir)/geos/operation/polygonize
-
-geos_HEADERS = \
- BuildArea.h \
- EdgeRing.h \
- HoleAssigner.h \
- PolygonizeDirectedEdge.h \
- PolygonizeEdge.h \
- PolygonizeGraph.h \
- Polygonizer.h
diff --git a/include/geos/operation/predicate/Makefile.am b/include/geos/operation/predicate/Makefile.am
deleted file mode 100644
index cb667b5..0000000
--- a/include/geos/operation/predicate/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-#SUBDIRS =
-
-#EXTRA_DIST =
-
-geosdir = $(includedir)/geos/operation/predicate
-
-geos_HEADERS = \
- RectangleContains.h \
- RectangleIntersects.h \
- SegmentIntersectionTester.h
diff --git a/include/geos/operation/relate/Makefile.am b/include/geos/operation/relate/Makefile.am
deleted file mode 100644
index c7f3160..0000000
--- a/include/geos/operation/relate/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-#SUBDIRS =
-
-#EXTRA_DIST =
-
-geosdir = $(includedir)/geos/operation/relate
-
-geos_HEADERS = \
- EdgeEndBuilder.h \
- EdgeEndBundle.h \
- EdgeEndBundleStar.h \
- RelateComputer.h \
- RelateNodeFactory.h \
- RelateNodeGraph.h \
- RelateNode.h \
- RelateOp.h
diff --git a/include/geos/operation/sharedpaths/Makefile.am b/include/geos/operation/sharedpaths/Makefile.am
deleted file mode 100644
index 2e4af88..0000000
--- a/include/geos/operation/sharedpaths/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-#SUBDIRS =
-
-#EXTRA_DIST =
-
-geosdir = $(includedir)/geos/operation/sharedpaths
-
-geos_HEADERS = \
- SharedPathsOp.h
diff --git a/include/geos/operation/union/Makefile.am b/include/geos/operation/union/Makefile.am
deleted file mode 100644
index 9b019f0..0000000
--- a/include/geos/operation/union/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-#SUBDIRS =
-
-#EXTRA_DIST =
-
-geosdir = $(includedir)/geos/operation/union
-
-geos_HEADERS = \
- CascadedPolygonUnion.h \
- CascadedUnion.h \
- CoverageUnion.h \
- OverlapUnion.h \
- GeometryListHolder.h \
- PointGeometryUnion.h \
- UnaryUnionOp.h \
- UnionStrategy.h
diff --git a/include/geos/operation/valid/Makefile.am b/include/geos/operation/valid/Makefile.am
deleted file mode 100644
index aed363d..0000000
--- a/include/geos/operation/valid/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-#SUBDIRS =
-
-#EXTRA_DIST =
-
-geosdir = $(includedir)/geos/operation/valid
-
-geos_HEADERS = \
- ConnectedInteriorTester.h \
- ConsistentAreaTester.h \
- IsValidOp.h \
- IndexedNestedShellTester.h \
- MakeValid.h \
- QuadtreeNestedRingTester.h \
- RepeatedPointRemover.h \
- RepeatedPointTester.h \
- SimpleNestedRingTester.h \
- SweeplineNestedRingTester.h \
- TopologyValidationError.h
diff --git a/include/geos/planargraph/Makefile.am b/include/geos/planargraph/Makefile.am
deleted file mode 100644
index eb7de27..0000000
--- a/include/geos/planargraph/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS = algorithm
-
-#EXTRA_DIST =
-
-geosdir = $(includedir)/geos/planargraph
-
-geos_HEADERS = \
- DirectedEdge.h \
- DirectedEdgeStar.h \
- Edge.h \
- GraphComponent.h \
- Node.h \
- NodeMap.h \
- PlanarGraph.h \
- Subgraph.h
diff --git a/include/geos/planargraph/algorithm/Makefile.am b/include/geos/planargraph/algorithm/Makefile.am
deleted file mode 100644
index cd92549..0000000
--- a/include/geos/planargraph/algorithm/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-#SUBDIRS =
-
-#EXTRA_DIST =
-
-geosdir = $(includedir)/geos/planargraph/algorithm
-
-geos_HEADERS = \
- ConnectedSubgraphFinder.h
diff --git a/include/geos/precision/Makefile.am b/include/geos/precision/Makefile.am
deleted file mode 100644
index 6f88675..0000000
--- a/include/geos/precision/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-#SUBDIRS =
-
-#EXTRA_DIST =
-
-geosdir = $(includedir)/geos/precision
-
-geos_HEADERS = \
- CommonBits.h \
- CommonBitsOp.h \
- CommonBitsRemover.h \
- EnhancedPrecisionOp.h \
- GeometryPrecisionReducer.h \
- MinimumClearance.h \
- PrecisionReducerCoordinateOperation.h \
- SimpleGeometryPrecisionReducer.h
diff --git a/include/geos/shape/Makefile.am b/include/geos/shape/Makefile.am
deleted file mode 100644
index 1c303f2..0000000
--- a/include/geos/shape/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS = \
- fractal
-
-EXTRA_DIST =
-
-geosdir = $(includedir)/geos/shape
-
-geos_HEADERS =
diff --git a/include/geos/shape/fractal/Makefile.am b/include/geos/shape/fractal/Makefile.am
deleted file mode 100644
index 105a0d3..0000000
--- a/include/geos/shape/fractal/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-EXTRA_DIST =
-
-geosdir = $(includedir)/geos/shape/fractal
-
-geos_HEADERS = \
- HilbertCode.h \
- HilbertEncoder.h \
- MortonCode.h
diff --git a/include/geos/simplify/Makefile.am b/include/geos/simplify/Makefile.am
deleted file mode 100644
index ad250de..0000000
--- a/include/geos/simplify/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-geosdir = $(includedir)/geos/simplify
-
-EXTRA_DIST =
-
-geos_HEADERS = \
- DouglasPeuckerLineSimplifier.h \
- DouglasPeuckerSimplifier.h \
- LineSegmentIndex.h \
- TaggedLineSegment.h \
- TaggedLinesSimplifier.h \
- TaggedLineString.h \
- TaggedLineStringSimplifier.h \
- TopologyPreservingSimplifier.h
diff --git a/include/geos/triangulate/Makefile.am b/include/geos/triangulate/Makefile.am
deleted file mode 100644
index ed9c3a0..0000000
--- a/include/geos/triangulate/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS = \
- quadedge
-
-EXTRA_DIST =
-
-geosdir = $(includedir)/geos/triangulate
-
-geos_HEADERS = \
- IncrementalDelaunayTriangulator.h \
- DelaunayTriangulationBuilder.h \
- VoronoiDiagramBuilder.h
diff --git a/include/geos/triangulate/quadedge/Makefile.am b/include/geos/triangulate/quadedge/Makefile.am
deleted file mode 100644
index 1c05bed..0000000
--- a/include/geos/triangulate/quadedge/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-EXTRA_DIST =
-
-geosdir = $(includedir)/geos/triangulate/quadedge
-
-geos_HEADERS = \
- QuadEdge.h \
- Vertex.h \
- TrianglePredicate.h \
- QuadEdgeQuartet.h \
- QuadEdgeSubdivision.h \
- QuadEdgeLocator.h \
- LastFoundQuadEdgeLocator.h \
- LocateFailureException.h \
- TriangleVisitor.h
diff --git a/include/geos/util/Makefile.am b/include/geos/util/Makefile.am
deleted file mode 100644
index 3256095..0000000
--- a/include/geos/util/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-#SUBDIRS =
-
-#EXTRA_DIST =
-
-geosdir = $(includedir)/geos/util
-
-geos_HEADERS = \
- Assert.h \
- AssertionFailedException.h \
- CoordinateArrayFilter.h \
- GeometricShapeFactory.h \
- GEOSException.h \
- IllegalArgumentException.h \
- IllegalStateException.h \
- Interrupt.h \
- math.h \
- Machine.h \
- TopologyException.h \
- UniqueCoordinateArrayFilter.h \
- UnsupportedOperationException.h
diff --git a/macros/Makefile.am b/macros/Makefile.am
deleted file mode 100644
index 57c7ed6..0000000
--- a/macros/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-prefix=@prefix@
-top_srcdir=@top_srcdir@
-GEOS_VERSION=@GEOS_VERSION@
-
-EXTRA_DIST = geos.m4
diff --git a/macros/ax_check_compile_flag.m4 b/macros/ax_check_compile_flag.m4
deleted file mode 100755
index 89d3b93..0000000
--- a/macros/ax_check_compile_flag.m4
+++ /dev/null
@@ -1,74 +0,0 @@
-# ===========================================================================
-# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
-#
-# DESCRIPTION
-#
-# Check whether the given FLAG works with the current language's compiler
-# or gives an error. (Warnings, however, are ignored)
-#
-# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
-# success/failure.
-#
-# If EXTRA-FLAGS is defined, it is added to the current language's default
-# flags (e.g. CFLAGS) when the check is done. The check is thus made with
-# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to
-# force the compiler to issue an error when a bad flag is given.
-#
-# INPUT gives an alternative input source to AC_COMPILE_IFELSE.
-#
-# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
-# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
-#
-# LICENSE
-#
-# Copyright (c) 2008 Guido U. Draheim <guidod at gmx.de>
-# Copyright (c) 2011 Maarten Bosmans <mkbosmans at gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception, the respective Autoconf Macro's copyright owner
-# gives unlimited permission to copy, distribute and modify the configure
-# scripts that are the output of Autoconf when processing the Macro. You
-# need not follow the terms of the GNU General Public License when using
-# or distributing such scripts, even though portions of the text of the
-# Macro appear in them. The GNU General Public License (GPL) does govern
-# all other use of the material that constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the Autoconf
-# Macro released by the Autoconf Archive. When you make and distribute a
-# modified version of the Autoconf Macro, you may extend this special
-# exception to the GPL to apply to your modified version as well.
-
-#serial 4
-
-AC_DEFUN([AX_CHECK_COMPILE_FLAG],
-[AC_PREREQ(2.63)dnl for _AC_LANG_PREFIX and AS_VAR_IF
-AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
-AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
- ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
- _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
- AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
- [AS_VAR_SET(CACHEVAR,[yes])],
- [AS_VAR_SET(CACHEVAR,[no])])
- _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
-AS_VAR_IF(CACHEVAR,yes,
- [m4_default([$2], :)],
- [m4_default([$3], :)])
-AS_VAR_POPDEF([CACHEVAR])dnl
-])dnl AX_CHECK_COMPILE_FLAGS
diff --git a/macros/ax_cxx_compile_stdcxx.m4 b/macros/ax_cxx_compile_stdcxx.m4
deleted file mode 100755
index 9e9eaed..0000000
--- a/macros/ax_cxx_compile_stdcxx.m4
+++ /dev/null
@@ -1,948 +0,0 @@
-# ===========================================================================
-# https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional])
-#
-# DESCRIPTION
-#
-# Check for baseline language coverage in the compiler for the specified
-# version of the C++ standard. If necessary, add switches to CXX and
-# CXXCPP to enable support. VERSION may be '11' (for the C++11 standard)
-# or '14' (for the C++14 standard).
-#
-# The second argument, if specified, indicates whether you insist on an
-# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
-# -std=c++11). If neither is specified, you get whatever works, with
-# preference for an extended mode.
-#
-# The third argument, if specified 'mandatory' or if left unspecified,
-# indicates that baseline support for the specified C++ standard is
-# required and that the macro should error out if no mode with that
-# support is found. If specified 'optional', then configuration proceeds
-# regardless, after defining HAVE_CXX${VERSION} if and only if a
-# supporting mode is found.
-#
-# LICENSE
-#
-# Copyright (c) 2008 Benjamin Kosnik <bkoz at redhat.com>
-# Copyright (c) 2012 Zack Weinberg <zackw at panix.com>
-# Copyright (c) 2013 Roy Stogner <roystgnr at ices.utexas.edu>
-# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov at google.com>
-# Copyright (c) 2015 Paul Norman <penorman at mac.com>
-# Copyright (c) 2015 Moritz Klammler <moritz at klammler.eu>
-# Copyright (c) 2016, 2018 Krzesimir Nowak <qdlacz at gmail.com>
-#
-# Copying and distribution of this file, with or without modification, are
-# permitted in any medium without royalty provided the copyright notice
-# and this notice are preserved. This file is offered as-is, without any
-# warranty.
-
-#serial 10
-
-dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
-dnl (serial version number 13).
-
-AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
- m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"],
- [$1], [14], [ax_cxx_compile_alternatives="14 1y"],
- [$1], [17], [ax_cxx_compile_alternatives="17 1z"],
- [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
- m4_if([$2], [], [],
- [$2], [ext], [],
- [$2], [noext], [],
- [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl
- m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true],
- [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true],
- [$3], [optional], [ax_cxx_compile_cxx$1_required=false],
- [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
- AC_LANG_PUSH([C++])dnl
- ac_success=no
-
- m4_if([$2], [noext], [], [dnl
- if test x$ac_success = xno; then
- for alternative in ${ax_cxx_compile_alternatives}; do
- switch="-std=gnu++${alternative}"
- cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
- AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
- $cachevar,
- [ac_save_CXX="$CXX"
- CXX="$CXX $switch"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
- [eval $cachevar=yes],
- [eval $cachevar=no])
- CXX="$ac_save_CXX"])
- if eval test x\$$cachevar = xyes; then
- CXX="$CXX $switch"
- if test -n "$CXXCPP" ; then
- CXXCPP="$CXXCPP $switch"
- fi
- ac_success=yes
- break
- fi
- done
- fi])
-
- m4_if([$2], [ext], [], [dnl
- if test x$ac_success = xno; then
- dnl HP's aCC needs +std=c++11 according to:
- dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
- dnl Cray's crayCC needs "-h std=c++11"
- for alternative in ${ax_cxx_compile_alternatives}; do
- for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
- cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
- AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
- $cachevar,
- [ac_save_CXX="$CXX"
- CXX="$CXX $switch"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
- [eval $cachevar=yes],
- [eval $cachevar=no])
- CXX="$ac_save_CXX"])
- if eval test x\$$cachevar = xyes; then
- CXX="$CXX $switch"
- if test -n "$CXXCPP" ; then
- CXXCPP="$CXXCPP $switch"
- fi
- ac_success=yes
- break
- fi
- done
- if test x$ac_success = xyes; then
- break
- fi
- done
- fi])
- AC_LANG_POP([C++])
- if test x$ax_cxx_compile_cxx$1_required = xtrue; then
- if test x$ac_success = xno; then
- AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.])
- fi
- fi
- if test x$ac_success = xno; then
- HAVE_CXX$1=0
- AC_MSG_NOTICE([No compiler with C++$1 support was found])
- else
- HAVE_CXX$1=1
- AC_DEFINE(HAVE_CXX$1,1,
- [define if the compiler supports basic C++$1 syntax])
- fi
- AC_SUBST(HAVE_CXX$1)
-])
-
-
-dnl Test body for checking C++11 support
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11],
- _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-)
-
-
-dnl Test body for checking C++14 support
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
- _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
- _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-)
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17],
- _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
- _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
- _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
-)
-
-dnl Tests for new features in C++11
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
-
-// If the compiler admits that it is not ready for C++11, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201103L
-
-#error "This is not a C++11 compiler"
-
-#else
-
-namespace cxx11
-{
-
- namespace test_static_assert
- {
-
- template <typename T>
- struct check
- {
- static_assert(sizeof(int) <= sizeof(T), "not big enough");
- };
-
- }
-
- namespace test_final_override
- {
-
- struct Base
- {
- virtual void f() {}
- };
-
- struct Derived : public Base
- {
- virtual void f() override {}
- };
-
- }
-
- namespace test_double_right_angle_brackets
- {
-
- template < typename T >
- struct check {};
-
- typedef check<void> single_type;
- typedef check<check<void>> double_type;
- typedef check<check<check<void>>> triple_type;
- typedef check<check<check<check<void>>>> quadruple_type;
-
- }
-
- namespace test_decltype
- {
-
- int
- f()
- {
- int a = 1;
- decltype(a) b = 2;
- return a + b;
- }
-
- }
-
- namespace test_type_deduction
- {
-
- template < typename T1, typename T2 >
- struct is_same
- {
- static const bool value = false;
- };
-
- template < typename T >
- struct is_same<T, T>
- {
- static const bool value = true;
- };
-
- template < typename T1, typename T2 >
- auto
- add(T1 a1, T2 a2) -> decltype(a1 + a2)
- {
- return a1 + a2;
- }
-
- int
- test(const int c, volatile int v)
- {
- static_assert(is_same<int, decltype(0)>::value == true, "");
- static_assert(is_same<int, decltype(c)>::value == false, "");
- static_assert(is_same<int, decltype(v)>::value == false, "");
- auto ac = c;
- auto av = v;
- auto sumi = ac + av + 'x';
- auto sumf = ac + av + 1.0;
- static_assert(is_same<int, decltype(ac)>::value == true, "");
- static_assert(is_same<int, decltype(av)>::value == true, "");
- static_assert(is_same<int, decltype(sumi)>::value == true, "");
- static_assert(is_same<int, decltype(sumf)>::value == false, "");
- static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
- return (sumf > 0.0) ? sumi : add(c, v);
- }
-
- }
-
- namespace test_noexcept
- {
-
- int f() { return 0; }
- int g() noexcept { return 0; }
-
- static_assert(noexcept(f()) == false, "");
- static_assert(noexcept(g()) == true, "");
-
- }
-
- namespace test_constexpr
- {
-
- template < typename CharT >
- unsigned long constexpr
- strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
- {
- return *s ? strlen_c_r(s + 1, acc + 1) : acc;
- }
-
- template < typename CharT >
- unsigned long constexpr
- strlen_c(const CharT *const s) noexcept
- {
- return strlen_c_r(s, 0UL);
- }
-
- static_assert(strlen_c("") == 0UL, "");
- static_assert(strlen_c("1") == 1UL, "");
- static_assert(strlen_c("example") == 7UL, "");
- static_assert(strlen_c("another\0example") == 7UL, "");
-
- }
-
- namespace test_rvalue_references
- {
-
- template < int N >
- struct answer
- {
- static constexpr int value = N;
- };
-
- answer<1> f(int&) { return answer<1>(); }
- answer<2> f(const int&) { return answer<2>(); }
- answer<3> f(int&&) { return answer<3>(); }
-
- void
- test()
- {
- int i = 0;
- const int c = 0;
- static_assert(decltype(f(i))::value == 1, "");
- static_assert(decltype(f(c))::value == 2, "");
- static_assert(decltype(f(0))::value == 3, "");
- }
-
- }
-
- namespace test_uniform_initialization
- {
-
- struct test
- {
- static const int zero {};
- static const int one {1};
- };
-
- static_assert(test::zero == 0, "");
- static_assert(test::one == 1, "");
-
- }
-
- namespace test_lambdas
- {
-
- void
- test1()
- {
- auto lambda1 = [](){};
- auto lambda2 = lambda1;
- lambda1();
- lambda2();
- }
-
- int
- test2()
- {
- auto a = [](int i, int j){ return i + j; }(1, 2);
- auto b = []() -> int { return '0'; }();
- auto c = [=](){ return a + b; }();
- auto d = [&](){ return c; }();
- auto e = [a, &b](int x) mutable {
- const auto identity = [](int y){ return y; };
- for (auto i = 0; i < a; ++i)
- a += b--;
- return x + identity(a + b);
- }(0);
- return a + b + c + d + e;
- }
-
- int
- test3()
- {
- const auto nullary = [](){ return 0; };
- const auto unary = [](int x){ return x; };
- using nullary_t = decltype(nullary);
- using unary_t = decltype(unary);
- const auto higher1st = [](nullary_t f){ return f(); };
- const auto higher2nd = [unary](nullary_t f1){
- return [unary, f1](unary_t f2){ return f2(unary(f1())); };
- };
- return higher1st(nullary) + higher2nd(nullary)(unary);
- }
-
- }
-
- namespace test_variadic_templates
- {
-
- template <int...>
- struct sum;
-
- template <int N0, int... N1toN>
- struct sum<N0, N1toN...>
- {
- static constexpr auto value = N0 + sum<N1toN...>::value;
- };
-
- template <>
- struct sum<>
- {
- static constexpr auto value = 0;
- };
-
- static_assert(sum<>::value == 0, "");
- static_assert(sum<1>::value == 1, "");
- static_assert(sum<23>::value == 23, "");
- static_assert(sum<1, 2>::value == 3, "");
- static_assert(sum<5, 5, 11>::value == 21, "");
- static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
-
- }
-
- // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
- // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
- // because of this.
- namespace test_template_alias_sfinae
- {
-
- struct foo {};
-
- template<typename T>
- using member = typename T::member_type;
-
- template<typename T>
- void func(...) {}
-
- template<typename T>
- void func(member<T>*) {}
-
- void test();
-
- void test() { func<foo>(0); }
-
- }
-
-} // namespace cxx11
-
-#endif // __cplusplus >= 201103L
-
-]])
-
-
-dnl Tests for new features in C++14
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[
-
-// If the compiler admits that it is not ready for C++14, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201402L
-
-#error "This is not a C++14 compiler"
-
-#else
-
-namespace cxx14
-{
-
- namespace test_polymorphic_lambdas
- {
-
- int
- test()
- {
- const auto lambda = [](auto&&... args){
- const auto istiny = [](auto x){
- return (sizeof(x) == 1UL) ? 1 : 0;
- };
- const int aretiny[] = { istiny(args)... };
- return aretiny[0];
- };
- return lambda(1, 1L, 1.0f, '1');
- }
-
- }
-
- namespace test_binary_literals
- {
-
- constexpr auto ivii = 0b0000000000101010;
- static_assert(ivii == 42, "wrong value");
-
- }
-
- namespace test_generalized_constexpr
- {
-
- template < typename CharT >
- constexpr unsigned long
- strlen_c(const CharT *const s) noexcept
- {
- auto length = 0UL;
- for (auto p = s; *p; ++p)
- ++length;
- return length;
- }
-
- static_assert(strlen_c("") == 0UL, "");
- static_assert(strlen_c("x") == 1UL, "");
- static_assert(strlen_c("test") == 4UL, "");
- static_assert(strlen_c("another\0test") == 7UL, "");
-
- }
-
- namespace test_lambda_init_capture
- {
-
- int
- test()
- {
- auto x = 0;
- const auto lambda1 = [a = x](int b){ return a + b; };
- const auto lambda2 = [a = lambda1(x)](){ return a; };
- return lambda2();
- }
-
- }
-
- namespace test_digit_separators
- {
-
- constexpr auto ten_million = 100'000'000;
- static_assert(ten_million == 100000000, "");
-
- }
-
- namespace test_return_type_deduction
- {
-
- auto f(int& x) { return x; }
- decltype(auto) g(int& x) { return x; }
-
- template < typename T1, typename T2 >
- struct is_same
- {
- static constexpr auto value = false;
- };
-
- template < typename T >
- struct is_same<T, T>
- {
- static constexpr auto value = true;
- };
-
- int
- test()
- {
- auto x = 0;
- static_assert(is_same<int, decltype(f(x))>::value, "");
- static_assert(is_same<int&, decltype(g(x))>::value, "");
- return x;
- }
-
- }
-
-} // namespace cxx14
-
-#endif // __cplusplus >= 201402L
-
-]])
-
-
-dnl Tests for new features in C++17
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[
-
-// If the compiler admits that it is not ready for C++17, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201703L
-
-#error "This is not a C++17 compiler"
-
-#else
-
-#include <initializer_list>
-#include <utility>
-#include <type_traits>
-
-namespace cxx17
-{
-
- namespace test_constexpr_lambdas
- {
-
- constexpr int foo = [](){return 42;}();
-
- }
-
- namespace test::nested_namespace::definitions
- {
-
- }
-
- namespace test_fold_expression
- {
-
- template<typename... Args>
- int multiply(Args... args)
- {
- return (args * ... * 1);
- }
-
- template<typename... Args>
- bool all(Args... args)
- {
- return (args && ...);
- }
-
- }
-
- namespace test_extended_static_assert
- {
-
- static_assert (true);
-
- }
-
- namespace test_auto_brace_init_list
- {
-
- auto foo = {5};
- auto bar {5};
-
- static_assert(std::is_same<std::initializer_list<int>, decltype(foo)>::value);
- static_assert(std::is_same<int, decltype(bar)>::value);
- }
-
- namespace test_typename_in_template_template_parameter
- {
-
- template<template<typename> typename X> struct D;
-
- }
-
- namespace test_fallthrough_nodiscard_maybe_unused_attributes
- {
-
- int f1()
- {
- return 42;
- }
-
- [[nodiscard]] int f2()
- {
- [[maybe_unused]] auto unused = f1();
-
- switch (f1())
- {
- case 17:
- f1();
- [[fallthrough]];
- case 42:
- f1();
- }
- return f1();
- }
-
- }
-
- namespace test_extended_aggregate_initialization
- {
-
- struct base1
- {
- int b1, b2 = 42;
- };
-
- struct base2
- {
- base2() {
- b3 = 42;
- }
- int b3;
- };
-
- struct derived : base1, base2
- {
- int d;
- };
-
- derived d1 {{1, 2}, {}, 4}; // full initialization
- derived d2 {{}, {}, 4}; // value-initialized bases
-
- }
-
- namespace test_general_range_based_for_loop
- {
-
- struct iter
- {
- int i;
-
- int& operator* ()
- {
- return i;
- }
-
- const int& operator* () const
- {
- return i;
- }
-
- iter& operator++()
- {
- ++i;
- return *this;
- }
- };
-
- struct sentinel
- {
- int i;
- };
-
- bool operator== (const iter& i, const sentinel& s)
- {
- return i.i == s.i;
- }
-
- bool operator!= (const iter& i, const sentinel& s)
- {
- return !(i == s);
- }
-
- struct range
- {
- iter begin() const
- {
- return {0};
- }
-
- sentinel end() const
- {
- return {5};
- }
- };
-
- void f()
- {
- range r {};
-
- for (auto i : r)
- {
- [[maybe_unused]] auto v = i;
- }
- }
-
- }
-
- namespace test_lambda_capture_asterisk_this_by_value
- {
-
- struct t
- {
- int i;
- int foo()
- {
- return [*this]()
- {
- return i;
- }();
- }
- };
-
- }
-
- namespace test_enum_class_construction
- {
-
- enum class byte : unsigned char
- {};
-
- byte foo {42};
-
- }
-
- namespace test_constexpr_if
- {
-
- template <bool cond>
- int f ()
- {
- if constexpr(cond)
- {
- return 13;
- }
- else
- {
- return 42;
- }
- }
-
- }
-
- namespace test_selection_statement_with_initializer
- {
-
- int f()
- {
- return 13;
- }
-
- int f2()
- {
- if (auto i = f(); i > 0)
- {
- return 3;
- }
-
- switch (auto i = f(); i + 4)
- {
- case 17:
- return 2;
-
- default:
- return 1;
- }
- }
-
- }
-
- namespace test_template_argument_deduction_for_class_templates
- {
-
- template <typename T1, typename T2>
- struct pair
- {
- pair (T1 p1, T2 p2)
- : m1 {p1},
- m2 {p2}
- {}
-
- T1 m1;
- T2 m2;
- };
-
- void f()
- {
- [[maybe_unused]] auto p = pair{13, 42u};
- }
-
- }
-
- namespace test_non_type_auto_template_parameters
- {
-
- template <auto n>
- struct B
- {};
-
- B<5> b1;
- B<'a'> b2;
-
- }
-
- namespace test_structured_bindings
- {
-
- int arr[2] = { 1, 2 };
- std::pair<int, int> pr = { 1, 2 };
-
- auto f1() -> int(&)[2]
- {
- return arr;
- }
-
- auto f2() -> std::pair<int, int>&
- {
- return pr;
- }
-
- struct S
- {
- int x1 : 2;
- volatile double y1;
- };
-
- S f3()
- {
- return {};
- }
-
- auto [ x1, y1 ] = f1();
- auto& [ xr1, yr1 ] = f1();
- auto [ x2, y2 ] = f2();
- auto& [ xr2, yr2 ] = f2();
- const auto [ x3, y3 ] = f3();
-
- }
-
- namespace test_exception_spec_type_system
- {
-
- struct Good {};
- struct Bad {};
-
- void g1() noexcept;
- void g2();
-
- template<typename T>
- Bad
- f(T*, T*);
-
- template<typename T1, typename T2>
- Good
- f(T1*, T2*);
-
- static_assert (std::is_same_v<Good, decltype(f(g1, g2))>);
-
- }
-
- namespace test_inline_variables
- {
-
- template<class T> void f(T)
- {}
-
- template<class T> inline T g(T)
- {
- return T{};
- }
-
- template<> inline void f<>(int)
- {}
-
- template<> int g<>(int)
- {
- return 5;
- }
-
- }
-
-} // namespace cxx17
-
-#endif // __cplusplus < 201703L
-
-]])
diff --git a/macros/ax_cxx_compile_stdcxx_11.m4 b/macros/ax_cxx_compile_stdcxx_11.m4
deleted file mode 100755
index 0aadeaf..0000000
--- a/macros/ax_cxx_compile_stdcxx_11.m4
+++ /dev/null
@@ -1,39 +0,0 @@
-# ============================================================================
-# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
-# ============================================================================
-#
-# SYNOPSIS
-#
-# AX_CXX_COMPILE_STDCXX_11([ext|noext], [mandatory|optional])
-#
-# DESCRIPTION
-#
-# Check for baseline language coverage in the compiler for the C++11
-# standard; if necessary, add switches to CXX and CXXCPP to enable
-# support.
-#
-# This macro is a convenience alias for calling the AX_CXX_COMPILE_STDCXX
-# macro with the version set to C++11. The two optional arguments are
-# forwarded literally as the second and third argument respectively.
-# Please see the documentation for the AX_CXX_COMPILE_STDCXX macro for
-# more information. If you want to use this macro, you also need to
-# download the ax_cxx_compile_stdcxx.m4 file.
-#
-# LICENSE
-#
-# Copyright (c) 2008 Benjamin Kosnik <bkoz at redhat.com>
-# Copyright (c) 2012 Zack Weinberg <zackw at panix.com>
-# Copyright (c) 2013 Roy Stogner <roystgnr at ices.utexas.edu>
-# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov at google.com>
-# Copyright (c) 2015 Paul Norman <penorman at mac.com>
-# Copyright (c) 2015 Moritz Klammler <moritz at klammler.eu>
-#
-# Copying and distribution of this file, with or without modification, are
-# permitted in any medium without royalty provided the copyright notice
-# and this notice are preserved. This file is offered as-is, without any
-# warranty.
-
-#serial 17
-
-AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])
-AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [AX_CXX_COMPILE_STDCXX([11], [$1], [$2])])
diff --git a/macros/boost.m4 b/macros/boost.m4
deleted file mode 100644
index 52ba576..0000000
--- a/macros/boost.m4
+++ /dev/null
@@ -1,490 +0,0 @@
-dnl @synopsis AX_BOOST([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl
-dnl Test for the Boost C++ libraries of a particular version (or newer)
-dnl
-dnl If no path to the installed boost library is given the macro
-dnl searchs under /usr, /usr/local, and /opt, and evaluates the
-dnl $BOOST_ROOT environment variable.
-dnl
-dnl http://autoconf-archive.cryp.to/ax_boost.m4
-dnl
-dnl This macro calls:
-dnl
-dnl AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS)
-dnl AC_SUBST(BOOST_FILESYSTEM_LIB)
-dnl AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB)
-dnl AC_SUBST(BOOST_THREAD_LIB)
-dnl AC_SUBST(BOOST_IOSTREAMS_LIB)
-dnl AC_SUBST(BOOST_SERIALIZATION_LIB)
-dnl AC_SUBST(BOOST_WSERIALIZATION_LIB)
-dnl AC_SUBST(BOOST_SIGNALS_LIB)
-dnl AC_SUBST(BOOST_DATE_TIME_LIB)
-dnl AC_SUBST(BOOST_REGEX_LIB)
-dnl AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB)
-dnl
-dnl And sets:
-dnl
-dnl HAVE_BOOST
-dnl HAVE_BOOST_FILESYSTEM
-dnl HAVE_BOOST_PROGRAM_OPTIONS
-dnl HAVE_BOOST_THREAD
-dnl HAVE_BOOST_IOSTREAMS
-dnl HAVE_BOOST_SERIALIZATION
-dnl HAVE_BOOST_SIGNALS
-dnl HAVE_BOOST_DATE_TIME
-dnl HAVE_BOOST_REGEX
-dnl HAVE_BOOST_UNIT_TEST_FRAMEWORK
-dnl
-dnl @category InstalledPackages
-dnl @author Thomas Porschberg <thomas at randspringer.de>
-dnl @version 2006-01-02
-dnl @license AllPermissive
-
-AC_DEFUN([AX_BOOST],
-[
- AC_ARG_WITH([boost],
- AC_HELP_STRING([--with-boost=DIR],
- [use boost (default is NO) , specify the root directory for boost library (optional)]),
- [
- if test "$withval" = "no"; then
- want_boost="no"
- elif test "$withval" = "yes"; then
- want_boost="yes"
- ac_boost_path=""
- else
- want_boost="yes"
- ac_boost_path="$withval"
- fi
- ],
- [want_boost="no"])
-
- #AC_CANONICAL_BUILD
- if test "x$want_boost" = "xyes"; then
- boost_lib_version_req=ifelse([$1], ,1.20.0,$1)
- boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'`
- boost_lib_version_req_major=`expr $boost_lib_version_req : '\([[0-9]]*\)'`
- boost_lib_version_req_minor=`expr $boost_lib_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
- boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
- if test "x$boost_lib_version_req_sub_minor" = "x" ; then
- boost_lib_version_req_sub_minor="0"
- fi
- WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
- AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)
- succeeded=no
-
- dnl first we check the system location for boost libraries
- dnl this location ist chosen if boost libraries are installed with the --layout=system option
- dnl or if you install boost with RPM
- if test "$ac_boost_path" != ""; then
- BOOST_LDFLAGS="-L$ac_boost_path/lib"
- BOOST_CPPFLAGS="-I$ac_boost_path/include"
- else
- for ac_boost_path_tmp in /usr /usr/local /opt ; do
- if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
- BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib"
- BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
- break;
- fi
- done
- fi
-
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
-
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
-
- AC_TRY_COMPILE(
- [
-@%:@include <boost/version.hpp>
-],
- [
-#if BOOST_VERSION >= $WANT_BOOST_VERSION
-// Everything is okay
-#else
-# error Boost version is too old
-#endif
-
- ],
- [
- AC_MSG_RESULT(yes)
- succeeded=yes
- found_system=yes
- ifelse([$2], , :, [$2])
- ],
- [
- ])
-
- dnl if we found no boost with system layout we search for boost libraries
- dnl built and installed without the --layout=system option or for a staged(not installed) version
- if test "x$succeeded" != "xyes"; then
- _version=0
- if test "$ac_boost_path" != ""; then
- BOOST_LDFLAGS="-L$ac_boost_path/lib"
- if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
- for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
- _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
- V_CHECK=`expr $_version_tmp \> $_version`
- if test "$V_CHECK" = "1" ; then
- _version=$_version_tmp
- fi
- VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
- BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
- done
- fi
- else
- for ac_boost_path in /usr /usr/local /opt ; do
- if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
- for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
- _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
- V_CHECK=`expr $_version_tmp \> $_version`
- if test "$V_CHECK" = "1" ; then
- _version=$_version_tmp
- best_path=$ac_boost_path
- fi
- done
- fi
- done
-
- VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
- BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
- BOOST_LDFLAGS="-L$best_path/lib"
-
- if test "x$BOOST_ROOT" != "x"; then
- if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT"; then
- version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'`
- stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
- stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'`
- V_CHECK=`expr $stage_version_shorten \>\= $_version`
- if test "$V_CHECK" = "1" ; then
- AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)
- BOOST_CPPFLAGS="-I$BOOST_ROOT"
- BOOST_LDFLAGS="-L$BOOST_ROOT/stage/lib"
- fi
- fi
- fi
- fi
-
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
-
- AC_TRY_COMPILE(
- [
-@%:@include <boost/version.hpp>
-],
- [
-#if BOOST_VERSION >= $WANT_BOOST_VERSION
-// Everything is okay
-#else
-# error Boost version is too old
-#endif
-
- ],
- [
- AC_MSG_RESULT(yes ($_version))
- succeeded=yes
- ifelse([$2], , :, [$2])
- ],
- [
- AC_MSG_RESULT(no ($_version))
- ifelse([$3], , :, [$3])
- ])
- fi
-
- if test "$succeeded" != "yes" ; then
- if test "$_version" = "0" ; then
- AC_MSG_ERROR([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>.]])
- else
- AC_MSG_ERROR('Your boost libraries seems to old (version $_version). We need at least $boost_lib_version_shorten')
- fi
- else
- AC_SUBST(BOOST_CPPFLAGS)
- AC_SUBST(BOOST_LDFLAGS)
- AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])
-
- AC_CACHE_CHECK([whether the Boost::Filesystem library is available],
- ax_cv_boost_filesystem,
- [AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/filesystem/path.hpp>]],
- [[using namespace boost::filesystem;
- path my_path( "foo/bar/data.txt" );
- return 0;]]),
- ax_cv_boost_filesystem=yes, ax_cv_boost_filesystem=no)
- AC_LANG_RESTORE
- ])
- if test "$ax_cv_boost_filesystem" = "yes"; then
- AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::FILESYSTEM library is available])
- BN=boost_filesystem
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s lib$BN-$CC-s \
- $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do
- AC_CHECK_LIB($ax_lib, main,
- [BOOST_FILESYSTEM_LIB="-l$ax_lib" AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes" break],
- [link_filesystem="no"])
- done
- if test "x$link_filesystem" = "xno"; then
- AC_MSG_NOTICE(Could not link against $ax_lib !)
- fi
- fi
-
- AC_CACHE_CHECK([whether the Boost::Program_Options library is available],
- ax_cv_boost_program_options,
- [AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/program_options.hpp>]],
- [[boost::program_options::options_description generic("Generic options");
- return 0;]]),
- ax_cv_boost_program_options=yes, ax_cv_boost_program_options=no)
- AC_LANG_RESTORE
- ])
- if test "$ax_cv_boost_program_options" = yes; then
- AC_DEFINE(HAVE_BOOST_PROGRAM_OPTIONS,,[define if the Boost::PROGRAM_OPTIONS library is available])
- BN=boost_program_options
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s lib$BN-$CC-s \
- $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do
- AC_CHECK_LIB($ax_lib, main,
- [BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib" AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes" break],
- [link_program_options="no"])
- done
- if test "x$link_program_options="no"" = "xno"; then
- AC_MSG_NOTICE(Could not link against $ax_lib !)
- fi
- fi
-
- AC_CACHE_CHECK(whether the Boost::Thread library is available,
- ax_cv_boost_thread,
- [AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- CXXFLAGS_SAVE=$CXXFLAGS
-
- if test "x$build_os" = "xsolaris" ; then
- CXXFLAGS="-pthreads $CXXFLAGS"
- elif test "x$build_os" = "xming32" ; then
- CXXFLAGS="-mthreads $CXXFLAGS"
- else
- CXXFLAGS="-pthread $CXXFLAGS"
- fi
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/thread/thread.hpp>]],
- [[boost::thread_group thrds;
- return 0;]]),
- ax_cv_boost_thread=yes, ax_cv_boost_thread=no)
- CXXFLAGS=$CXXFLAGS_SAVE
- AC_LANG_RESTORE
- ])
- if test "x$ax_cv_boost_thread" = "xyes"; then
- if test "x$build_os" = "xsolaris" ; then
- BOOST_CPPFLAGS="-pthreads $BOOST_CPPFLAGS"
- elif test "x$build_os" = "xming32" ; then
- BOOST_CPPFLAGS="-mthreads $BOOST_CPPFLAGS"
- else
- BOOST_CPPFLAGS="-pthread $BOOST_CPPFLAGS"
- fi
-
- AC_SUBST(BOOST_CPPFLAGS)
- AC_DEFINE(HAVE_BOOST_THREAD,,[define if the Boost::THREAD library is available])
- BN=boost_thread
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s lib$BN-$CC-s \
- $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do
- AC_CHECK_LIB($ax_lib, main, [BOOST_THREAD_LIB="-l$ax_lib" AC_SUBST(BOOST_THREAD_LIB) link_thread="yes" break],
- [link_thread="no"])
- done
- if test "x$link_thread" = "xno"; then
- AC_MSG_NOTICE(Could not link against $ax_lib !)
- fi
- fi
-
- AC_CACHE_CHECK(whether the Boost::IOStreams library is available,
- ax_cv_boost_iostreams,
- [AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/iostreams/filtering_stream.hpp>
- @%:@include <boost/range/iterator_range.hpp>
- ]],
- [[std::string input = "Hello World!";
- namespace io = boost::iostreams;
- io::filtering_istream in(boost::make_iterator_range(input));
- return 0;
- ]]),
- ax_cv_boost_iostreams=yes, ax_cv_boost_iostreams=no)
- AC_LANG_RESTORE
- ])
- if test "x$ax_cv_boost_iostreams" = "xyes"; then
- AC_DEFINE(HAVE_BOOST_IOSTREAMS,,[define if the Boost::IOStreams library is available])
- BN=boost_iostreams
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s lib$BN-$CC-s \
- $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do
- AC_CHECK_LIB($ax_lib, main, [BOOST_IOSTREAMS_LIB="-l$ax_lib" AC_SUBST(BOOST_IOSTREAMS_LIB) link_thread="yes" break],
- [link_thread="no"])
- done
- if test "x$link_thread" = "xno"; then
- AC_MSG_NOTICE(Could not link against $ax_lib !)
- fi
- fi
-
- AC_CACHE_CHECK(whether the Boost::Serialization library is available,
- ax_cv_boost_serialization,
- [AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <fstream>
- @%:@include <boost/archive/text_oarchive.hpp>
- @%:@include <boost/archive/text_iarchive.hpp>
- ]],
- [[std::ofstream ofs("filename");
- boost::archive::text_oarchive oa(ofs);
- return 0;
- ]]),
- ax_cv_boost_serialization=yes, ax_cv_boost_serialization=no)
- AC_LANG_RESTORE
- ])
- if test "x$ax_cv_boost_serialization" = "xyes"; then
- AC_DEFINE(HAVE_BOOST_SERIALIZATION,,[define if the Boost::Serialization library is available])
- BN=boost_serialization
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s lib$BN-$CC-s \
- $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do
- AC_CHECK_LIB($ax_lib, main,
- [BOOST_SERIALIZATION_LIB="-l$ax_lib" AC_SUBST(BOOST_SERIALIZATION_LIB) link_thread="yes" break],
- [link_thread="no"])
- done
- BN=boost_wserialization
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s lib$BN-$CC-s \
- $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do
- AC_CHECK_LIB($ax_lib, main,
- [BOOST_WSERIALIZATION_LIB="-l$ax_lib" AC_SUBST(BOOST_WSERIALIZATION_LIB) link_thread="yes" break],
- [link_thread="no"])
- done
- if test "x$link_thread" = "xno"; then
- AC_MSG_NOTICE(Could not link against $ax_lib !)
- fi
- fi
-
- AC_CACHE_CHECK(whether the Boost::Signals library is available,
- ax_cv_boost_signals,
- [AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/signal.hpp>
- ]],
- [[boost::signal<void ()> sig;
- return 0;
- ]]),
- ax_cv_boost_signals=yes, ax_cv_boost_signals=no)
- AC_LANG_RESTORE
- ])
- if test "x$ax_cv_boost_signals" = "xyes"; then
- AC_DEFINE(HAVE_BOOST_SIGNALS,,[define if the Boost::Signals library is available])
- BN=boost_signals
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s lib$BN-$CC-s \
- $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do
- AC_CHECK_LIB($ax_lib, main, [BOOST_SIGNALS_LIB="-l$ax_lib" AC_SUBST(BOOST_SIGNALS_LIB) link_thread="yes" break],
- [link_thread="no"])
- done
- if test "x$link_thread" = "xno"; then
- AC_MSG_NOTICE(Could not link against $ax_lib !)
- fi
- fi
-
- AC_CACHE_CHECK(whether the Boost::Date_Time library is available,
- ax_cv_boost_date_time,
- [AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/date_time/gregorian/gregorian_types.hpp>
- ]],
- [[using namespace boost::gregorian; date d(2002,Jan,10);
- return 0;
- ]]),
- ax_cv_boost_date_time=yes, ax_cv_boost_date_time=no)
- AC_LANG_RESTORE
- ])
- if test "x$ax_cv_boost_date_time" = "xyes"; then
- AC_DEFINE(HAVE_BOOST_DATE_TIME,,[define if the Boost::Date_Time library is available])
- BN=boost_date_time
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s lib$BN-$CC-s \
- $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do
- AC_CHECK_LIB($ax_lib, main, [BOOST_DATE_TIME_LIB="-l$ax_lib" AC_SUBST(BOOST_DATE_TIME_LIB) link_thread="yes" break],
- [link_thread="no"])
- done
- if test "x$link_thread"="no" = "xno"; then
- AC_MSG_NOTICE(Could not link against $ax_lib !)
- fi
- fi
-
- AC_CACHE_CHECK(whether the Boost::Regex library is available,
- ax_cv_boost_regex,
- [AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/regex.hpp>
- ]],
- [[boost::regex r(); return 0;]]),
- ax_cv_boost_regex=yes, ax_cv_boost_regex=no)
- AC_LANG_RESTORE
- ])
- if test "x$ax_cv_boost_regex" = "xyes"; then
- AC_DEFINE(HAVE_BOOST_REGEX,,[define if the Boost::Regex library is available])
- BN=boost_regex
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s lib$BN-$CC-s \
- $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do
- AC_CHECK_LIB($ax_lib, main, [BOOST_REGEX_LIB="-l$ax_lib" AC_SUBST(BOOST_REGEX_LIB) link_thread="yes" break],
- [link_thread="no"])
- done
- if test "x$link_thread" = "xno"; then
- AC_MSG_NOTICE(Could not link against $ax_lib !)
- fi
- fi
-
- AC_CACHE_CHECK(whether the Boost::UnitTestFramework library is available,
- ax_cv_boost_unit_test_framework,
- [AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/test/unit_test.hpp>]],
- [[using boost::unit_test::test_suite;
- test_suite* test= BOOST_TEST_SUITE( "Unit test example 1" ); return 0;]]),
- ax_cv_boost_unit_test_framework=yes, ax_cv_boost_unit_test_framework=no)
- AC_LANG_RESTORE
- ])
- if test "x$ax_cv_boost_unit_test_framework" = "xyes"; then
- AC_DEFINE(HAVE_BOOST_UNIT_TEST_FRAMEWORK,,[define if the Boost::Unit_test_framework library is available])
- BN=boost_unit_test_framework
- saved_ldflags="${LDFLAGS}"
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s lib$BN-$CC-s \
- $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do
- LDFLAGS="${LDFLAGS} -l$ax_lib"
- AC_CACHE_CHECK(the name of the Boost::UnitTestFramework library,
- ax_cv_boost_unit_test_framework,
- [AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/test/unit_test.hpp>]],
- [[using boost::unit_test::test_suite;
- test_suite* test= BOOST_TEST_SUITE( "Unit test example 1" ); return 0;]])],
- [link_thread="yes"],[link_thread="no"])
-
- AC_LANG_RESTORE
- ])
- LDFLAGS="${saved_ldflags}"
- if test "x$link_thread" = "xyes"; then
- BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"
- AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB)
- break
- fi
- done
- if test "x$link_thread" = "xno"; then
- AC_MSG_NOTICE(Could not link against $ax_lib !)
- fi
- fi
- fi
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
-])
diff --git a/macros/geos.m4 b/macros/geos.m4
deleted file mode 100644
index e4cbbfc..0000000
--- a/macros/geos.m4
+++ /dev/null
@@ -1,93 +0,0 @@
-dnl
-dnl GEOS_INIT (MINIMUM_VERSION)
-dnl
-dnl Test for GEOS: define HAVE_GEOS, GEOS_LIBS, GEOS_C_LIBS, GEOS_CC_LIBS, GEOS_CFLAGS, GEOS_VERSION
-dnl
-dnl Call as GEOS_INIT or GEOS_INIT(minimum version) in configure.in. Test
-dnl HAVE_GEOS (yes|no) afterwards. If yes, all other vars above can be
-dnl used in program.
-dnl
-dnl UPDATE 2006/07/06
-dnl Now, --with-geos takes values: yes or no, or full path to the geos-config
-dnl utility. Note that the utility can have different name,
-dnl e.g. geos-config-cvs.
-dnl Example: --with-geos=/home/foo/usr/bin/geos-config-cvs
-dnl
-AC_DEFUN([GEOS_INIT],[
- AC_SUBST(GEOS_LIBS)
- AC_SUBST(GEOS_CFLAGS)
- AC_SUBST(GEOS_C_LIBS)
- AC_SUBST(GEOS_CC_LIBS)
- AC_SUBST(GEOS_C_CFLAGS)
- AC_SUBST(HAVE_GEOS)
- AC_SUBST(GEOS_VERSION)
-
- if test x"$with_geos" = x"no" ; then
- AC_MSG_RESULT([GEOS support disabled])
- GEOS_CONFIG="no"
- HAVE_GEOS="no"
- elif test x"$with_geos" = x"yes" -o x"$with_geos" = x"" ; then
- AC_PATH_PROG([GEOS_CONFIG], [geos-config], [no])
- else
- ac_geos_config=`basename $with_geos`
- ac_geos_config_dir=`dirname $with_geos`
-
- AC_CHECK_PROG(
- GEOS_CONFIG,
- $ac_geos_config,
- $with_geos,
- [no],
- [$ac_geos_config_dir],
- []
- )
- fi
-
- min_geos_version=ifelse([$1], ,0.0.1,$1)
-
- if test "$GEOS_CONFIG" = "no"; then
- no_geos_config="yes"
- else
- AC_MSG_CHECKING(for GEOS version >= $min_geos_version)
-
- geos_major_version=`$GEOS_CONFIG --version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
- geos_minor_version=`$GEOS_CONFIG --version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
- geos_micro_version=`$GEOS_CONFIG --version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
-
- req_major=`echo $min_geos_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
- req_minor=`echo $min_geos_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
- req_micro=`echo $min_geos_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
-
- version_ok="no"
- ac_req_version=`expr $req_major \* 100000 \+ $req_minor \* 100 \+ $req_micro`
- ac_geos_version=`expr $geos_major_version \* 100000 \+ $geos_minor_version \* 100 \+ $geos_micro_version`
-
- if test $ac_req_version -le $ac_geos_version; then
- version_ok="yes"
- fi
-
- if test $version_ok = "no"; then
- HAVE_GEOS="no"
- else
- if $GEOS_CONFIG --libs >/dev/null 2>&1; then
- AC_MSG_RESULT(yes)
- HAVE_GEOS="yes"
- GEOS_LIBS="`$GEOS_CONFIG --libs`"
- GEOS_C_LIBS="`$GEOS_CONFIG --ldflags` -lgeos_c"
- GEOS_CC_LIBS="`$GEOS_CONFIG --ldflags` -lgeos"
- GEOS_CFLAGS="`$GEOS_CONFIG --cflags`"
- GEOS_VERSION="`$GEOS_CONFIG --version`"
- else
- AC_MSG_RESULT(no)
- HAVE_GEOS="no"
- no_geos_config="yes"
- fi
- fi
-fi
-])
-
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index f19d1b3..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS = \
- algorithm \
- edgegraph \
- geom \
- index \
- io \
- linearref \
- math \
- noding \
- operation \
- planargraph \
- geomgraph \
- precision \
- simplify \
- triangulate \
- shape \
- util \
- deps
-
-EXTRA_DIST = dirlist.mk CMakeLists.txt info.plist.in
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-lib_LTLIBRARIES = libgeos.la
-
-# libgeos uses -release because it is not feasible to know if the ABI
-# has changed between releases; the project chooses not to expend the
-# effort to determine this because GEOS does not promise ABI stability.
-libgeos_la_LDFLAGS = \
- -release @VERSION_RELEASE@ \
- -no-undefined
-
-libgeos_la_SOURCES = \
- inlines.cpp
-
-libgeos_la_LIBADD = \
- algorithm/libalgorithm.la \
- edgegraph/libedgegraph.la \
- geom/libgeom.la \
- geomgraph/libgeomgraph.la \
- index/libindex.la \
- io/libio.la \
- linearref/liblinearref.la \
- math/libmath.la \
- noding/libnoding.la \
- operation/liboperation.la \
- planargraph/libplanargraph.la \
- precision/libprecision.la \
- simplify/libsimplify.la \
- triangulate/libtriangulate.la \
- shape/libshape.la \
- util/libutil.la \
- deps/libdeps.la
diff --git a/src/algorithm/Makefile.am b/src/algorithm/Makefile.am
deleted file mode 100644
index a4a8180..0000000
--- a/src/algorithm/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS = \
- locate \
- distance \
- construct
-
-noinst_LTLIBRARIES = libalgorithm.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libalgorithm_la_SOURCES = \
- Angle.cpp \
- Area.cpp \
- BoundaryNodeRule.cpp \
- Centroid.cpp \
- CGAlgorithmsDD.cpp \
- ConvexHull.cpp \
- Distance.cpp \
- HCoordinate.cpp \
- InteriorPointArea.cpp \
- InteriorPointLine.cpp \
- InteriorPointPoint.cpp \
- Intersection.cpp \
- LineIntersector.cpp \
- Length.cpp \
- MinimumBoundingCircle.cpp \
- MinimumDiameter.cpp \
- NotRepresentableException.cpp \
- Orientation.cpp \
- PointLocation.cpp \
- PointLocator.cpp \
- RayCrossingCounter.cpp \
- RayCrossingCounterDD.cpp \
- RobustDeterminant.cpp
-
-libalgorithm_la_LIBADD = \
- locate/liblocation.la \
- distance/libdistance.la \
- construct/libconstruct.la
diff --git a/src/algorithm/construct/Makefile.am b/src/algorithm/construct/Makefile.am
deleted file mode 100644
index d9e47aa..0000000
--- a/src/algorithm/construct/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-noinst_LTLIBRARIES = libconstruct.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libconstruct_la_SOURCES = \
- LargestEmptyCircle.cpp \
- MaximumInscribedCircle.cpp
-
-libconstruct_la_LIBADD =
diff --git a/src/algorithm/distance/Makefile.am b/src/algorithm/distance/Makefile.am
deleted file mode 100644
index cc7d5ad..0000000
--- a/src/algorithm/distance/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-noinst_LTLIBRARIES = libdistance.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libdistance_la_SOURCES = \
- DiscreteHausdorffDistance.cpp \
- DiscreteFrechetDistance.cpp \
- DistanceToPoint.cpp
-
-libdistance_la_LIBADD =
diff --git a/src/algorithm/locate/Makefile.am b/src/algorithm/locate/Makefile.am
deleted file mode 100644
index 7c5d53e..0000000
--- a/src/algorithm/locate/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-noinst_LTLIBRARIES = liblocation.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-liblocation_la_SOURCES = \
- IndexedPointInAreaLocator.cpp \
- PointOnGeometryLocator.cpp \
- SimplePointInAreaLocator.cpp
-
-liblocation_la_LIBADD =
diff --git a/src/deps/Makefile.am b/src/deps/Makefile.am
deleted file mode 100644
index 021990d..0000000
--- a/src/deps/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS=\
- ryu
-
-libdeps_la_SOURCES =
-
-noinst_LTLIBRARIES = \
- libdeps.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/src/deps
-
-libdeps_la_LIBADD = \
- ryu/libryu.la
-
-
-
diff --git a/src/deps/ryu/Makefile.am b/src/deps/ryu/Makefile.am
deleted file mode 100644
index 3da96d2..0000000
--- a/src/deps/ryu/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-noinst_LTLIBRARIES = libryu.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/src/deps
-
-libryu_la_SOURCES = \
- d2s.c
-
-noinst_HEADERS = \
- common.h \
- d2fixed_full_table.h \
- d2s_full_table.h \
- d2s_intrinsics.h \
- digit_table.h \
- ryu.h
diff --git a/src/edgegraph/Makefile.am b/src/edgegraph/Makefile.am
deleted file mode 100644
index 6c4f7ce..0000000
--- a/src/edgegraph/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-noinst_LTLIBRARIES = libedgegraph.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libedgegraph_la_SOURCES = \
- EdgeGraph.cpp \
- EdgeGraphBuilder.cpp \
- HalfEdge.cpp \
- MarkHalfEdge.cpp
diff --git a/src/geom/Makefile.am b/src/geom/Makefile.am
deleted file mode 100644
index 245fd4e..0000000
--- a/src/geom/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS=\
- util \
- prep
-
-noinst_LTLIBRARIES = \
- libgeom.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libgeom_la_SOURCES = \
- Coordinate.cpp \
- CoordinateSequence.cpp \
- CoordinateArraySequence.cpp \
- CoordinateArraySequenceFactory.cpp \
- DefaultCoordinateSequenceFactory.cpp \
- Dimension.cpp \
- Envelope.cpp \
- Geometry.cpp \
- GeometryCollection.cpp \
- GeometryComponentFilter.cpp \
- GeometryFactory.cpp \
- HeuristicOverlay.cpp \
- IntersectionMatrix.cpp \
- LinearRing.cpp \
- LineSegment.cpp \
- LineString.cpp \
- Location.cpp \
- MultiLineString.cpp \
- MultiPoint.cpp \
- MultiPolygon.cpp \
- Point.cpp \
- Polygon.cpp \
- PrecisionModel.cpp \
- Position.cpp \
- Quadrant.cpp \
- Triangle.cpp
-
-
-libgeom_la_LIBADD = \
- util/libgeomutil.la \
- prep/libgeomprep.la
diff --git a/src/geom/prep/Makefile.am b/src/geom/prep/Makefile.am
deleted file mode 100644
index abd2bd9..0000000
--- a/src/geom/prep/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-noinst_LTLIBRARIES = libgeomprep.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-## these are full inlined
-# PolygonExtracter.cpp
-# PointExtracter.cpp
-# LinearComponentExtracter.cpp
-
-libgeomprep_la_SOURCES = \
- AbstractPreparedPolygonContains.cpp \
- BasicPreparedGeometry.cpp \
- PreparedGeometry.cpp \
- PreparedGeometryFactory.cpp \
- PreparedLineString.cpp \
- PreparedLineStringDistance.cpp \
- PreparedLineStringIntersects.cpp \
- PreparedLineStringNearestPoints.cpp \
- PreparedPoint.cpp \
- PreparedPolygon.cpp \
- PreparedPolygonContains.cpp \
- PreparedPolygonContainsProperly.cpp \
- PreparedPolygonCovers.cpp \
- PreparedPolygonDistance.cpp \
- PreparedPolygonIntersects.cpp \
- PreparedPolygonPredicate.cpp
diff --git a/src/geom/util/Makefile.am b/src/geom/util/Makefile.am
deleted file mode 100644
index f05171a..0000000
--- a/src/geom/util/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-noinst_LTLIBRARIES = libgeomutil.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libgeomutil_la_SOURCES = \
- ComponentCoordinateExtracter.cpp \
- CoordinateOperation.cpp \
- GeometryEditor.cpp \
- GeometryTransformer.cpp \
- ShortCircuitedGeometryVisitor.cpp \
- SineStarFactory.cpp \
- GeometryCombiner.cpp \
- LinearComponentExtracter.cpp \
- PointExtracter.cpp \
- PolygonExtracter.cpp \
- Densifier.cpp
diff --git a/src/geomgraph/Makefile.am b/src/geomgraph/Makefile.am
deleted file mode 100644
index b1f3849..0000000
--- a/src/geomgraph/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS = index
-
-noinst_LTLIBRARIES = libgeomgraph.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libgeomgraph_la_SOURCES = \
- Depth.cpp \
- DirectedEdge.cpp \
- DirectedEdgeStar.cpp \
- Edge.cpp \
- EdgeEnd.cpp \
- EdgeEndStar.cpp \
- EdgeIntersectionList.cpp \
- EdgeNodingValidator.cpp \
- EdgeList.cpp \
- EdgeRing.cpp \
- GeometryGraph.cpp \
- GraphComponent.cpp \
- Label.cpp \
- Node.cpp \
- NodeFactory.cpp \
- NodeMap.cpp \
- PlanarGraph.cpp \
- TopologyLocation.cpp
-
-libgeomgraph_la_LIBADD = index/libgeomgraphindex.la
diff --git a/src/geomgraph/index/Makefile.am b/src/geomgraph/index/Makefile.am
deleted file mode 100644
index d86e948..0000000
--- a/src/geomgraph/index/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-noinst_LTLIBRARIES = libgeomgraphindex.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libgeomgraphindex_la_SOURCES = \
- MonotoneChainEdge.cpp \
- MonotoneChainIndexer.cpp \
- SegmentIntersector.cpp \
- SimpleEdgeSetIntersector.cpp \
- SimpleMCSweepLineIntersector.cpp \
- SimpleSweepLineIntersector.cpp \
- SweepLineEvent.cpp \
- SweepLineSegment.cpp
diff --git a/src/index/Makefile.am b/src/index/Makefile.am
deleted file mode 100644
index 0bde872..0000000
--- a/src/index/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS = \
- bintree \
- kdtree \
- chain \
- intervalrtree \
- quadtree \
- strtree \
- sweepline
-
-noinst_LTLIBRARIES = libindex.la
-
-libindex_la_SOURCES =
-
-libindex_la_LIBADD = \
- bintree/libindexbintree.la \
- kdtree/libindexkdtree.la \
- chain/libindexchain.la \
- intervalrtree/libintervalrtree.la \
- quadtree/libindexquadtree.la \
- strtree/libindexstrtree.la \
- sweepline/libindexsweepline.la
diff --git a/src/index/bintree/Makefile.am b/src/index/bintree/Makefile.am
deleted file mode 100644
index 7364e0e..0000000
--- a/src/index/bintree/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-noinst_LTLIBRARIES = libindexbintree.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libindexbintree_la_SOURCES = \
- Bintree.cpp \
- Interval.cpp \
- Node.cpp \
- Key.cpp \
- NodeBase.cpp \
- Root.cpp
-
-libindexbintree_la_LIBADD =
diff --git a/src/index/chain/Makefile.am b/src/index/chain/Makefile.am
deleted file mode 100644
index c865161..0000000
--- a/src/index/chain/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-noinst_LTLIBRARIES = libindexchain.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libindexchain_la_SOURCES = \
- MonotoneChain.cpp \
- MonotoneChainBuilder.cpp \
- MonotoneChainOverlapAction.cpp \
- MonotoneChainSelectAction.cpp
diff --git a/src/index/intervalrtree/Makefile.am b/src/index/intervalrtree/Makefile.am
deleted file mode 100644
index 4437fbd..0000000
--- a/src/index/intervalrtree/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-noinst_LTLIBRARIES = libintervalrtree.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libintervalrtree_la_SOURCES = \
- IntervalRTreeBranchNode.cpp \
- IntervalRTreeLeafNode.cpp \
- SortedPackedIntervalRTree.cpp
diff --git a/src/index/kdtree/Makefile.am b/src/index/kdtree/Makefile.am
deleted file mode 100644
index 52a8eff..0000000
--- a/src/index/kdtree/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-noinst_LTLIBRARIES = libindexkdtree.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libindexkdtree_la_SOURCES = \
- KdTree.cpp \
- KdNode.cpp
-
-libindexkdtree_la_LIBADD =
diff --git a/src/index/quadtree/Makefile.am b/src/index/quadtree/Makefile.am
deleted file mode 100644
index 98d5123..0000000
--- a/src/index/quadtree/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-noinst_LTLIBRARIES = libindexquadtree.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libindexquadtree_la_SOURCES = \
- IntervalSize.cpp \
- Quadtree.cpp \
- Key.cpp \
- Node.cpp \
- NodeBase.cpp \
- Root.cpp
diff --git a/src/index/strtree/Makefile.am b/src/index/strtree/Makefile.am
deleted file mode 100644
index 335b673..0000000
--- a/src/index/strtree/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-noinst_LTLIBRARIES = libindexstrtree.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libindexstrtree_la_SOURCES = \
- AbstractSTRtree.cpp \
- BoundablePair.cpp \
- EnvelopeUtil.cpp \
- GeometryItemDistance.cpp \
- Interval.cpp \
- SIRtree.cpp \
- STRtree.cpp \
- SimpleSTRtree.cpp \
- SimpleSTRnode.cpp \
- SimpleSTRdistance.cpp
-
-libindexstrtree_la_LIBADD =
diff --git a/src/index/sweepline/Makefile.am b/src/index/sweepline/Makefile.am
deleted file mode 100644
index ce83db0..0000000
--- a/src/index/sweepline/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-noinst_LTLIBRARIES = libindexsweepline.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libindexsweepline_la_SOURCES = \
- SweepLineEvent.cpp \
- SweepLineIndex.cpp \
- SweepLineInterval.cpp
-
-libindexsweepline_la_LIBADD =
diff --git a/src/io/Makefile.am b/src/io/Makefile.am
deleted file mode 100644
index 9b81f6f..0000000
--- a/src/io/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-
-noinst_LTLIBRARIES = libio.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src/deps
-
-libio_la_SOURCES = \
- ParseException.cpp \
- StringTokenizer.cpp \
- ByteOrderDataInStream.cpp \
- ByteOrderValues.cpp \
- WKTReader.cpp \
- WKTWriter.cpp \
- WKBReader.cpp \
- WKBWriter.cpp \
- Writer.cpp \
- Unload.cpp \
- CLocalizer.cpp
-
-libio_la_LIBADD =
diff --git a/src/linearref/Makefile.am b/src/linearref/Makefile.am
deleted file mode 100644
index a2ea79a..0000000
--- a/src/linearref/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-noinst_LTLIBRARIES = liblinearref.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-liblinearref_la_SOURCES = \
- ExtractLineByLocation.cpp \
- LengthIndexedLine.cpp \
- LengthIndexOfPoint.cpp \
- LengthLocationMap.cpp \
- LinearIterator.cpp \
- LinearGeometryBuilder.cpp \
- LinearLocation.cpp \
- LocationIndexOfLine.cpp \
- LocationIndexOfPoint.cpp
-
-# Deprecated files
-# (http://geos.osgeo.org/pipermail/geos-devel/2006-March/001828.html):
-#NonRobustLineIntersector.cpp
-#RobustLineIntersector.cpp
diff --git a/src/math/Makefile.am b/src/math/Makefile.am
deleted file mode 100644
index c30e97e..0000000
--- a/src/math/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-noinst_LTLIBRARIES = libmath.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libmath_la_SOURCES = \
- DD.cpp
-
-libmath_la_LIBADD =
diff --git a/src/noding/Makefile.am b/src/noding/Makefile.am
deleted file mode 100644
index 24ce4ed..0000000
--- a/src/noding/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS = \
- snapround \
- snap
-
-noinst_LTLIBRARIES = libnoding.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libnoding_la_SOURCES = \
- BasicSegmentString.cpp \
- FastNodingValidator.cpp \
- FastSegmentSetIntersectionFinder.cpp \
- GeometryNoder.cpp \
- IntersectionAdder.cpp \
- IntersectionFinderAdder.cpp \
- IteratedNoder.cpp \
- MCIndexNoder.cpp \
- MCIndexSegmentSetMutualIntersector.cpp \
- NodedSegmentString.cpp \
- NodingValidator.cpp \
- Octant.cpp \
- OrientedCoordinateArray.cpp \
- ScaledNoder.cpp \
- SegmentIntersectionDetector.cpp \
- SegmentNode.cpp \
- SegmentNodeList.cpp \
- SegmentString.cpp \
- SegmentStringUtil.cpp \
- SimpleNoder.cpp \
- NodingIntersectionFinder.cpp \
- ValidatingNoder.cpp
-
-libnoding_la_LIBADD = \
- snapround/libsnapround.la \
- snap/libsnap.la
diff --git a/src/noding/snap/Makefile.am b/src/noding/snap/Makefile.am
deleted file mode 100644
index b3734fb..0000000
--- a/src/noding/snap/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-noinst_LTLIBRARIES = libsnap.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libsnap_la_SOURCES = \
- SnappingIntersectionAdder.cpp \
- SnappingNoder.cpp \
- SnappingPointIndex.cpp
-
-libsnap_la_LIBADD =
diff --git a/src/noding/snapround/Makefile.am b/src/noding/snapround/Makefile.am
deleted file mode 100644
index 2672ba4..0000000
--- a/src/noding/snapround/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-noinst_LTLIBRARIES = libsnapround.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libsnapround_la_SOURCES = \
- HotPixel.cpp \
- HotPixelIndex.cpp \
- MCIndexPointSnapper.cpp \
- MCIndexSnapRounder.cpp \
- SnapRoundingNoder.cpp \
- SnapRoundingIntersectionAdder.cpp
-
-libsnapround_la_LIBADD =
diff --git a/src/operation/Makefile.am b/src/operation/Makefile.am
deleted file mode 100644
index 2810ba3..0000000
--- a/src/operation/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS = \
- buffer \
- distance \
- intersection \
- linemerge \
- overlay \
- overlayng \
- polygonize \
- predicate \
- relate \
- union \
- sharedpaths \
- valid
-
-noinst_LTLIBRARIES = liboperation.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-liboperation_la_SOURCES = \
- GeometryGraphOperation.cpp \
- IsSimpleOp.cpp
-
-liboperation_la_LIBADD = \
- buffer/libopbuffer.la \
- distance/libopdistance.la \
- intersection/libopintersection.la \
- linemerge/liboplinemerge.la \
- overlay/libopoverlay.la \
- overlayng/libopoverlayng.la \
- polygonize/liboppolygonize.la \
- predicate/liboppredicate.la \
- relate/liboprelate.la \
- union/libopunion.la \
- valid/libopvalid.la \
- sharedpaths/libopsharedpaths.la
diff --git a/src/operation/buffer/Makefile.am b/src/operation/buffer/Makefile.am
deleted file mode 100644
index 42ddbb3..0000000
--- a/src/operation/buffer/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-noinst_LTLIBRARIES = libopbuffer.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libopbuffer_la_SOURCES = \
- BufferBuilder.cpp \
- BufferInputLineSimplifier.cpp \
- BufferOp.cpp \
- BufferParameters.cpp \
- BufferSubgraph.cpp \
- OffsetCurveBuilder.cpp \
- OffsetCurveSetBuilder.cpp \
- OffsetSegmentGenerator.cpp \
- RightmostEdgeFinder.cpp \
- SubgraphDepthLocater.cpp \
- $(NULL)
-
-libopbuffer_la_LIBADD =
diff --git a/src/operation/distance/Makefile.am b/src/operation/distance/Makefile.am
deleted file mode 100644
index e84bfa4..0000000
--- a/src/operation/distance/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-noinst_LTLIBRARIES = libopdistance.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libopdistance_la_SOURCES = \
- ConnectedElementLocationFilter.cpp \
- ConnectedElementPointFilter.cpp \
- DistanceOp.cpp \
- IndexedFacetDistance.cpp \
- FacetSequence.cpp \
- FacetSequenceTreeBuilder.cpp \
- GeometryLocation.cpp
-
-libopdistance_la_LIBADD =
diff --git a/src/operation/intersection/Makefile.am b/src/operation/intersection/Makefile.am
deleted file mode 100644
index 53863d2..0000000
--- a/src/operation/intersection/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-noinst_LTLIBRARIES = libopintersection.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libopintersection_la_SOURCES = \
- Rectangle.cpp \
- RectangleIntersection.cpp \
- RectangleIntersectionBuilder.cpp
-
-libopintersection_la_LIBADD =
diff --git a/src/operation/linemerge/Makefile.am b/src/operation/linemerge/Makefile.am
deleted file mode 100644
index 7765e1a..0000000
--- a/src/operation/linemerge/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-noinst_LTLIBRARIES = liboplinemerge.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-liboplinemerge_la_SOURCES = \
- EdgeString.cpp \
- LineMergeDirectedEdge.cpp \
- LineMergeEdge.cpp \
- LineMergeGraph.cpp \
- LineMerger.cpp \
- LineSequencer.cpp
-
-liboplinemerge_la_LIBADD =
diff --git a/src/operation/overlay/Makefile.am b/src/operation/overlay/Makefile.am
deleted file mode 100644
index bbe3223..0000000
--- a/src/operation/overlay/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-
-AUTOMAKE_OPTIONS = subdir-objects
-
-SUBDIRS =
-
-noinst_LTLIBRARIES = libopoverlay.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libopoverlay_la_SOURCES = \
- EdgeSetNoder.cpp \
- ElevationMatrixCell.cpp \
- ElevationMatrix.cpp \
- LineBuilder.cpp \
- MaximalEdgeRing.cpp \
- MinimalEdgeRing.cpp \
- OverlayNodeFactory.cpp \
- OverlayOp.cpp \
- PointBuilder.cpp \
- PolygonBuilder.cpp \
- snap/GeometrySnapper.cpp \
- snap/LineStringSnapper.cpp \
- snap/SnapOverlayOp.cpp \
- snap/SnapIfNeededOverlayOp.cpp \
- validate/FuzzyPointLocator.cpp \
- validate/OffsetPointGenerator.cpp \
- validate/OverlayResultValidator.cpp
-
-libopoverlay_la_LIBADD =
diff --git a/src/operation/overlayng/Makefile.am b/src/operation/overlayng/Makefile.am
deleted file mode 100644
index ee52fbc..0000000
--- a/src/operation/overlayng/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-
-noinst_LTLIBRARIES = libopoverlayng.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libopoverlayng_la_SOURCES = \
- Edge.cpp \
- EdgeKey.cpp \
- EdgeMerger.cpp \
- EdgeNodingBuilder.cpp \
- EdgeSourceInfo.cpp \
- ElevationModel.cpp \
- IndexedPointOnLineLocator.cpp \
- InputGeometry.cpp \
- IntersectionPointBuilder.cpp \
- LineBuilder.cpp \
- LineLimiter.cpp \
- MaximalEdgeRing.cpp \
- OverlayEdge.cpp \
- OverlayEdgeRing.cpp \
- OverlayGraph.cpp \
- OverlayLabel.cpp \
- OverlayLabeller.cpp \
- OverlayMixedPoints.cpp \
- OverlayPoints.cpp \
- OverlayNG.cpp \
- OverlayNGRobust.cpp \
- OverlayUtil.cpp \
- PolygonBuilder.cpp \
- PrecisionReducer.cpp \
- PrecisionUtil.cpp \
- RingClipper.cpp \
- RobustClipEnvelopeComputer.cpp \
- UnaryUnionNG.cpp
-
-
-libopoverlayng_la_LIBADD =
diff --git a/src/operation/polygonize/Makefile.am b/src/operation/polygonize/Makefile.am
deleted file mode 100644
index dbbfa9f..0000000
--- a/src/operation/polygonize/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-noinst_LTLIBRARIES = liboppolygonize.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-liboppolygonize_la_SOURCES = \
- PolygonizeDirectedEdge.cpp \
- PolygonizeEdge.cpp \
- PolygonizeGraph.cpp \
- Polygonizer.cpp \
- HoleAssigner.cpp \
- BuildArea.cpp \
- EdgeRing.cpp
-
-liboppolygonize_la_LIBADD =
diff --git a/src/operation/predicate/Makefile.am b/src/operation/predicate/Makefile.am
deleted file mode 100644
index 4f1a3b1..0000000
--- a/src/operation/predicate/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-#prefix=@prefix@
-#top_srcdir=@top_srcdir@
-
-noinst_LTLIBRARIES = liboppredicate.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-liboppredicate_la_SOURCES = \
- RectangleIntersects.cpp \
- RectangleContains.cpp \
- SegmentIntersectionTester.cpp
-
-liboppredicate_la_LIBADD =
diff --git a/src/operation/relate/Makefile.am b/src/operation/relate/Makefile.am
deleted file mode 100644
index 639a9b5..0000000
--- a/src/operation/relate/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-noinst_LTLIBRARIES = liboprelate.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-liboprelate_la_SOURCES = \
- EdgeEndBuilder.cpp \
- EdgeEndBundle.cpp \
- EdgeEndBundleStar.cpp \
- RelateComputer.cpp \
- RelateNode.cpp \
- RelateNodeFactory.cpp \
- RelateNodeGraph.cpp \
- RelateOp.cpp
-
-liboprelate_la_LIBADD =
diff --git a/src/operation/sharedpaths/Makefile.am b/src/operation/sharedpaths/Makefile.am
deleted file mode 100644
index e6f8861..0000000
--- a/src/operation/sharedpaths/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-noinst_LTLIBRARIES = libopsharedpaths.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libopsharedpaths_la_SOURCES = \
- SharedPathsOp.cpp
diff --git a/src/operation/union/Makefile.am b/src/operation/union/Makefile.am
deleted file mode 100644
index 76b2caa..0000000
--- a/src/operation/union/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-noinst_LTLIBRARIES = libopunion.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libopunion_la_SOURCES = \
- CascadedPolygonUnion.cpp \
- CascadedUnion.cpp \
- OverlapUnion.cpp \
- CoverageUnion.cpp \
- PointGeometryUnion.cpp \
- UnaryUnionOp.cpp
-
-libopunion_la_LIBADD =
diff --git a/src/operation/valid/Makefile.am b/src/operation/valid/Makefile.am
deleted file mode 100644
index e5523fe..0000000
--- a/src/operation/valid/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-noinst_LTLIBRARIES = libopvalid.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-# NOTES:
-# <incomplete>
-#
-
-libopvalid_la_SOURCES = \
- ConnectedInteriorTester.cpp \
- ConsistentAreaTester.cpp \
- IsValidOp.cpp \
- QuadtreeNestedRingTester.cpp \
- RepeatedPointRemover.cpp \
- RepeatedPointTester.cpp \
- SimpleNestedRingTester.cpp \
- SweeplineNestedRingTester.cpp \
- TopologyValidationError.cpp \
- IndexedNestedRingTester.cpp \
- IndexedNestedRingTester.h \
- IndexedNestedShellTester.cpp \
- MakeValid.cpp
-
-libopvalid_la_LIBADD =
diff --git a/src/planargraph/Makefile.am b/src/planargraph/Makefile.am
deleted file mode 100644
index 4a514d0..0000000
--- a/src/planargraph/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-
-AUTOMAKE_OPTIONS = subdir-objects
-
-SUBDIRS =
-
-noinst_LTLIBRARIES = libplanargraph.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libplanargraph_la_SOURCES = \
- DirectedEdge.cpp \
- DirectedEdgeStar.cpp \
- Edge.cpp \
- Node.cpp \
- NodeMap.cpp \
- PlanarGraph.cpp \
- Subgraph.cpp \
- algorithm/ConnectedSubgraphFinder.cpp
-
-libplanargraph_la_LIBADD =
diff --git a/src/precision/Makefile.am b/src/precision/Makefile.am
deleted file mode 100644
index 152936f..0000000
--- a/src/precision/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-noinst_LTLIBRARIES = libprecision.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libprecision_la_SOURCES = \
- CommonBits.cpp \
- CommonBitsOp.cpp \
- CommonBitsRemover.cpp \
- EnhancedPrecisionOp.cpp \
- GeometryPrecisionReducer.cpp \
- MinimumClearance.cpp \
- PrecisionReducerCoordinateOperation.cpp \
- SimpleGeometryPrecisionReducer.cpp
-
-libprecision_la_LIBADD =
diff --git a/src/shape/Makefile.am b/src/shape/Makefile.am
deleted file mode 100644
index 8bdb8aa..0000000
--- a/src/shape/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS = \
- fractal
-
-noinst_LTLIBRARIES = libshape.la
-
-libshape_la_SOURCES =
-
-libshape_la_LIBADD = \
- fractal/libshapefractal.la
diff --git a/src/shape/fractal/Makefile.am b/src/shape/fractal/Makefile.am
deleted file mode 100644
index 4dfa260..0000000
--- a/src/shape/fractal/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-noinst_LTLIBRARIES = libshapefractal.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libshapefractal_la_SOURCES = \
- HilbertCode.cpp \
- HilbertEncoder.cpp \
- MortonCode.cpp
-
-libshapefractal_la_LIBADD =
diff --git a/src/simplify/Makefile.am b/src/simplify/Makefile.am
deleted file mode 100644
index 4821b90..0000000
--- a/src/simplify/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-noinst_LTLIBRARIES = libsimplify.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libsimplify_la_SOURCES = \
- DouglasPeuckerLineSimplifier.cpp \
- DouglasPeuckerSimplifier.cpp \
- LineSegmentIndex.cpp \
- TaggedLineSegment.cpp \
- TaggedLineString.cpp \
- TaggedLineStringSimplifier.cpp \
- TaggedLinesSimplifier.cpp \
- TopologyPreservingSimplifier.cpp
-
-libsimplify_la_LIBADD =
diff --git a/src/triangulate/Makefile.am b/src/triangulate/Makefile.am
deleted file mode 100644
index 3d82002..0000000
--- a/src/triangulate/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS = \
- quadedge
-
-noinst_LTLIBRARIES = libtriangulate.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libtriangulate_la_SOURCES = \
- IncrementalDelaunayTriangulator.cpp \
- DelaunayTriangulationBuilder.cpp \
- VoronoiDiagramBuilder.cpp
-
-libtriangulate_la_LIBADD = \
- quadedge/libquadedge.la
diff --git a/src/triangulate/quadedge/Makefile.am b/src/triangulate/quadedge/Makefile.am
deleted file mode 100644
index c58199f..0000000
--- a/src/triangulate/quadedge/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-noinst_LTLIBRARIES = libquadedge.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libquadedge_la_SOURCES = \
- QuadEdge.cpp \
- Vertex.cpp \
- TrianglePredicate.cpp \
- QuadEdgeSubdivision.cpp \
- LastFoundQuadEdgeLocator.cpp \
- LocateFailureException.cpp
-
-libquadedge_la_LIBADD =
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
deleted file mode 100644
index c4fbdd1..0000000
--- a/src/util/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS =
-
-noinst_LTLIBRARIES = libutil.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-libutil_la_SOURCES = \
- Assert.cpp \
- GeometricShapeFactory.cpp \
- Interrupt.cpp \
- math.cpp \
- Profiler.cpp
-
-libutil_la_LIBADD =
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index 9f5e00e..0000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS = \
- bigtest \
- xmltester \
- unit \
- geostest \
- thread
-
-EXTRA_DIST = CMakeLists.txt
diff --git a/tests/bigtest/Makefile.am b/tests/bigtest/Makefile.am
deleted file mode 100644
index bc9eae2..0000000
--- a/tests/bigtest/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-prefix=@prefix@
-top_srcdir=@top_srcdir@
-top_builddir=@top_builddir@
-
-check_PROGRAMS = TestSweepLineSpeed
-
-LIBS = $(top_builddir)/src/libgeos.la
-# -lmpatrol -lbfd -lintl -liberty -limagehlp
-
-TestSweepLineSpeed_SOURCES = TestSweepLineSpeed.cpp GeometryTestFactory.cpp bigtest.h
-TestSweepLineSpeed_LDADD = $(LIBS)
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-EXTRA_DIST = CMakeLists.txt
-
diff --git a/tests/geostest/Makefile.am b/tests/geostest/Makefile.am
deleted file mode 100644
index 55d159c..0000000
--- a/tests/geostest/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi
-
-EXTRA_DIST = \
- brokengrammar \
- test.wkt \
- test.expected \
- testrunner.sh
-
-# TODO: Enable if sample input WKT file is provided
-#TESTS = geostest
-
-check_PROGRAMS = geostest
-
-# The -lstdc++ is needed for --disable-shared to work
-geostest_SOURCES = geostest.c
-geostest_LDADD = $(top_builddir)/capi/libgeos_c.la -lstdc++
diff --git a/tests/thread/Makefile.am b/tests/thread/Makefile.am
deleted file mode 100644
index 8fc2ea7..0000000
--- a/tests/thread/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi
-
-# TODO: Enable if sample input WKT file is provided
-#TESTS = threadtest badthreadtest
-
-check_PROGRAMS = threadtest badthreadtest
-
-
-# The -lstdc++ is needed for --disable-shared to work
-threadtest_SOURCES = threadtest.c
-threadtest_LDADD = $(top_builddir)/capi/libgeos_c.la -lpthread -lstdc++
-
-# The -lstdc++ is needed for --disable-shared to work
-badthreadtest_SOURCES = badthreadtest.c
-badthreadtest_LDADD = $(top_builddir)/capi/libgeos_c.la -lpthread -lstdc++
diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
deleted file mode 100644
index 9a6a818..0000000
--- a/tests/unit/Makefile.am
+++ /dev/null
@@ -1,239 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-
-AUTOMAKE_OPTIONS = subdir-objects
-
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi
-
-TESTS = geos_unit
-
-EXTRA_DIST = \
- tut/tut_assert.hpp \
- tut/tut_config.hpp \
- tut/tut_console_reporter.hpp \
- tut/tut_cppunit_reporter.hpp \
- tut/tut_exception.hpp \
- tut/tut_fpt.hpp \
- tut/tut.hpp \
- tut/tut_macros.hpp \
- tut/tut_main.hpp \
- tut/tut_posix.hpp \
- tut/tut_reporter.hpp \
- tut/tut_restartable.hpp \
- tut/tut_result.hpp \
- tut/tut_runner.hpp \
- tut/tut_xml_reporter.hpp \
- util/NodingTestUtil.h \
- capi/capi_test_utils.h \
- CMakeLists.txt
-
-
-#noinst_PROGRAMS = geos_unit
-check_PROGRAMS = geos_unit
-#bin_PROGRAMS = geos_tut
-
-geos_unit_LDADD = \
- $(top_builddir)/src/libgeos.la \
- $(top_builddir)/capi/libgeos_c.la \
- $(NULL)
-
-
-geos_unit_SOURCES = \
- geos_unit.cpp \
- algorithm/AngleTest.cpp \
- algorithm/AreaTest.cpp \
- algorithm/CGAlgorithms/computeOrientationTest.cpp \
- algorithm/CGAlgorithms/OrientationIsCCWTest.cpp \
- algorithm/CGAlgorithms/isPointInRingTest.cpp \
- algorithm/CGAlgorithms/signedAreaTest.cpp \
- algorithm/ConvexHullTest.cpp \
- algorithm/construct/LargestEmptyCircleTest.cpp \
- algorithm/construct/MaximumInscribedCircleTest.cpp \
- algorithm/distance/DiscreteFrechetDistanceTest.cpp \
- algorithm/distance/DiscreteHausdorffDistanceTest.cpp \
- algorithm/InteriorPointAreaTest.cpp \
- algorithm/IntersectionTest.cpp \
- algorithm/LengthTest.cpp \
- algorithm/LocatePointInRingTest.cpp \
- algorithm/MinimumBoundingCircleTest.cpp \
- algorithm/MinimumDiameterTest.cpp \
- algorithm/OrientationIndexFailureTest.cpp \
- algorithm/PointLocatorTest.cpp \
- algorithm/RobustLineIntersectionTest.cpp \
- algorithm/RobustLineIntersectorTest.cpp \
- algorithm/RobustLineIntersectorZTest.cpp \
- capi/GEOSBufferTest.cpp \
- capi/GEOSBuildAreaTest.cpp \
- capi/GEOSCAPIDefinesTest.cpp \
- capi/GEOSClipByRectTest.cpp \
- capi/GEOSContainsTest.cpp \
- capi/GEOSConvexHullTest.cpp \
- capi/GEOSCoordSeqTest.cpp \
- capi/GEOSCoverageUnionTest.cpp \
- capi/GEOSDelaunayTriangulationTest.cpp \
- capi/GEOSDifferenceTest.cpp \
- capi/GEOSDifferencePrecTest.cpp \
- capi/GEOSDistanceTest.cpp \
- capi/GEOSEqualsTest.cpp \
- capi/GEOSFrechetDistanceTest.cpp \
- capi/GEOSGeom_createCollectionTest.cpp \
- capi/GEOSGeom_createPolygonTest.cpp \
- capi/GEOSGeom_createLineStringTest.cpp \
- capi/GEOSGeom_createTest.cpp \
- capi/GEOSGeom_extentTest.cpp \
- capi/GEOSGeom_extractUniquePointsTest.cpp \
- capi/GEOSGeomFromWKBTest.cpp \
- capi/GEOSGeom_setPrecisionTest.cpp \
- capi/GEOSGeomToWKTTest.cpp \
- capi/GEOSGetCentroidTest.cpp \
- capi/GEOSHausdorffDistanceTest.cpp \
- capi/GEOSInterpolateTest.cpp \
- capi/GEOSInterruptTest.cpp \
- capi/GEOSIntersectionTest.cpp \
- capi/GEOSIntersectionPrecTest.cpp \
- capi/GEOSIntersectsTest.cpp \
- capi/GEOSisClosedTest.cpp \
- capi/GEOSisValidDetailTest.cpp \
- capi/GEOSLineString_PointTest.cpp \
- capi/GEOSMakeValidTest.cpp \
- capi/GEOSMaximumInscribedCircleTest.cpp \
- capi/GEOSMinimumBoundingCircleTest.cpp \
- capi/GEOSMinimumClearanceTest.cpp \
- capi/GEOSMinimumRectangleTest.cpp \
- capi/GEOSMinimumWidthTest.cpp \
- capi/GEOSNearestPointsTest.cpp \
- capi/GEOSNodeTest.cpp \
- capi/GEOSOffsetCurveTest.cpp \
- capi/GEOSOrientationIndexTest.cpp \
- capi/GEOSPointOnSurfaceTest.cpp \
- capi/GEOSPolygonizeTest.cpp \
- capi/GEOSPreparedDistanceTest.cpp \
- capi/GEOSPreparedGeometryTest.cpp \
- capi/GEOSPreparedNearestPointsTest.cpp \
- capi/GEOSProjectTest.cpp \
- capi/GEOSRelateBoundaryNodeRuleTest.cpp \
- capi/GEOSRelatePatternMatchTest.cpp \
- capi/GEOSReverseTest.cpp \
- capi/GEOSSegmentIntersectionTest.cpp \
- capi/GEOSSharedPathsTest.cpp \
- capi/GEOSSimplifyTest.cpp \
- capi/GEOSSnapTest.cpp \
- capi/GEOSSTRtreeTest.cpp \
- capi/GEOSUnionTest.cpp \
- capi/GEOSUnionPrecTest.cpp \
- capi/GEOSUnaryUnionTest.cpp \
- capi/GEOSUserDataTest.cpp \
- capi/GEOSVoronoiDiagramTest.cpp \
- capi/GEOSWithinTest.cpp \
- edgegraph/EdgeGraphTest.cpp \
- geom/CoordinateArraySequenceFactoryTest.cpp \
- geom/CoordinateArraySequenceTest.cpp \
- geom/CoordinateListTest.cpp \
- geom/CoordinateTest.cpp \
- geom/DimensionTest.cpp \
- geom/EnvelopeTest.cpp \
- geom/FixedSizeCoordinateSequenceTest.cpp \
- geom/Geometry/cloneTest.cpp \
- geom/GeometryCollectionTest.cpp \
- geom/GeometryComponentFilterTest.cpp \
- geom/Geometry/coversTest.cpp \
- geom/Geometry/equalsTest.cpp \
- geom/GeometryFactoryTest.cpp \
- geom/GeometryFilterTest.cpp \
- geom/Geometry/isRectangleTest.cpp \
- geom/Geometry/normalizeTest.cpp \
- geom/Geometry/touchesTest.cpp \
- geom/IntersectionMatrixTest.cpp \
- geom/LinearRingTest.cpp \
- geom/LineSegmentTest.cpp \
- geom/LineStringTest.cpp \
- geom/LocationTest.cpp \
- geom/MultiLineStringTest.cpp \
- geom/MultiPointTest.cpp \
- geom/MultiPolygonTest.cpp \
- geom/PointTest.cpp \
- geom/PolygonTest.cpp \
- geom/PrecisionModelTest.cpp \
- geom/prep/PreparedGeometryFactoryTest.cpp \
- geom/prep/PreparedGeometry/touchesTest.cpp \
- geom/TriangleTest.cpp \
- geom/util/GeometryExtracterTest.cpp \
- index/strtree/SIRtreeTest.cpp \
- index/strtree/SimpleSTRtreeTest.cpp \
- index/kdtree/KdTreeTest.cpp \
- io/ByteOrderValuesTest.cpp \
- io/WKBReaderTest.cpp \
- io/WKBWriterTest.cpp \
- io/WKTReaderTest.cpp \
- io/WKTWriterTest.cpp \
- io/WriterTest.cpp \
- linearref/LengthIndexedLineTest.cpp \
- math/DDTest.cpp \
- noding/BasicSegmentStringTest.cpp \
- noding/NodedSegmentStringTest.cpp \
- noding/OrientedCoordinateArrayTest.cpp \
- noding/SegmentNodeTest.cpp \
- noding/SegmentPointComparatorTest.cpp \
- noding/snapround/HotPixelTest.cpp \
- noding/snapround/MCIndexSnapRounderTest.cpp \
- noding/snapround/SnapRoundingNoderTest.cpp \
- noding/snap/SnappingNoderTest.cpp \
- operation/buffer/BufferBuilderTest.cpp \
- operation/buffer/BufferOpTest.cpp \
- operation/buffer/BufferParametersTest.cpp \
- operation/distance/DistanceOpTest.cpp \
- operation/distance/IndexedFacetDistanceTest.cpp \
- operation/geounion/CascadedPolygonUnionTest.cpp \
- operation/geounion/CoverageUnionTest.cpp \
- operation/geounion/UnaryUnionOpTest.cpp \
- operation/intersection/RectangleIntersectionTest.cpp \
- operation/IsSimpleOpTest.cpp \
- operation/linemerge/LineMergerTest.cpp \
- operation/linemerge/LineSequencerTest.cpp \
- operation/overlay/OverlayOpUnionTest.cpp \
- operation/overlay/snap/GeometrySnapperTest.cpp \
- operation/overlay/snap/LineStringSnapperTest.cpp \
- operation/overlay/validate/FuzzyPointLocatorTest.cpp \
- operation/overlay/validate/OffsetPointGeneratorTest.cpp \
- operation/overlay/validate/OverlayResultValidatorTest.cpp \
- operation/overlayng/ElevationModelTest.cpp \
- operation/overlayng/RingClipperTest.cpp \
- operation/overlayng/LineLimiterTest.cpp \
- operation/overlayng/OverlayGraphTest.cpp \
- operation/overlayng/OverlayNGFloatingNoderTest.cpp \
- operation/overlayng/OverlayNGMixedPointsTest.cpp \
- operation/overlayng/OverlayNGPointsTest.cpp \
- operation/overlayng/OverlayNGRobustTest.cpp \
- operation/overlayng/OverlayNGSnappingNoderTest.cpp \
- operation/overlayng/OverlayNGSnappingOneTest.cpp \
- operation/overlayng/OverlayNGStrictModeTest.cpp \
- operation/overlayng/OverlayNGTest.cpp \
- operation/overlayng/OverlayNGZTest.cpp \
- operation/overlayng/PrecisionReducerTest.cpp \
- operation/overlayng/PrecisionUtilTest.cpp \
- operation/overlayng/UnaryUnionNGTest.cpp \
- operation/polygonize/PolygonizeTest.cpp \
- operation/sharedpaths/SharedPathsOpTest.cpp \
- operation/valid/IsValidOpTest.cpp \
- operation/valid/MakeValidTest.cpp \
- operation/valid/RepeatedPointRemoverTest.cpp \
- operation/valid/ValidClosedRingTest.cpp \
- operation/valid/ValidSelfTouchingRingFormingHoleTest.cpp \
- precision/CommonBitsTest.cpp \
- precision/GeometryPrecisionReducerTest.cpp \
- precision/SimpleGeometryPrecisionReducerTest.cpp \
- simplify/DouglasPeuckerSimplifierTest.cpp \
- simplify/TopologyPreservingSimplifierTest.cpp \
- triangulate/DelaunayTest.cpp \
- triangulate/quadedge/QuadEdgeSubdivisionTest.cpp \
- triangulate/quadedge/QuadEdgeTest.cpp \
- triangulate/quadedge/VertexTest.cpp \
- triangulate/VoronoiTest.cpp \
- shape/fractal/HilbertCodeTest.cpp \
- shape/fractal/MortonCodeTest.cpp \
- util/NodingTestUtil.cpp \
- util/UniqueCoordinateArrayFilterTest.cpp
-
-noinst_HEADERS = \
- utility.h
diff --git a/tests/xmltester/Makefile.am b/tests/xmltester/Makefile.am
deleted file mode 100644
index 4a13513..0000000
--- a/tests/xmltester/Makefile.am
+++ /dev/null
@@ -1,221 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-#prefix=@prefix@
-#top_srcdir=@top_srcdir@
-#top_builddir=@top_builddir@
-
-AUTOMAKE_OPTIONS = subdir-objects
-
-TESTS = testrunner
-
-CLEANFILES = testrunner
-
-EXTRA_DIST = testrunner.sh CMakeLists.txt
-
-SAFE_XMLTESTS= \
- $(srcdir)/tests/general/TestBoundary.xml \
- $(srcdir)/tests/general/TestBuffer.xml \
- $(srcdir)/tests/general/TestBufferMitredJoin.xml \
- $(srcdir)/tests/general/TestCentroid.xml \
- $(srcdir)/tests/general/TestConvexHull-big.xml \
- $(srcdir)/tests/general/TestConvexHull.xml \
- $(srcdir)/tests/general/TestDistance.xml \
- $(srcdir)/tests/general/TestDensify.xml \
- $(srcdir)/tests/general/TestEqualsExact.xml \
- $(srcdir)/tests/general/TestInteriorPoint.xml \
- $(srcdir)/tests/general/TestIntersectsPL.xml \
- $(srcdir)/tests/general/TestMinimumClearance.xml \
- $(srcdir)/tests/general/TestNGOverlayA.xml \
- $(srcdir)/tests/general/TestNGOverlayAPrec.xml \
- $(srcdir)/tests/general/TestNGOverlayEmpty.xml \
- $(srcdir)/tests/general/TestNGOverlayL.xml \
- $(srcdir)/tests/general/TestNGOverlayLPrec.xml \
- $(srcdir)/tests/general/TestNGOverlayP.xml \
- $(srcdir)/tests/general/TestNGOverlayPPrec.xml \
- $(srcdir)/tests/general/TestOverlayAA.xml \
- $(srcdir)/tests/general/TestOverlayPLPrec.xml \
- $(srcdir)/tests/general/TestOverlayLLPrec.xml \
- $(srcdir)/tests/general/TestOverlayLL.xml \
- $(srcdir)/tests/general/TestOverlayLA.xml \
- $(srcdir)/tests/general/TestOverlayAAPrec.xml \
- $(srcdir)/tests/general/TestOverlayPL.xml \
- $(srcdir)/tests/general/TestOverlayPA.xml \
- $(srcdir)/tests/general/TestOverlayEmpty.xml \
- $(srcdir)/tests/general/TestOverlayPP.xml \
- $(srcdir)/tests/general/TestOverlayLAPrec.xml \
- $(srcdir)/tests/general/TestPreparedIntersectsPL.xml \
- $(srcdir)/tests/general/TestPreparedPointPredicate.xml \
- $(srcdir)/tests/general/TestPreparedPolygonPredicate.xml \
- $(srcdir)/tests/general/TestPreparedPredicatesWithGeometryCollection.xml \
- $(srcdir)/tests/general/TestRectanglePredicate.xml \
- $(srcdir)/tests/general/TestRelateAA.xml \
- $(srcdir)/tests/general/TestRelateAC.xml \
- $(srcdir)/tests/general/TestRelateLA.xml \
- $(srcdir)/tests/general/TestRelateLC.xml \
- $(srcdir)/tests/general/TestRelateLL.xml \
- $(srcdir)/tests/general/TestRelatePA.xml \
- $(srcdir)/tests/general/TestRelatePL.xml \
- $(srcdir)/tests/general/TestRelatePP.xml \
- $(srcdir)/tests/general/TestSimple.xml \
- $(srcdir)/tests/general/TestUnaryUnion.xml \
- $(srcdir)/tests/general/TestUnaryUnionFloating.xml \
- $(srcdir)/tests/general/TestValid.xml \
- $(srcdir)/tests/general/TestValid2-big.xml \
- $(srcdir)/tests/general/TestValid2.xml \
- $(srcdir)/tests/general/TestWithinDistance.xml \
- $(srcdir)/tests/misc/Buffer-1.xml \
- $(srcdir)/tests/misc/Buffer-2.xml \
- $(srcdir)/tests/misc/InvalidRelates.xml \
- $(srcdir)/tests/misc/Segfaults.xml \
- $(srcdir)/tests/misc/TestBufferExternal-1.xml \
- $(srcdir)/tests/misc/TestBufferExternal-2.xml \
- $(srcdir)/tests/misc/TestIsValid.xml \
- $(srcdir)/tests/misc/buildarea.xml \
- $(srcdir)/tests/misc/fme.xml \
- $(srcdir)/tests/misc/heisenbugs.xml \
- $(srcdir)/tests/misc/hexwkb.xml \
- $(srcdir)/tests/misc/hole_from_shell.xml \
- $(srcdir)/tests/misc/hole_red.xml \
- $(srcdir)/tests/misc/linemerge.xml \
- $(srcdir)/tests/misc/makevalid.xml \
- $(srcdir)/tests/misc/robustness.xml \
- $(srcdir)/tests/misc/safe-16595.xml \
- $(srcdir)/tests/misc/safe-16596.xml \
- $(srcdir)/tests/misc/safe-TestBufferJagged.xml \
- $(srcdir)/tests/misc/singlesidedbuffer.xml \
- $(srcdir)/tests/misc/stmlf-20061020-invalid-output.xml \
- $(srcdir)/tests/misc/stmlf-20061020.xml \
- $(srcdir)/tests/misc/stmlf-20070119.xml \
- $(srcdir)/tests/misc/split.xml \
- $(srcdir)/tests/robust/TestRobustOverlayFixed.xml \
- $(srcdir)/tests/robust/TestRobustRelate.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-misc-5.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-1034.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-153.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-234.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-275.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-350.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-358.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-360.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-368.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-392-lines.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-392.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-398.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-459.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-488.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-522.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-527.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-586.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-599.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-600-lines.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-615.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-737.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-837.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-838.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-979.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-994.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-997-union-fail.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-997-union-slow.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-1046-union-lines.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-1051.xml
- $(srcdir)/tests/robust/overlay/TestOverlay-geos-list.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-gisse-345341-lines.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-isochrone.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-jts-300.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-misc-1.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-misc-2.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-misc-3.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-misc-4.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-misc-5.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-osmwater.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-pg-4182-2.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-pg-4538.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-pg-list.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-qgis-29400.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-qgis-31552.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-qgis-37032.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-rsf-794.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-shapely-829.xml \
- $(srcdir)/tests/robust/overlay/TestOverlay-stmlf.xml \
- $(srcdir)/tests/issue/issue-geos-176.xml \
- $(srcdir)/tests/issue/issue-geos-188.xml \
- $(srcdir)/tests/issue/issue-geos-234.xml \
- $(srcdir)/tests/issue/issue-geos-244.xml \
- $(srcdir)/tests/issue/issue-geos-275.xml \
- $(srcdir)/tests/issue/issue-geos-350.xml \
- $(srcdir)/tests/issue/issue-geos-356.xml \
- $(srcdir)/tests/issue/issue-geos-358.xml \
- $(srcdir)/tests/issue/issue-geos-360.xml \
- $(srcdir)/tests/issue/issue-geos-366.xml \
- $(srcdir)/tests/issue/issue-geos-392.xml \
- $(srcdir)/tests/issue/issue-geos-398.xml \
- $(srcdir)/tests/issue/issue-geos-434.xml \
- $(srcdir)/tests/issue/issue-geos-459.xml \
- $(srcdir)/tests/issue/issue-geos-488.xml \
- $(srcdir)/tests/issue/issue-geos-527.xml \
- $(srcdir)/tests/issue/issue-geos-569.xml \
- $(srcdir)/tests/issue/issue-geos-582.xml \
- $(srcdir)/tests/issue/issue-geos-586.xml \
- $(srcdir)/tests/issue/issue-geos-599.xml \
- $(srcdir)/tests/issue/issue-geos-605.xml \
- $(srcdir)/tests/issue/issue-geos-615.xml \
- $(srcdir)/tests/issue/issue-geos-716.xml \
- $(srcdir)/tests/issue/issue-geos-837.xml \
- $(srcdir)/tests/issue/issue-geos-838.xml \
- $(srcdir)/tests/issue/issue-geos-990.xml \
- $(srcdir)/tests/issue/issue-geos-994.xml \
- $(srcdir)/tests/issue/issue-geos-1018.xml \
- $(srcdir)/tests/issue/issue-geos-1085.xml \
- $(srcdir)/tests/validate/TestRelateAA-big.xml \
- $(srcdir)/tests/validate/TestRelateAA.xml \
- $(srcdir)/tests/validate/TestRelateAC.xml \
- $(srcdir)/tests/validate/TestRelateLA.xml \
- $(srcdir)/tests/validate/TestRelateLC.xml \
- $(srcdir)/tests/validate/TestRelateLL.xml \
- $(srcdir)/tests/validate/TestRelatePA.xml \
- $(srcdir)/tests/validate/TestRelatePL.xml \
- $(srcdir)/tests/validate/TestRelatePP.xml
-
-INVALID_OUTPUT_XMLTESTS =
-
-FAILING_XMLTESTS = \
- $(srcdir)/tests/failure/robust-overlay-stmlf-failures.xml \
- $(srcdir)/tests/failure/issue-geos-344.xml \
- $(srcdir)/tests/failure/misc-TestBigNastyBuffer.xml \
- $(srcdir)/tests/failure/misc-TestSameDirection.xml \
- $(srcdir)/tests/failure/robust-TestRobustRelateFloat.xml
-
-
-XMLTESTS=$(SAFE_XMLTESTS) $(INVALID_OUTPUT_XMLTESTS) $(FAILING_XMLTESTS)
-
-EXTRA_DIST += $(XMLTESTS)
-
-noinst_PROGRAMS = SimpleWKTTester XMLTester
-
-LIBS = $(top_builddir)/src/libgeos.la
-
-SimpleWKTTester_SOURCES = SimpleWKTTester.cpp
-SimpleWKTTester_LDADD = $(LIBS)
-
-XMLTester_SOURCES = \
- XMLTester.cpp \
- XMLTester.h \
- tinyxml2/tinyxml2.h \
- tinyxml2/tinyxml2.cpp \
- BufferResultMatcher.h \
- BufferResultMatcher.cpp \
- SingleSidedBufferResultMatcher.h \
- SingleSidedBufferResultMatcher.cpp
-
-XMLTester_LDADD = $(LIBS)
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/src/io/tinyxml -DTIXML_USE_STL
-
-static:
- $(CXX) $(CXXFLAGS) -I../include -o staticXMLTester XMLTester.cpp MarkupSTL.o ../../src/geom/.libs/libgeos.a
-
-testrunner: testrunner.sh Makefile
- @sh $(srcdir)/testrunner.sh $@ --test-valid-output $(SAFE_XMLTESTS)
-
diff --git a/tools/Makefile.am b/tools/Makefile.am
deleted file mode 100644
index d76ba31..0000000
--- a/tools/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-bin_SCRIPTS = geos-config
-
-EXTRA_DIST = \
- CMakeLists.txt \
- geos-config.cmake \
- geos.pc.cmake
-
-SUBDIRS = astyle
diff --git a/tools/astyle/Makefile.am b/tools/astyle/Makefile.am
deleted file mode 100644
index 30ec858..0000000
--- a/tools/astyle/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-
-AUTOMAKE_OPTIONS = subdir-objects
-
-AM_CPPFLAGS =
-
-EXTRA_DIST = \
- CMakeLists.txt
-
-noinst_PROGRAMS = astyle
-
-astyle_SOURCES = \
- ASBeautifier.cpp \
- ASEnhancer.cpp \
- ASFormatter.cpp \
- ASLocalizer.cpp \
- ASResource.cpp \
- astyle_main.cpp
-
-
-noinst_HEADERS = \
- ASLocalizer.h \
- astyle.h \
- astyle_main.h
diff --git a/tools/ci/berrie.sh b/tools/ci/berrie.sh
index ecd8fe8..42b75fe 100644
--- a/tools/ci/berrie.sh
+++ b/tools/ci/berrie.sh
@@ -8,24 +8,12 @@
# the terms of the GNU Lesser General Public Licence as published
# by the Free Software Foundation.
# See the COPYING file for more information.
-#
-# auto tools
-if false; then
- sh autogen.sh
- ./configure
- make
- make check
-fi
-
-# cmake
-if true; then
- rm -rf build
- mkdir -p build
- cd build
- cmake ../
- make
- [ -f CMakeCache.txt ] && \
- ctest --output-on-failure . || \
- make check
-fi
+rm -rf build
+mkdir -p build
+cd build
+cmake ../
+make
+[ -f CMakeCache.txt ] && \
+ctest --output-on-failure . || \
+make check
diff --git a/tools/ci/berrie64.sh b/tools/ci/berrie64.sh
index 0d3fa39..b7dcfbc 100644
--- a/tools/ci/berrie64.sh
+++ b/tools/ci/berrie64.sh
@@ -9,24 +9,12 @@
# the terms of the GNU Lesser General Public Licence as published
# by the Free Software Foundation.
# See the COPYING file for more information.
-#
-# auto tools
-if false; then
- sh autogen.sh
- ./configure
- make
- make check
-fi
-
-# cmake
-if true; then
- rm -rf build
- mkdir -p build
- cd build
- cmake ../
- make
- [ -f CMakeCache.txt ] && \
- ctest --output-on-failure . || \
- make check
-fi
+rm -rf build
+mkdir -p build
+cd build
+cmake ../
+make
+[ -f CMakeCache.txt ] && \
+ctest --output-on-failure . || \
+make check
diff --git a/tools/ci/bessie.sh b/tools/ci/bessie.sh
index 502f60f..4f97ae3 100755
--- a/tools/ci/bessie.sh
+++ b/tools/ci/bessie.sh
@@ -8,24 +8,12 @@
# the terms of the GNU Lesser General Public Licence as published
# by the Free Software Foundation.
# See the COPYING file for more information.
-#
-# auto tools
-if false; then
- sh autogen.sh
- ./configure
- make
- make check
-fi
-
-# cmake
-if true; then
- rm -rf build
- mkdir -p build
- cd build
- cmake ../
- make
- [ -f CMakeCache.txt ] && \
- ctest --output-on-failure . || \
- make check
-fi
+rm -rf build
+mkdir -p build
+cd build
+cmake ../
+make
+[ -f CMakeCache.txt ] && \
+ctest --output-on-failure . || \
+make check
diff --git a/tools/ci/bessie32.sh b/tools/ci/bessie32.sh
index 193034d..acca9a7 100755
--- a/tools/ci/bessie32.sh
+++ b/tools/ci/bessie32.sh
@@ -8,24 +8,12 @@
# the terms of the GNU Lesser General Public Licence as published
# by the Free Software Foundation.
# See the COPYING file for more information.
-#
-# auto tools
-if false; then
- sh autogen.sh
- ./configure
- make
- make check
-fi
-
-# cmake
-if true; then
- rm -rf build
- mkdir -p build
- cd build
- cmake ../
- make
- [ -f CMakeCache.txt ] && \
- ctest --output-on-failure . || \
- make check
-fi
+rm -rf build
+mkdir -p build
+cd build
+cmake ../
+make
+[ -f CMakeCache.txt ] && \
+ctest --output-on-failure . || \
+make check
diff --git a/tools/ci/script.sh b/tools/ci/script.sh
index 78a5318..5b9e75d 100755
--- a/tools/ci/script.sh
+++ b/tools/ci/script.sh
@@ -24,4 +24,4 @@ mkdir -p ${builddir}
cd ${builddir}
# build and run tests
-${TRAVIS_BUILD_DIR}/tools/ci/script_${GEOS_BUILD_TOOL}.sh
+${TRAVIS_BUILD_DIR}/tools/ci/script_cmake.sh
diff --git a/tools/ci/script_autotools.sh b/tools/ci/script_autotools.sh
deleted file mode 100755
index b8b1cd8..0000000
--- a/tools/ci/script_autotools.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# Travis CI script for GEOS build with GNU Autotools
-#
-# Copyright (C) 2013 Mateusz Loskot <mateusz at loskot.net>
-#
-# This is free software; you can redistribute and/or modify it under
-# the terms of the GNU Lesser General Public Licence as published
-# by the Free Software Foundation.
-# See the COPYING file for more information.
-#
-
-if [ -z "${TRAVIS_BUILD_DIR+x}" ]; then
- echo TRAVIS_BUILD_DIR not defined
- exit 1
-fi
-
-# source common functions
-. ${TRAVIS_BUILD_DIR}/tools/ci/common.sh
-
-cd ${TRAVIS_BUILD_DIR}
-./autogen.sh
-cd -
-${TRAVIS_BUILD_DIR}/configure
-run_make
-make check
-make distcheck
diff --git a/tools/ci/script_autotools_scanbuild.sh b/tools/ci/script_autotools_scanbuild.sh
deleted file mode 100755
index 5cd40d8..0000000
--- a/tools/ci/script_autotools_scanbuild.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# Travis CI script for GEOS build with GNU Autotools
-#
-# Copyright (C) 2013 Mateusz Loskot <mateusz at loskot.net>
-#
-# This is free software; you can redistribute and/or modify it under
-# the terms of the GNU Lesser General Public Licence as published
-# by the Free Software Foundation.
-# See the COPYING file for more information.
-#
-
-if [ -z "${TRAVIS_BUILD_DIR+x}" ]; then
- echo TRAVIS_BUILD_DIR not defined
- exit 1
-fi
-
-# source common functions
-. ${TRAVIS_BUILD_DIR}/tools/ci/common.sh
-
-cd ${TRAVIS_BUILD_DIR}
-./autogen.sh
-cd -
-scan-build ${TRAVIS_BUILD_DIR}/configure CC=clang-9 CXX=clang++-9 CXXFLAGS="-std=c++11"
-scan-build --keep-cc --status-bugs make -j2
diff --git a/util/Makefile.am b/util/Makefile.am
deleted file mode 100644
index cd08508..0000000
--- a/util/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-SUBDIRS = \
- geosop
-
-
-LIBS = $(top_builddir)/src/libgeos.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-EXTRA_DIST = CMakeLists.txt
diff --git a/util/geosop/Makefile.am b/util/geosop/Makefile.am
deleted file mode 100644
index 38bca5d..0000000
--- a/util/geosop/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
-#
-prefix=@prefix@
-top_srcdir=@top_srcdir@
-top_builddir=@top_builddir@
-
-noinst_PROGRAMS = geosop
-
-geosop_SOURCES = \
- GeosOp.cpp \
- GeosOp.h \
- cxxopts.hpp \
- GeomFunction.cpp \
- GeomFunction.h \
- WKBStreamReader.cpp \
- WKBStreamReader.h \
- WKTStreamReader.cpp \
- WKTStreamReader.h
-
-geosop_LDADD = $(top_builddir)/src/libgeos.la
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-EXTRA_DIST = CMakeLists.txt
-----------------------------------------------------------------------
Summary of changes:
.drone-1.0.yml | 5 +-
.github/workflows/ci.yml | 41 +-
.gitlab-ci.yml | 7 +-
.travis.yml | 42 --
CMakeLists.txt | 5 +
HOWTO_RELEASE | 5 +-
Makefile.am | 79 --
acsite.m4 | 55 --
autogen.sh | 96 ---
benchmarks/Makefile.am | 17 -
benchmarks/algorithm/Makefile.am | 25 -
benchmarks/capi/Makefile.am | 30 -
benchmarks/operation/Makefile.am | 9 -
benchmarks/operation/buffer/Makefile.am | 17 -
benchmarks/operation/predicate/Makefile.am | 17 -
capi/Makefile.am | 33 -
configure.ac | 434 -----------
doc/Makefile.am | 26 -
include/Makefile.am | 10 -
include/geos/Makefile.am | 37 -
include/geos/algorithm/Makefile.am | 41 -
include/geos/algorithm/construct/Makefile.am | 12 -
include/geos/algorithm/distance/Makefile.am | 14 -
include/geos/algorithm/locate/Makefile.am | 13 -
include/geos/edgegraph/Makefile.am | 11 -
include/geos/geom/Makefile.am | 54 --
include/geos/geom/prep/Makefile.am | 26 -
include/geos/geom/util/Makefile.am | 23 -
include/geos/geomgraph/Makefile.am | 34 -
include/geos/geomgraph/index/Makefile.am | 22 -
include/geos/index/Makefile.am | 19 -
include/geos/index/bintree/Makefile.am | 17 -
include/geos/index/chain/Makefile.am | 14 -
include/geos/index/intervalrtree/Makefile.am | 14 -
include/geos/index/kdtree/Makefile.am | 15 -
include/geos/index/quadtree/Makefile.am | 16 -
include/geos/index/strtree/Makefile.am | 24 -
include/geos/index/sweepline/Makefile.am | 14 -
include/geos/io/Makefile.am | 23 -
include/geos/linearref/Makefile.am | 18 -
include/geos/math/Makefile.am | 11 -
include/geos/noding/Makefile.am | 45 --
include/geos/noding/snap/Makefile.am | 13 -
include/geos/noding/snapround/Makefile.am | 17 -
include/geos/operation/Makefile.am | 24 -
include/geos/operation/buffer/Makefile.am | 21 -
include/geos/operation/distance/Makefile.am | 17 -
include/geos/operation/intersection/Makefile.am | 13 -
include/geos/operation/linemerge/Makefile.am | 16 -
include/geos/operation/overlay/Makefile.am | 24 -
include/geos/operation/overlay/snap/Makefile.am | 14 -
include/geos/operation/overlayng/Makefile.am | 42 --
include/geos/operation/polygonize/Makefile.am | 17 -
include/geos/operation/predicate/Makefile.am | 13 -
include/geos/operation/relate/Makefile.am | 18 -
include/geos/operation/sharedpaths/Makefile.am | 11 -
include/geos/operation/union/Makefile.am | 18 -
include/geos/operation/valid/Makefile.am | 21 -
include/geos/planargraph/Makefile.am | 18 -
include/geos/planargraph/algorithm/Makefile.am | 11 -
include/geos/precision/Makefile.am | 18 -
include/geos/shape/Makefile.am | 11 -
include/geos/shape/fractal/Makefile.am | 13 -
include/geos/simplify/Makefile.am | 18 -
include/geos/triangulate/Makefile.am | 14 -
include/geos/triangulate/quadedge/Makefile.am | 19 -
include/geos/util/Makefile.am | 23 -
macros/Makefile.am | 8 -
macros/ax_check_compile_flag.m4 | 74 --
macros/ax_cxx_compile_stdcxx.m4 | 948 ------------------------
macros/ax_cxx_compile_stdcxx_11.m4 | 39 -
macros/boost.m4 | 490 ------------
macros/geos.m4 | 93 ---
src/Makefile.am | 56 --
src/algorithm/Makefile.am | 41 -
src/algorithm/construct/Makefile.am | 14 -
src/algorithm/distance/Makefile.am | 15 -
src/algorithm/locate/Makefile.am | 15 -
src/deps/Makefile.am | 18 -
src/deps/ryu/Makefile.am | 19 -
src/edgegraph/Makefile.am | 12 -
src/geom/Makefile.am | 44 --
src/geom/prep/Makefile.am | 29 -
src/geom/util/Makefile.am | 19 -
src/geomgraph/Makefile.am | 30 -
src/geomgraph/index/Makefile.am | 16 -
src/index/Makefile.am | 24 -
src/index/bintree/Makefile.am | 16 -
src/index/chain/Makefile.am | 12 -
src/index/intervalrtree/Makefile.am | 11 -
src/index/kdtree/Makefile.am | 12 -
src/index/quadtree/Makefile.am | 14 -
src/index/strtree/Makefile.am | 20 -
src/index/sweepline/Makefile.am | 13 -
src/io/Makefile.am | 22 -
src/linearref/Makefile.am | 22 -
src/math/Makefile.am | 13 -
src/noding/Makefile.am | 38 -
src/noding/snap/Makefile.am | 15 -
src/noding/snapround/Makefile.am | 18 -
src/operation/Makefile.am | 38 -
src/operation/buffer/Makefile.am | 23 -
src/operation/distance/Makefile.am | 19 -
src/operation/intersection/Makefile.am | 15 -
src/operation/linemerge/Makefile.am | 18 -
src/operation/overlay/Makefile.am | 32 -
src/operation/overlayng/Makefile.am | 40 -
src/operation/polygonize/Makefile.am | 19 -
src/operation/predicate/Makefile.am | 16 -
src/operation/relate/Makefile.am | 20 -
src/operation/sharedpaths/Makefile.am | 11 -
src/operation/union/Makefile.am | 18 -
src/operation/valid/Makefile.am | 29 -
src/planargraph/Makefile.am | 23 -
src/precision/Makefile.am | 20 -
src/shape/Makefile.am | 12 -
src/shape/fractal/Makefile.am | 13 -
src/simplify/Makefile.am | 20 -
src/triangulate/Makefile.am | 17 -
src/triangulate/quadedge/Makefile.am | 18 -
src/util/Makefile.am | 17 -
tests/Makefile.am | 11 -
tests/bigtest/Makefile.am | 19 -
tests/geostest/Makefile.am | 19 -
tests/thread/Makefile.am | 18 -
tests/unit/Makefile.am | 239 ------
tests/xmltester/CMakeLists.txt | 5 +
tests/xmltester/Makefile.am | 221 ------
tools/Makefile.am | 10 -
tools/astyle/Makefile.am | 26 -
tools/ci/berrie.sh | 28 +-
tools/ci/berrie64.sh | 28 +-
tools/ci/bessie.sh | 28 +-
tools/ci/bessie32.sh | 28 +-
tools/ci/script.sh | 2 +-
tools/ci/script_autotools.sh | 27 -
tools/ci/script_autotools_scanbuild.sh | 25 -
util/Makefile.am | 12 -
util/geosop/Makefile.am | 25 -
139 files changed, 64 insertions(+), 5289 deletions(-)
delete mode 100644 Makefile.am
delete mode 100644 acsite.m4
delete mode 100755 autogen.sh
delete mode 100644 benchmarks/Makefile.am
delete mode 100644 benchmarks/algorithm/Makefile.am
delete mode 100644 benchmarks/capi/Makefile.am
delete mode 100644 benchmarks/operation/Makefile.am
delete mode 100644 benchmarks/operation/buffer/Makefile.am
delete mode 100644 benchmarks/operation/predicate/Makefile.am
delete mode 100644 capi/Makefile.am
delete mode 100644 configure.ac
delete mode 100644 doc/Makefile.am
delete mode 100644 include/Makefile.am
delete mode 100644 include/geos/Makefile.am
delete mode 100644 include/geos/algorithm/Makefile.am
delete mode 100644 include/geos/algorithm/construct/Makefile.am
delete mode 100644 include/geos/algorithm/distance/Makefile.am
delete mode 100644 include/geos/algorithm/locate/Makefile.am
delete mode 100644 include/geos/edgegraph/Makefile.am
delete mode 100644 include/geos/geom/Makefile.am
delete mode 100644 include/geos/geom/prep/Makefile.am
delete mode 100644 include/geos/geom/util/Makefile.am
delete mode 100644 include/geos/geomgraph/Makefile.am
delete mode 100644 include/geos/geomgraph/index/Makefile.am
delete mode 100644 include/geos/index/Makefile.am
delete mode 100644 include/geos/index/bintree/Makefile.am
delete mode 100644 include/geos/index/chain/Makefile.am
delete mode 100644 include/geos/index/intervalrtree/Makefile.am
delete mode 100644 include/geos/index/kdtree/Makefile.am
delete mode 100644 include/geos/index/quadtree/Makefile.am
delete mode 100644 include/geos/index/strtree/Makefile.am
delete mode 100644 include/geos/index/sweepline/Makefile.am
delete mode 100644 include/geos/io/Makefile.am
delete mode 100644 include/geos/linearref/Makefile.am
delete mode 100644 include/geos/math/Makefile.am
delete mode 100644 include/geos/noding/Makefile.am
delete mode 100644 include/geos/noding/snap/Makefile.am
delete mode 100644 include/geos/noding/snapround/Makefile.am
delete mode 100644 include/geos/operation/Makefile.am
delete mode 100644 include/geos/operation/buffer/Makefile.am
delete mode 100644 include/geos/operation/distance/Makefile.am
delete mode 100644 include/geos/operation/intersection/Makefile.am
delete mode 100644 include/geos/operation/linemerge/Makefile.am
delete mode 100644 include/geos/operation/overlay/Makefile.am
delete mode 100644 include/geos/operation/overlay/snap/Makefile.am
delete mode 100644 include/geos/operation/overlayng/Makefile.am
delete mode 100644 include/geos/operation/polygonize/Makefile.am
delete mode 100644 include/geos/operation/predicate/Makefile.am
delete mode 100644 include/geos/operation/relate/Makefile.am
delete mode 100644 include/geos/operation/sharedpaths/Makefile.am
delete mode 100644 include/geos/operation/union/Makefile.am
delete mode 100644 include/geos/operation/valid/Makefile.am
delete mode 100644 include/geos/planargraph/Makefile.am
delete mode 100644 include/geos/planargraph/algorithm/Makefile.am
delete mode 100644 include/geos/precision/Makefile.am
delete mode 100644 include/geos/shape/Makefile.am
delete mode 100644 include/geos/shape/fractal/Makefile.am
delete mode 100644 include/geos/simplify/Makefile.am
delete mode 100644 include/geos/triangulate/Makefile.am
delete mode 100644 include/geos/triangulate/quadedge/Makefile.am
delete mode 100644 include/geos/util/Makefile.am
delete mode 100644 macros/Makefile.am
delete mode 100755 macros/ax_check_compile_flag.m4
delete mode 100755 macros/ax_cxx_compile_stdcxx.m4
delete mode 100755 macros/ax_cxx_compile_stdcxx_11.m4
delete mode 100644 macros/boost.m4
delete mode 100644 macros/geos.m4
delete mode 100644 src/Makefile.am
delete mode 100644 src/algorithm/Makefile.am
delete mode 100644 src/algorithm/construct/Makefile.am
delete mode 100644 src/algorithm/distance/Makefile.am
delete mode 100644 src/algorithm/locate/Makefile.am
delete mode 100644 src/deps/Makefile.am
delete mode 100644 src/deps/ryu/Makefile.am
delete mode 100644 src/edgegraph/Makefile.am
delete mode 100644 src/geom/Makefile.am
delete mode 100644 src/geom/prep/Makefile.am
delete mode 100644 src/geom/util/Makefile.am
delete mode 100644 src/geomgraph/Makefile.am
delete mode 100644 src/geomgraph/index/Makefile.am
delete mode 100644 src/index/Makefile.am
delete mode 100644 src/index/bintree/Makefile.am
delete mode 100644 src/index/chain/Makefile.am
delete mode 100644 src/index/intervalrtree/Makefile.am
delete mode 100644 src/index/kdtree/Makefile.am
delete mode 100644 src/index/quadtree/Makefile.am
delete mode 100644 src/index/strtree/Makefile.am
delete mode 100644 src/index/sweepline/Makefile.am
delete mode 100644 src/io/Makefile.am
delete mode 100644 src/linearref/Makefile.am
delete mode 100644 src/math/Makefile.am
delete mode 100644 src/noding/Makefile.am
delete mode 100644 src/noding/snap/Makefile.am
delete mode 100644 src/noding/snapround/Makefile.am
delete mode 100644 src/operation/Makefile.am
delete mode 100644 src/operation/buffer/Makefile.am
delete mode 100644 src/operation/distance/Makefile.am
delete mode 100644 src/operation/intersection/Makefile.am
delete mode 100644 src/operation/linemerge/Makefile.am
delete mode 100644 src/operation/overlay/Makefile.am
delete mode 100644 src/operation/overlayng/Makefile.am
delete mode 100644 src/operation/polygonize/Makefile.am
delete mode 100644 src/operation/predicate/Makefile.am
delete mode 100644 src/operation/relate/Makefile.am
delete mode 100644 src/operation/sharedpaths/Makefile.am
delete mode 100644 src/operation/union/Makefile.am
delete mode 100644 src/operation/valid/Makefile.am
delete mode 100644 src/planargraph/Makefile.am
delete mode 100644 src/precision/Makefile.am
delete mode 100644 src/shape/Makefile.am
delete mode 100644 src/shape/fractal/Makefile.am
delete mode 100644 src/simplify/Makefile.am
delete mode 100644 src/triangulate/Makefile.am
delete mode 100644 src/triangulate/quadedge/Makefile.am
delete mode 100644 src/util/Makefile.am
delete mode 100644 tests/Makefile.am
delete mode 100644 tests/bigtest/Makefile.am
delete mode 100644 tests/geostest/Makefile.am
delete mode 100644 tests/thread/Makefile.am
delete mode 100644 tests/unit/Makefile.am
delete mode 100644 tests/xmltester/Makefile.am
delete mode 100644 tools/Makefile.am
delete mode 100644 tools/astyle/Makefile.am
delete mode 100755 tools/ci/script_autotools.sh
delete mode 100755 tools/ci/script_autotools_scanbuild.sh
delete mode 100644 util/Makefile.am
delete mode 100644 util/geosop/Makefile.am
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list