[geos-commits] [SCM] GEOS branch master updated. d4b4def27b34dd8811af7cbee7b74f2f902217f7

[git at osgeo.org]

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  d4b4def27b34dd8811af7cbee7b74f2f902217f7 (commit)
      from  8d02a094bc8e3b661bf9bb0a9b0a648f0a73a362 (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 d4b4def27b34dd8811af7cbee7b74f2f902217f7
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu Feb 14 15:35:40 2019 -0800

    Remove vestigial references to io/markup

diff --git a/src/io/Makefile.am b/src/io/Makefile.am
index a45ea4e..a94cb10 100644
--- a/src/io/Makefile.am
+++ b/src/io/Makefile.am
@@ -1,11 +1,10 @@
 #
-# This file is part of project GEOS (http://trac.osgeo.org/geos/) 
+# This file is part of project GEOS (http://trac.osgeo.org/geos/)
 #
-#SUBDIRS = markup
 
 noinst_LTLIBRARIES = libio.la
 
-AM_CPPFLAGS = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 libio_la_SOURCES = \
 	ParseException.cpp \
@@ -20,4 +19,4 @@ libio_la_SOURCES = \
 	Unload.cpp \
 	CLocalizer.cpp
 
-libio_la_LIBADD = 
+libio_la_LIBADD =
diff --git a/tests/bigtest/CMakeLists.txt b/tests/bigtest/CMakeLists.txt
index 9734b38..d4e25fa 100644
--- a/tests/bigtest/CMakeLists.txt
+++ b/tests/bigtest/CMakeLists.txt
@@ -17,7 +17,6 @@ set(STATUS_RESULT "OFF")
 if(GEOS_ENABLE_TESTS)
 
   include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/io/markup)
 
   add_executable(test_bug234 bug234.cpp)
 
diff --git a/tests/bigtest/Makefile.am b/tests/bigtest/Makefile.am
index a502df3..b06e4e0 100644
--- a/tests/bigtest/Makefile.am
+++ b/tests/bigtest/Makefile.am
@@ -1,5 +1,5 @@
 #
-# This file is part of project GEOS (http://trac.osgeo.org/geos/) 
+# This file is part of project GEOS (http://trac.osgeo.org/geos/)
 #
 prefix=@prefix@
 top_srcdir=@top_srcdir@
@@ -18,7 +18,6 @@ bug234_SOURCES = bug234.cpp
 bug234_LDADD = $(LIBS)
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/src/io/markup
 
 EXTRA_DIST = CMakeLists.txt
 
diff --git a/tests/perf/operation/buffer/CMakeLists.txt b/tests/perf/operation/buffer/CMakeLists.txt
index da2840a..57d2bd4 100644
--- a/tests/perf/operation/buffer/CMakeLists.txt
+++ b/tests/perf/operation/buffer/CMakeLists.txt
@@ -11,8 +11,6 @@
 #
 #################################################################################
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/io/markup)
-
 add_executable(perf_iterated_buffer IteratedBufferStressTest.cpp)
 
 target_link_libraries(perf_iterated_buffer geos)
diff --git a/tests/perf/operation/buffer/Makefile.am b/tests/perf/operation/buffer/Makefile.am
index 8f1574e..f270b5f 100644
--- a/tests/perf/operation/buffer/Makefile.am
+++ b/tests/perf/operation/buffer/Makefile.am
@@ -13,6 +13,5 @@ IteratedBufferStressTest_SOURCES = IteratedBufferStressTest.cpp
 IteratedBufferStressTest_LDADD = $(LIBS)
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/src/io/markup
 
 EXTRA_DIST = CMakeLists.txt
diff --git a/tests/perf/operation/predicate/CMakeLists.txt b/tests/perf/operation/predicate/CMakeLists.txt
index 71e9f51..4260149 100644
--- a/tests/perf/operation/predicate/CMakeLists.txt
+++ b/tests/perf/operation/predicate/CMakeLists.txt
@@ -11,7 +11,6 @@
 #
 #################################################################################
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/io/markup)
 
 add_executable(perf_rectangle_intersects RectangleIntersectsPerfTest.cpp)
 
diff --git a/tests/perf/operation/predicate/Makefile.am b/tests/perf/operation/predicate/Makefile.am
index 4c7cd20..621456e 100644
--- a/tests/perf/operation/predicate/Makefile.am
+++ b/tests/perf/operation/predicate/Makefile.am
@@ -13,6 +13,5 @@ RectangleIntersectsPerfTest_SOURCES = RectangleIntersectsPerfTest.cpp
 RectangleIntersectsPerfTest_LDADD = $(LIBS)
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/src/io/markup
 
 EXTRA_DIST = CMakeLists.txt

-----------------------------------------------------------------------

Summary of changes:
 src/io/Makefile.am                            | 7 +++----
 tests/bigtest/CMakeLists.txt                  | 1 -
 tests/bigtest/Makefile.am                     | 3 +--
 tests/perf/operation/buffer/CMakeLists.txt    | 2 --
 tests/perf/operation/buffer/Makefile.am       | 1 -
 tests/perf/operation/predicate/CMakeLists.txt | 1 -
 tests/perf/operation/predicate/Makefile.am    | 1 -
 7 files changed, 4 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
GEOS