[geos-commits] r3973 - in trunk: capi doc src src/algorithm src/algorithm/distance src/algorithm/locate src/geom src/geom/prep src/geom/util src/geomgraph src/geomgraph/index src/index/bintree src/index/chain src/index/intervalrtree src/index/quadtree src/index/strtree src/index/sweepline src/io src/linearref src/noding src/noding/snapround src/operation src/operation/buffer src/operation/distance src/operation/linemerge src/operation/overlay src/operation/polygonize src/operation/predicate src/operation/relate src/operation/sharedpaths src/operation/union src/operation/valid src/planargraph src/precision src/simplify src/triangulate src/triangulate/quadedge src/util swig/ruby tests/bigtest tests/geostest tests/perf tests/perf/capi tests/perf/operation/buffer tests/perf/operation/predicate tests/thread tests/unit tests/xmltester

svn_geos at osgeo.org svn_geos at osgeo.org
Mon Feb 10 10:39:48 PST 2014 

Author: strk
Date: 2014-02-10 10:39:47 -0800 (Mon, 10 Feb 2014)
New Revision: 3973

Modified:
   trunk/capi/Makefile.am
   trunk/doc/Makefile.am
   trunk/src/Makefile.am
   trunk/src/algorithm/Makefile.am
   trunk/src/algorithm/distance/Makefile.am
   trunk/src/algorithm/locate/Makefile.am
   trunk/src/geom/Makefile.am
   trunk/src/geom/prep/Makefile.am
   trunk/src/geom/util/Makefile.am
   trunk/src/geomgraph/Makefile.am
   trunk/src/geomgraph/index/Makefile.am
   trunk/src/index/bintree/Makefile.am
   trunk/src/index/chain/Makefile.am
   trunk/src/index/intervalrtree/Makefile.am
   trunk/src/index/quadtree/Makefile.am
   trunk/src/index/strtree/Makefile.am
   trunk/src/index/sweepline/Makefile.am
   trunk/src/io/Makefile.am
   trunk/src/linearref/Makefile.am
   trunk/src/noding/Makefile.am
   trunk/src/noding/snapround/Makefile.am
   trunk/src/operation/Makefile.am
   trunk/src/operation/buffer/Makefile.am
   trunk/src/operation/distance/Makefile.am
   trunk/src/operation/linemerge/Makefile.am
   trunk/src/operation/overlay/Makefile.am
   trunk/src/operation/polygonize/Makefile.am
   trunk/src/operation/predicate/Makefile.am
   trunk/src/operation/relate/Makefile.am
   trunk/src/operation/sharedpaths/Makefile.am
   trunk/src/operation/union/Makefile.am
   trunk/src/operation/valid/Makefile.am
   trunk/src/planargraph/Makefile.am
   trunk/src/precision/Makefile.am
   trunk/src/simplify/Makefile.am
   trunk/src/triangulate/Makefile.am
   trunk/src/triangulate/quadedge/Makefile.am
   trunk/src/util/Makefile.am
   trunk/swig/ruby/Makefile.am
   trunk/tests/bigtest/Makefile.am
   trunk/tests/geostest/Makefile.am
   trunk/tests/perf/Makefile.am
   trunk/tests/perf/capi/Makefile.am
   trunk/tests/perf/operation/buffer/Makefile.am
   trunk/tests/perf/operation/predicate/Makefile.am
   trunk/tests/thread/Makefile.am
   trunk/tests/unit/Makefile.am
   trunk/tests/xmltester/Makefile.am
Log:
Rename INCLUDES to AM_CPPFLAGS

Fixes aclocal 1.13.3 warning:
'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
Also tested with aclocal 1.11.1

Modified: trunk/capi/Makefile.am
===================================================================
--- trunk/capi/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/capi/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -6,7 +6,7 @@
 GEOS_CAPI_VERSION="@VERSION at -CAPI-@CAPI_VERSION@"
 GEOS_JTS_PORT="@JTS_PORT@"
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 capidir = $(includedir)
 

Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/doc/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -12,7 +12,7 @@
 example_SOURCES = example.cpp 
 example_LDADD = $(LIBS)
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 DOXYGEN = doxygen
 

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -18,7 +18,7 @@
 
 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
 

Modified: trunk/src/algorithm/Makefile.am
===================================================================
--- trunk/src/algorithm/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/algorithm/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -7,7 +7,7 @@
 
 noinst_LTLIBRARIES = libalgorithm.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libalgorithm_la_SOURCES = \
     Angle.cpp \

Modified: trunk/src/algorithm/distance/Makefile.am
===================================================================
--- trunk/src/algorithm/distance/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/algorithm/distance/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -5,7 +5,7 @@
 
 noinst_LTLIBRARIES = libdistance.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libdistance_la_SOURCES = \
     DiscreteHausdorffDistance.cpp \

Modified: trunk/src/algorithm/locate/Makefile.am
===================================================================
--- trunk/src/algorithm/locate/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/algorithm/locate/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -5,7 +5,7 @@
 
 noinst_LTLIBRARIES = liblocation.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 liblocation_la_SOURCES = \
 	IndexedPointInAreaLocator.cpp \

Modified: trunk/src/geom/Makefile.am
===================================================================
--- trunk/src/geom/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/geom/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -8,7 +8,7 @@
 noinst_LTLIBRARIES = \
     libgeom.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libgeom_la_SOURCES = \
     Coordinate.cpp \

Modified: trunk/src/geom/prep/Makefile.am
===================================================================
--- trunk/src/geom/prep/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/geom/prep/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -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 

Modified: trunk/src/geom/util/Makefile.am
===================================================================
--- trunk/src/geom/util/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/geom/util/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -3,7 +3,7 @@
 #
 noinst_LTLIBRARIES = libgeomutil.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libgeomutil_la_SOURCES = \
     ComponentCoordinateExtracter.cpp \

Modified: trunk/src/geomgraph/Makefile.am
===================================================================
--- trunk/src/geomgraph/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/geomgraph/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -5,7 +5,7 @@
 
 noinst_LTLIBRARIES = libgeomgraph.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libgeomgraph_la_SOURCES = \
 	Depth.cpp \

Modified: trunk/src/geomgraph/index/Makefile.am
===================================================================
--- trunk/src/geomgraph/index/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/geomgraph/index/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -3,7 +3,7 @@
 #
 noinst_LTLIBRARIES = libgeomgraphindex.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libgeomgraphindex_la_SOURCES = \
     MonotoneChainEdge.cpp \

Modified: trunk/src/index/bintree/Makefile.am
===================================================================
--- trunk/src/index/bintree/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/index/bintree/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -3,7 +3,7 @@
 #
 noinst_LTLIBRARIES = libindexbintree.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libindexbintree_la_SOURCES = \
     Bintree.cpp \

Modified: trunk/src/index/chain/Makefile.am
===================================================================
--- trunk/src/index/chain/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/index/chain/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -3,7 +3,7 @@
 #
 noinst_LTLIBRARIES = libindexchain.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libindexchain_la_SOURCES = \
 	MonotoneChain.cpp \

Modified: trunk/src/index/intervalrtree/Makefile.am
===================================================================
--- trunk/src/index/intervalrtree/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/index/intervalrtree/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -3,7 +3,7 @@
 #
 noinst_LTLIBRARIES = libintervalrtree.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libintervalrtree_la_SOURCES = \
 	IntervalRTreeBranchNode.cpp \

Modified: trunk/src/index/quadtree/Makefile.am
===================================================================
--- trunk/src/index/quadtree/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/index/quadtree/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -3,7 +3,7 @@
 #
 noinst_LTLIBRARIES = libindexquadtree.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libindexquadtree_la_SOURCES = \
     DoubleBits.cpp \

Modified: trunk/src/index/strtree/Makefile.am
===================================================================
--- trunk/src/index/strtree/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/index/strtree/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -3,7 +3,7 @@
 #
 noinst_LTLIBRARIES = libindexstrtree.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libindexstrtree_la_SOURCES = \
     AbstractNode.cpp \

Modified: trunk/src/index/sweepline/Makefile.am
===================================================================
--- trunk/src/index/sweepline/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/index/sweepline/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -3,7 +3,7 @@
 #
 noinst_LTLIBRARIES = libindexsweepline.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libindexsweepline_la_SOURCES = \
     SweepLineEvent.cpp \

Modified: trunk/src/io/Makefile.am
===================================================================
--- trunk/src/io/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/io/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -5,7 +5,7 @@
 
 noinst_LTLIBRARIES = libio.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libio_la_SOURCES = \
 	ParseException.cpp \

Modified: trunk/src/linearref/Makefile.am
===================================================================
--- trunk/src/linearref/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/linearref/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -3,7 +3,7 @@
 #
 noinst_LTLIBRARIES = liblinearref.la
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 liblinearref_la_SOURCES = \
     ExtractLineByLocation.cpp \

Modified: trunk/src/noding/Makefile.am
===================================================================
--- trunk/src/noding/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/noding/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -5,7 +5,7 @@
 
 noinst_LTLIBRARIES = libnoding.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libnoding_la_SOURCES = \
 	BasicSegmentString.cpp \

Modified: trunk/src/noding/snapround/Makefile.am
===================================================================
--- trunk/src/noding/snapround/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/noding/snapround/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -5,7 +5,7 @@
 
 noinst_LTLIBRARIES = libsnapround.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libsnapround_la_SOURCES = \
     HotPixel.cpp \

Modified: trunk/src/operation/Makefile.am
===================================================================
--- trunk/src/operation/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/operation/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -15,7 +15,7 @@
 
 noinst_LTLIBRARIES = liboperation.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 liboperation_la_SOURCES = \
 	GeometryGraphOperation.cpp \

Modified: trunk/src/operation/buffer/Makefile.am
===================================================================
--- trunk/src/operation/buffer/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/operation/buffer/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -5,7 +5,7 @@
 
 noinst_LTLIBRARIES = libopbuffer.la
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 libopbuffer_la_SOURCES = \
 	BufferBuilder.cpp \

Modified: trunk/src/operation/distance/Makefile.am
===================================================================
--- trunk/src/operation/distance/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/operation/distance/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -5,7 +5,7 @@
 
 noinst_LTLIBRARIES = libopdistance.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libopdistance_la_SOURCES = \
     ConnectedElementLocationFilter.cpp \

Modified: trunk/src/operation/linemerge/Makefile.am
===================================================================
--- trunk/src/operation/linemerge/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/operation/linemerge/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -5,7 +5,7 @@
 
 noinst_LTLIBRARIES = liboplinemerge.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 liboplinemerge_la_SOURCES = \
 	EdgeString.cpp \

Modified: trunk/src/operation/overlay/Makefile.am
===================================================================
--- trunk/src/operation/overlay/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/operation/overlay/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -5,7 +5,7 @@
 
 noinst_LTLIBRARIES = libopoverlay.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libopoverlay_la_SOURCES = \
     EdgeSetNoder.cpp \

Modified: trunk/src/operation/polygonize/Makefile.am
===================================================================
--- trunk/src/operation/polygonize/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/operation/polygonize/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -5,7 +5,7 @@
 
 noinst_LTLIBRARIES = liboppolygonize.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 liboppolygonize_la_SOURCES = \
     PolygonizeDirectedEdge.cpp \

Modified: trunk/src/operation/predicate/Makefile.am
===================================================================
--- trunk/src/operation/predicate/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/operation/predicate/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -6,7 +6,7 @@
 
 noinst_LTLIBRARIES = liboppredicate.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 liboppredicate_la_SOURCES = \
     RectangleIntersects.cpp \

Modified: trunk/src/operation/relate/Makefile.am
===================================================================
--- trunk/src/operation/relate/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/operation/relate/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -5,7 +5,7 @@
 
 noinst_LTLIBRARIES = liboprelate.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 liboprelate_la_SOURCES = \
     EdgeEndBuilder.cpp \

Modified: trunk/src/operation/sharedpaths/Makefile.am
===================================================================
--- trunk/src/operation/sharedpaths/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/operation/sharedpaths/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -5,7 +5,7 @@
 
 noinst_LTLIBRARIES = libopsharedpaths.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libopsharedpaths_la_SOURCES = \
     SharedPathsOp.cpp 

Modified: trunk/src/operation/union/Makefile.am
===================================================================
--- trunk/src/operation/union/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/operation/union/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -5,7 +5,7 @@
 
 noinst_LTLIBRARIES = libopunion.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libopunion_la_SOURCES = \
     CascadedPolygonUnion.cpp \

Modified: trunk/src/operation/valid/Makefile.am
===================================================================
--- trunk/src/operation/valid/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/operation/valid/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -5,7 +5,7 @@
 
 noinst_LTLIBRARIES = libopvalid.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 # NOTES:
 # <incomplete>

Modified: trunk/src/planargraph/Makefile.am
===================================================================
--- trunk/src/planargraph/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/planargraph/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -5,7 +5,7 @@
 
 noinst_LTLIBRARIES = libplanargraph.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libplanargraph_la_SOURCES = \
     DirectedEdge.cpp \

Modified: trunk/src/precision/Makefile.am
===================================================================
--- trunk/src/precision/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/precision/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -5,7 +5,7 @@
 
 noinst_LTLIBRARIES = libprecision.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libprecision_la_SOURCES = \
 	CommonBits.cpp \

Modified: trunk/src/simplify/Makefile.am
===================================================================
--- trunk/src/simplify/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/simplify/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -5,7 +5,7 @@
 
 noinst_LTLIBRARIES = libsimplify.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libsimplify_la_SOURCES = \
     DouglasPeuckerLineSimplifier.cpp \

Modified: trunk/src/triangulate/Makefile.am
===================================================================
--- trunk/src/triangulate/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/triangulate/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -6,7 +6,7 @@
 
 noinst_LTLIBRARIES = libtriangulate.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libtriangulate_la_SOURCES = \
 	IncrementalDelaunayTriangulator.cpp \

Modified: trunk/src/triangulate/quadedge/Makefile.am
===================================================================
--- trunk/src/triangulate/quadedge/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/triangulate/quadedge/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -5,7 +5,7 @@
 
 noinst_LTLIBRARIES = libquadedge.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libquadedge_la_SOURCES = \
 	QuadEdge.cpp \

Modified: trunk/src/util/Makefile.am
===================================================================
--- trunk/src/util/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/src/util/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -5,7 +5,7 @@
 
 noinst_LTLIBRARIES = libutil.la
 
-INCLUDES = -I$(top_srcdir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 libutil_la_SOURCES = \
 	Assert.cpp \

Modified: trunk/swig/ruby/Makefile.am
===================================================================
--- trunk/swig/ruby/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/swig/ruby/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -17,7 +17,7 @@
 rubyextensiondirdir = $(RUBY_EXTENSION_DIR)
 
 # Setup includes
-INCLUDES = -I$(RUBY_INCLUDE_DIR) -I$(RUBY_INCLUDE_DIR)/$(RUBY_SITE_ARCH)
+AM_CPPFLAGS = -I$(RUBY_INCLUDE_DIR) -I$(RUBY_INCLUDE_DIR)/$(RUBY_SITE_ARCH)
 
 # Build Ruby module as shared library
 rubyextensiondir_LTLIBRARIES = geos.la

Modified: trunk/tests/bigtest/Makefile.am
===================================================================
--- trunk/tests/bigtest/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/tests/bigtest/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -17,8 +17,8 @@
 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
 

Modified: trunk/tests/geostest/Makefile.am
===================================================================
--- trunk/tests/geostest/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/tests/geostest/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -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 \

Modified: trunk/tests/perf/Makefile.am
===================================================================
--- trunk/tests/perf/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/tests/perf/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -5,7 +5,7 @@
 	operation \
 	capi
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 noinst_PROGRAMS = ClassSizes
 

Modified: trunk/tests/perf/capi/Makefile.am
===================================================================
--- trunk/tests/perf/capi/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/tests/perf/capi/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -9,7 +9,7 @@
 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)

Modified: trunk/tests/perf/operation/buffer/Makefile.am
===================================================================
--- trunk/tests/perf/operation/buffer/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/tests/perf/operation/buffer/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -12,5 +12,5 @@
 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

Modified: trunk/tests/perf/operation/predicate/Makefile.am
===================================================================
--- trunk/tests/perf/operation/predicate/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/tests/perf/operation/predicate/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -12,5 +12,5 @@
 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

Modified: trunk/tests/thread/Makefile.am
===================================================================
--- trunk/tests/thread/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/tests/thread/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -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

Modified: trunk/tests/unit/Makefile.am
===================================================================
--- trunk/tests/unit/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/tests/unit/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -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
 
 TESTS = geos_unit
 

Modified: trunk/tests/xmltester/Makefile.am
===================================================================
--- trunk/tests/xmltester/Makefile.am	2014-02-10 18:37:30 UTC (rev 3972)
+++ trunk/tests/xmltester/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
@@ -132,8 +132,8 @@
 # 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

More information about the geos-commits mailing list