Description: Rename INCLUDES to AM_CPPFLAGS.
Author: Bas Couwenberg <sebastic@xs4all.nl>
Applied-Upstream: http://trac.osgeo.org/geos/changeset/3973, http://trac.osgeo.org/geos/changeset/3974
--- a/capi/Makefile.am
+++ b/capi/Makefile.am
@@ -6,7 +6,7 @@ top_srcdir=@top_srcdir@
 GEOS_CAPI_VERSION="@VERSION@-CAPI-@CAPI_VERSION@"
 GEOS_JTS_PORT="@JTS_PORT@"
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 capidir = $(includedir)
 
@@ -21,7 +21,7 @@ DIR_SOURCES = \
     $(NULL)
 
 libgeos_c_la_SOURCES = $(DIR_SOURCES)
-libgeos_c_la_CPPFLAGS = -DGEOS_CAPI_VERSION='$(GEOS_CAPI_VERSION)' -DGEOS_JTS_PORT='$(GEOS_JTS_PORT)'
+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@ \
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -12,7 +12,7 @@ LIBS = $(top_builddir)/src/libgeos.la
 example_SOURCES = example.cpp 
 example_LDADD = $(LIBS)
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 DOXYGEN = doxygen
 
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,7 @@ SUBDIRS = \
 
 EXTRA_DIST = Makefile.vc dirlist.mk CMakeLists.txt info.plist.in
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = libgeos.la
 
--- a/src/algorithm/Makefile.am
+++ b/src/algorithm/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS = \
 
 noinst_LTLIBRARIES = libalgorithm.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libalgorithm_la_SOURCES = \
     Angle.cpp \
--- a/src/algorithm/distance/Makefile.am
+++ b/src/algorithm/distance/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS =
 
 noinst_LTLIBRARIES = libdistance.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libdistance_la_SOURCES = \
     DiscreteHausdorffDistance.cpp \
--- a/src/algorithm/locate/Makefile.am
+++ b/src/algorithm/locate/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS =
 
 noinst_LTLIBRARIES = liblocation.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 liblocation_la_SOURCES = \
 	IndexedPointInAreaLocator.cpp \
--- a/src/geom/Makefile.am
+++ b/src/geom/Makefile.am
@@ -8,7 +8,7 @@ SUBDIRS=\
 noinst_LTLIBRARIES = \
     libgeom.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libgeom_la_SOURCES = \
     Coordinate.cpp \
--- a/src/geom/prep/Makefile.am
+++ b/src/geom/prep/Makefile.am
@@ -3,7 +3,7 @@
 #
 noinst_LTLIBRARIES = libgeomprep.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 ## these are full inlined
 # PolygonExtracter.cpp 
--- a/src/geom/util/Makefile.am
+++ b/src/geom/util/Makefile.am
@@ -3,7 +3,7 @@
 #
 noinst_LTLIBRARIES = libgeomutil.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libgeomutil_la_SOURCES = \
     ComponentCoordinateExtracter.cpp \
--- a/src/geomgraph/Makefile.am
+++ b/src/geomgraph/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = index
 
 noinst_LTLIBRARIES = libgeomgraph.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libgeomgraph_la_SOURCES = \
 	Depth.cpp \
--- a/src/geomgraph/index/Makefile.am
+++ b/src/geomgraph/index/Makefile.am
@@ -3,7 +3,7 @@
 #
 noinst_LTLIBRARIES = libgeomgraphindex.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libgeomgraphindex_la_SOURCES = \
     MonotoneChainEdge.cpp \
--- a/src/index/bintree/Makefile.am
+++ b/src/index/bintree/Makefile.am
@@ -3,7 +3,7 @@
 #
 noinst_LTLIBRARIES = libindexbintree.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libindexbintree_la_SOURCES = \
     Bintree.cpp \
--- a/src/index/chain/Makefile.am
+++ b/src/index/chain/Makefile.am
@@ -3,7 +3,7 @@
 #
 noinst_LTLIBRARIES = libindexchain.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libindexchain_la_SOURCES = \
 	MonotoneChain.cpp \
--- a/src/index/intervalrtree/Makefile.am
+++ b/src/index/intervalrtree/Makefile.am
@@ -3,7 +3,7 @@
 #
 noinst_LTLIBRARIES = libintervalrtree.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libintervalrtree_la_SOURCES = \
 	IntervalRTreeBranchNode.cpp \
--- a/src/index/quadtree/Makefile.am
+++ b/src/index/quadtree/Makefile.am
@@ -3,7 +3,7 @@
 #
 noinst_LTLIBRARIES = libindexquadtree.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libindexquadtree_la_SOURCES = \
     DoubleBits.cpp \
--- a/src/index/strtree/Makefile.am
+++ b/src/index/strtree/Makefile.am
@@ -3,7 +3,7 @@
 #
 noinst_LTLIBRARIES = libindexstrtree.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libindexstrtree_la_SOURCES = \
     AbstractNode.cpp \
--- a/src/index/sweepline/Makefile.am
+++ b/src/index/sweepline/Makefile.am
@@ -3,7 +3,7 @@
 #
 noinst_LTLIBRARIES = libindexsweepline.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libindexsweepline_la_SOURCES = \
     SweepLineEvent.cpp \
--- a/src/io/Makefile.am
+++ b/src/io/Makefile.am
@@ -5,7 +5,7 @@
 
 noinst_LTLIBRARIES = libio.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libio_la_SOURCES = \
 	ParseException.cpp \
--- a/src/linearref/Makefile.am
+++ b/src/linearref/Makefile.am
@@ -3,7 +3,7 @@
 #
 noinst_LTLIBRARIES = liblinearref.la
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 liblinearref_la_SOURCES = \
     ExtractLineByLocation.cpp \
--- a/src/noding/Makefile.am
+++ b/src/noding/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = snapround
 
 noinst_LTLIBRARIES = libnoding.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libnoding_la_SOURCES = \
 	BasicSegmentString.cpp \
--- a/src/noding/snapround/Makefile.am
+++ b/src/noding/snapround/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS =
 
 noinst_LTLIBRARIES = libsnapround.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libsnapround_la_SOURCES = \
     HotPixel.cpp \
--- a/src/operation/Makefile.am
+++ b/src/operation/Makefile.am
@@ -15,7 +15,7 @@ SUBDIRS = \
 
 noinst_LTLIBRARIES = liboperation.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 liboperation_la_SOURCES = \
 	GeometryGraphOperation.cpp \
--- a/src/operation/buffer/Makefile.am
+++ b/src/operation/buffer/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS =
 
 noinst_LTLIBRARIES = libopbuffer.la
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 libopbuffer_la_SOURCES = \
 	BufferBuilder.cpp \
--- a/src/operation/distance/Makefile.am
+++ b/src/operation/distance/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS =
 
 noinst_LTLIBRARIES = libopdistance.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libopdistance_la_SOURCES = \
     ConnectedElementLocationFilter.cpp \
--- a/src/operation/linemerge/Makefile.am
+++ b/src/operation/linemerge/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS =
 
 noinst_LTLIBRARIES = liboplinemerge.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 liboplinemerge_la_SOURCES = \
 	EdgeString.cpp \
--- a/src/operation/overlay/Makefile.am
+++ b/src/operation/overlay/Makefile.am
@@ -8,7 +8,7 @@ SUBDIRS =
 
 noinst_LTLIBRARIES = libopoverlay.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libopoverlay_la_SOURCES = \
     EdgeSetNoder.cpp \
--- a/src/operation/polygonize/Makefile.am
+++ b/src/operation/polygonize/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS =
 
 noinst_LTLIBRARIES = liboppolygonize.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 liboppolygonize_la_SOURCES = \
     PolygonizeDirectedEdge.cpp \
--- a/src/operation/predicate/Makefile.am
+++ b/src/operation/predicate/Makefile.am
@@ -6,7 +6,7 @@
 
 noinst_LTLIBRARIES = liboppredicate.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 liboppredicate_la_SOURCES = \
     RectangleIntersects.cpp \
--- a/src/operation/relate/Makefile.am
+++ b/src/operation/relate/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS =
 
 noinst_LTLIBRARIES = liboprelate.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 liboprelate_la_SOURCES = \
     EdgeEndBuilder.cpp \
--- a/src/operation/sharedpaths/Makefile.am
+++ b/src/operation/sharedpaths/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS =
 
 noinst_LTLIBRARIES = libopsharedpaths.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libopsharedpaths_la_SOURCES = \
     SharedPathsOp.cpp 
--- a/src/operation/union/Makefile.am
+++ b/src/operation/union/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS =
 
 noinst_LTLIBRARIES = libopunion.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libopunion_la_SOURCES = \
     CascadedPolygonUnion.cpp \
--- a/src/operation/valid/Makefile.am
+++ b/src/operation/valid/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS =
 
 noinst_LTLIBRARIES = libopvalid.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 # NOTES:
 # <incomplete>
--- a/src/planargraph/Makefile.am
+++ b/src/planargraph/Makefile.am
@@ -8,7 +8,7 @@ SUBDIRS =
 
 noinst_LTLIBRARIES = libplanargraph.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libplanargraph_la_SOURCES = \
     DirectedEdge.cpp \
--- a/src/precision/Makefile.am
+++ b/src/precision/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS =
 
 noinst_LTLIBRARIES = libprecision.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libprecision_la_SOURCES = \
 	CommonBits.cpp \
--- a/src/simplify/Makefile.am
+++ b/src/simplify/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS =
 
 noinst_LTLIBRARIES = libsimplify.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libsimplify_la_SOURCES = \
     DouglasPeuckerLineSimplifier.cpp \
--- a/src/triangulate/Makefile.am
+++ b/src/triangulate/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS = \
 
 noinst_LTLIBRARIES = libtriangulate.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libtriangulate_la_SOURCES = \
 	IncrementalDelaunayTriangulator.cpp \
--- a/src/triangulate/quadedge/Makefile.am
+++ b/src/triangulate/quadedge/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS =
 
 noinst_LTLIBRARIES = libquadedge.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libquadedge_la_SOURCES = \
 	QuadEdge.cpp \
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS =
 
 noinst_LTLIBRARIES = libutil.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libutil_la_SOURCES = \
 	Assert.cpp \
--- a/swig/ruby/Makefile.am
+++ b/swig/ruby/Makefile.am
@@ -17,7 +17,7 @@ BUILT_SOURCES = geos_wrap.cxx
 rubyextensiondirdir = $(RUBY_EXTENSION_DIR)
 
 # Setup includes
-INCLUDES = -I$(RUBY_INCLUDE_DIR) -I$(RUBY_INCLUDE_DIR)/$(RUBY_SITE_ARCH) -I$(RUBY_ARCH_INCLUDE_DIR)
+AM_CPPFLAGS = -I$(RUBY_INCLUDE_DIR) -I$(RUBY_INCLUDE_DIR)/$(RUBY_SITE_ARCH) -I$(RUBY_ARCH_INCLUDE_DIR)
 
 # Build Ruby module as shared library
 rubyextensiondir_LTLIBRARIES = geos.la
@@ -25,7 +25,7 @@ geos_la_SOURCES = geos_wrap.cxx
 geos_la_LIBADD =  $(top_builddir)/capi/libgeos_c.la $(RUBY_ARCH_LIB_DIR)/$(RUBY_SO_NAME)
 
 # Only need to grab the capi header files
-geos_la_CPPFLAGS = -I$(top_builddir)/capi
+geos_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/capi
 
 # Specify -module and -avoid-version so we can create a file called geos.dll/so which is what Ruby wants
 geos_la_LDFLAGS = -no-undefined  -module -avoid-version -L$(RUBY_LIB_DIR) -L$(RUBY_ARCH_LIB_DIR)
--- a/tests/bigtest/Makefile.am
+++ b/tests/bigtest/Makefile.am
@@ -17,8 +17,8 @@ TestSweepLineSpeed_LDADD = $(LIBS)
 bug234_SOURCES = bug234.cpp
 bug234_LDADD = $(LIBS)
 
-INCLUDES = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/src/io/markup
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS += -I$(top_srcdir)/src/io/markup
 
 EXTRA_DIST = CMakeLists.txt
 
--- a/tests/geostest/Makefile.am
+++ b/tests/geostest/Makefile.am
@@ -1,7 +1,7 @@
 #
 # This file is part of project GEOS (http://trac.osgeo.org/geos/) 
 #
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi
 
 EXTRA_DIST = \
 	brokengrammar \
--- a/tests/perf/Makefile.am
+++ b/tests/perf/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = \
 	operation \
 	capi
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 noinst_PROGRAMS = ClassSizes
 
--- a/tests/perf/capi/Makefile.am
+++ b/tests/perf/capi/Makefile.am
@@ -9,7 +9,7 @@ top_builddir=@top_builddir@
 check_PROGRAMS = memleak_mp_prep
 
 LIBS = $(top_builddir)/capi/libgeos_c.la
-INCLUDES = -I$(top_builddir)/capi -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_builddir)/capi -I$(top_srcdir)/include
 
 memleak_mp_prep_SOURCES = memleak_mp_prep.c
 memleak_mp_prep_LDADD = $(LIBS)
--- a/tests/perf/operation/buffer/Makefile.am
+++ b/tests/perf/operation/buffer/Makefile.am
@@ -12,5 +12,5 @@ LIBS = $(top_builddir)/src/libgeos.la
 IteratedBufferStressTest_SOURCES = IteratedBufferStressTest.cpp 
 IteratedBufferStressTest_LDADD = $(LIBS)
 
-INCLUDES = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/src/io/markup
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS += -I$(top_srcdir)/src/io/markup
--- a/tests/perf/operation/predicate/Makefile.am
+++ b/tests/perf/operation/predicate/Makefile.am
@@ -12,5 +12,5 @@ LIBS = $(top_builddir)/src/libgeos.la
 RectangleIntersectsPerfTest_SOURCES = RectangleIntersectsPerfTest.cpp 
 RectangleIntersectsPerfTest_LDADD = $(LIBS)
 
-INCLUDES = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/src/io/markup
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS += -I$(top_srcdir)/src/io/markup
--- a/tests/thread/Makefile.am
+++ b/tests/thread/Makefile.am
@@ -1,7 +1,7 @@
 #
 # This file is part of project GEOS (http://trac.osgeo.org/geos/) 
 #
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi
+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
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -4,7 +4,7 @@
 
 AUTOMAKE_OPTIONS = subdir-objects
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi
 
 TESTS = geos_unit
 
--- a/tests/xmltester/Makefile.am
+++ b/tests/xmltester/Makefile.am
@@ -134,8 +134,8 @@ XMLTester_LDADD = $(LIBS)
 # See http://trac.osgeo.org/geos/ticket/319
 XMLTester_CXXFLAGS = $(INLINE_FLAGS)
 
-INCLUDES = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/src/io/tinyxml -DTIXML_USE_STL
+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