Skip to content

Commit bd1c542

Browse files
author
Sandro Santilli
committed
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 git-svn-id: http://svn.osgeo.org/geos/trunk@3973 5242fede-7e19-0410-aef8-94bd7d2200fb
1 parent fbb7b9d commit bd1c542

File tree

48 files changed

+52
-52
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+52
-52
lines changed

‎capi/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ top_srcdir=@top_srcdir@
66
GEOS_CAPI_VERSION="@VERSION@-CAPI-@CAPI_VERSION@"
77
GEOS_JTS_PORT="@JTS_PORT@"
88

9-
INCLUDES = -I$(top_srcdir)/include
9+
AM_CPPFLAGS = -I$(top_srcdir)/include
1010

1111
capidir = $(includedir)
1212

‎doc/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ LIBS = $(top_builddir)/src/libgeos.la
1212
example_SOURCES = example.cpp
1313
example_LDADD = $(LIBS)
1414

15-
INCLUDES = -I$(top_srcdir)/include
15+
AM_CPPFLAGS = -I$(top_srcdir)/include
1616

1717
DOXYGEN = doxygen
1818

‎src/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ SUBDIRS = \
1818

1919
EXTRA_DIST = Makefile.vc dirlist.mk CMakeLists.txt info.plist.in
2020

21-
INCLUDES = -I$(top_srcdir)/include
21+
AM_CPPFLAGS = -I$(top_srcdir)/include
2222

2323
lib_LTLIBRARIES = libgeos.la
2424

‎src/algorithm/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SUBDIRS = \
77

88
noinst_LTLIBRARIES = libalgorithm.la
99

10-
INCLUDES = -I$(top_srcdir)/include
10+
AM_CPPFLAGS = -I$(top_srcdir)/include
1111

1212
libalgorithm_la_SOURCES = \
1313
Angle.cpp \

‎src/algorithm/distance/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SUBDIRS =
55

66
noinst_LTLIBRARIES = libdistance.la
77

8-
INCLUDES = -I$(top_srcdir)/include
8+
AM_CPPFLAGS = -I$(top_srcdir)/include
99

1010
libdistance_la_SOURCES = \
1111
DiscreteHausdorffDistance.cpp \

‎src/algorithm/locate/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SUBDIRS =
55

66
noinst_LTLIBRARIES = liblocation.la
77

8-
INCLUDES = -I$(top_srcdir)/include
8+
AM_CPPFLAGS = -I$(top_srcdir)/include
99

1010
liblocation_la_SOURCES = \
1111
IndexedPointInAreaLocator.cpp \

‎src/geom/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ SUBDIRS=\
88
noinst_LTLIBRARIES = \
99
libgeom.la
1010

11-
INCLUDES = -I$(top_srcdir)/include
11+
AM_CPPFLAGS = -I$(top_srcdir)/include
1212

1313
libgeom_la_SOURCES = \
1414
Coordinate.cpp \

‎src/geom/prep/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
noinst_LTLIBRARIES = libgeomprep.la
55

6-
INCLUDES = -I$(top_srcdir)/include
6+
AM_CPPFLAGS = -I$(top_srcdir)/include
77

88
## these are full inlined
99
# PolygonExtracter.cpp

‎src/geom/util/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
noinst_LTLIBRARIES = libgeomutil.la
55

6-
INCLUDES = -I$(top_srcdir)/include
6+
AM_CPPFLAGS = -I$(top_srcdir)/include
77

88
libgeomutil_la_SOURCES = \
99
ComponentCoordinateExtracter.cpp \

‎src/geomgraph/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SUBDIRS = index
55

66
noinst_LTLIBRARIES = libgeomgraph.la
77

8-
INCLUDES = -I$(top_srcdir)/include
8+
AM_CPPFLAGS = -I$(top_srcdir)/include
99

1010
libgeomgraph_la_SOURCES = \
1111
Depth.cpp \

‎src/geomgraph/index/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
noinst_LTLIBRARIES = libgeomgraphindex.la
55

6-
INCLUDES = -I$(top_srcdir)/include
6+
AM_CPPFLAGS = -I$(top_srcdir)/include
77

88
libgeomgraphindex_la_SOURCES = \
99
MonotoneChainEdge.cpp \

‎src/index/bintree/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
noinst_LTLIBRARIES = libindexbintree.la
55

6-
INCLUDES = -I$(top_srcdir)/include
6+
AM_CPPFLAGS = -I$(top_srcdir)/include
77

88
libindexbintree_la_SOURCES = \
99
Bintree.cpp \

‎src/index/chain/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
noinst_LTLIBRARIES = libindexchain.la
55

6-
INCLUDES = -I$(top_srcdir)/include
6+
AM_CPPFLAGS = -I$(top_srcdir)/include
77

88
libindexchain_la_SOURCES = \
99
MonotoneChain.cpp \

‎src/index/intervalrtree/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
noinst_LTLIBRARIES = libintervalrtree.la
55

6-
INCLUDES = -I$(top_srcdir)/include
6+
AM_CPPFLAGS = -I$(top_srcdir)/include
77

88
libintervalrtree_la_SOURCES = \
99
IntervalRTreeBranchNode.cpp \

‎src/index/quadtree/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
noinst_LTLIBRARIES = libindexquadtree.la
55

6-
INCLUDES = -I$(top_srcdir)/include
6+
AM_CPPFLAGS = -I$(top_srcdir)/include
77

88
libindexquadtree_la_SOURCES = \
99
DoubleBits.cpp \

‎src/index/strtree/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
noinst_LTLIBRARIES = libindexstrtree.la
55

6-
INCLUDES = -I$(top_srcdir)/include
6+
AM_CPPFLAGS = -I$(top_srcdir)/include
77

88
libindexstrtree_la_SOURCES = \
99
AbstractNode.cpp \

‎src/index/sweepline/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
noinst_LTLIBRARIES = libindexsweepline.la
55

6-
INCLUDES = -I$(top_srcdir)/include
6+
AM_CPPFLAGS = -I$(top_srcdir)/include
77

88
libindexsweepline_la_SOURCES = \
99
SweepLineEvent.cpp \

‎src/io/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
noinst_LTLIBRARIES = libio.la
77

8-
INCLUDES = -I$(top_srcdir)/include
8+
AM_CPPFLAGS = -I$(top_srcdir)/include
99

1010
libio_la_SOURCES = \
1111
ParseException.cpp \

‎src/linearref/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
noinst_LTLIBRARIES = liblinearref.la
55

6-
INCLUDES = -I$(top_srcdir)/include
6+
AM_CPPFLAGS = -I$(top_srcdir)/include
77

88
liblinearref_la_SOURCES = \
99
ExtractLineByLocation.cpp \

‎src/noding/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SUBDIRS = snapround
55

66
noinst_LTLIBRARIES = libnoding.la
77

8-
INCLUDES = -I$(top_srcdir)/include
8+
AM_CPPFLAGS = -I$(top_srcdir)/include
99

1010
libnoding_la_SOURCES = \
1111
BasicSegmentString.cpp \

‎src/noding/snapround/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SUBDIRS =
55

66
noinst_LTLIBRARIES = libsnapround.la
77

8-
INCLUDES = -I$(top_srcdir)/include
8+
AM_CPPFLAGS = -I$(top_srcdir)/include
99

1010
libsnapround_la_SOURCES = \
1111
HotPixel.cpp \

‎src/operation/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ SUBDIRS = \
1515

1616
noinst_LTLIBRARIES = liboperation.la
1717

18-
INCLUDES = -I$(top_srcdir)/include
18+
AM_CPPFLAGS = -I$(top_srcdir)/include
1919

2020
liboperation_la_SOURCES = \
2121
GeometryGraphOperation.cpp \

‎src/operation/buffer/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SUBDIRS =
55

66
noinst_LTLIBRARIES = libopbuffer.la
77

8-
INCLUDES = -I$(top_srcdir)/include
8+
AM_CPPFLAGS = -I$(top_srcdir)/include
99

1010
libopbuffer_la_SOURCES = \
1111
BufferBuilder.cpp \

‎src/operation/distance/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SUBDIRS =
55

66
noinst_LTLIBRARIES = libopdistance.la
77

8-
INCLUDES = -I$(top_srcdir)/include
8+
AM_CPPFLAGS = -I$(top_srcdir)/include
99

1010
libopdistance_la_SOURCES = \
1111
ConnectedElementLocationFilter.cpp \

‎src/operation/linemerge/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SUBDIRS =
55

66
noinst_LTLIBRARIES = liboplinemerge.la
77

8-
INCLUDES = -I$(top_srcdir)/include
8+
AM_CPPFLAGS = -I$(top_srcdir)/include
99

1010
liboplinemerge_la_SOURCES = \
1111
EdgeString.cpp \

‎src/operation/overlay/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SUBDIRS =
55

66
noinst_LTLIBRARIES = libopoverlay.la
77

8-
INCLUDES = -I$(top_srcdir)/include
8+
AM_CPPFLAGS = -I$(top_srcdir)/include
99

1010
libopoverlay_la_SOURCES = \
1111
EdgeSetNoder.cpp \

‎src/operation/polygonize/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SUBDIRS =
55

66
noinst_LTLIBRARIES = liboppolygonize.la
77

8-
INCLUDES = -I$(top_srcdir)/include
8+
AM_CPPFLAGS = -I$(top_srcdir)/include
99

1010
liboppolygonize_la_SOURCES = \
1111
PolygonizeDirectedEdge.cpp \

‎src/operation/predicate/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
noinst_LTLIBRARIES = liboppredicate.la
88

9-
INCLUDES = -I$(top_srcdir)/include
9+
AM_CPPFLAGS = -I$(top_srcdir)/include
1010

1111
liboppredicate_la_SOURCES = \
1212
RectangleIntersects.cpp \

‎src/operation/relate/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SUBDIRS =
55

66
noinst_LTLIBRARIES = liboprelate.la
77

8-
INCLUDES = -I$(top_srcdir)/include
8+
AM_CPPFLAGS = -I$(top_srcdir)/include
99

1010
liboprelate_la_SOURCES = \
1111
EdgeEndBuilder.cpp \

‎src/operation/sharedpaths/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SUBDIRS =
55

66
noinst_LTLIBRARIES = libopsharedpaths.la
77

8-
INCLUDES = -I$(top_srcdir)/include
8+
AM_CPPFLAGS = -I$(top_srcdir)/include
99

1010
libopsharedpaths_la_SOURCES = \
1111
SharedPathsOp.cpp

‎src/operation/union/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SUBDIRS =
55

66
noinst_LTLIBRARIES = libopunion.la
77

8-
INCLUDES = -I$(top_srcdir)/include
8+
AM_CPPFLAGS = -I$(top_srcdir)/include
99

1010
libopunion_la_SOURCES = \
1111
CascadedPolygonUnion.cpp \

‎src/operation/valid/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SUBDIRS =
55

66
noinst_LTLIBRARIES = libopvalid.la
77

8-
INCLUDES = -I$(top_srcdir)/include
8+
AM_CPPFLAGS = -I$(top_srcdir)/include
99

1010
# NOTES:
1111
# <incomplete>

‎src/planargraph/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SUBDIRS =
55

66
noinst_LTLIBRARIES = libplanargraph.la
77

8-
INCLUDES = -I$(top_srcdir)/include
8+
AM_CPPFLAGS = -I$(top_srcdir)/include
99

1010
libplanargraph_la_SOURCES = \
1111
DirectedEdge.cpp \

‎src/precision/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SUBDIRS =
55

66
noinst_LTLIBRARIES = libprecision.la
77

8-
INCLUDES = -I$(top_srcdir)/include
8+
AM_CPPFLAGS = -I$(top_srcdir)/include
99

1010
libprecision_la_SOURCES = \
1111
CommonBits.cpp \

‎src/simplify/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SUBDIRS =
55

66
noinst_LTLIBRARIES = libsimplify.la
77

8-
INCLUDES = -I$(top_srcdir)/include
8+
AM_CPPFLAGS = -I$(top_srcdir)/include
99

1010
libsimplify_la_SOURCES = \
1111
DouglasPeuckerLineSimplifier.cpp \

‎src/triangulate/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SUBDIRS = \
66

77
noinst_LTLIBRARIES = libtriangulate.la
88

9-
INCLUDES = -I$(top_srcdir)/include
9+
AM_CPPFLAGS = -I$(top_srcdir)/include
1010

1111
libtriangulate_la_SOURCES = \
1212
IncrementalDelaunayTriangulator.cpp \

‎src/triangulate/quadedge/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SUBDIRS =
55

66
noinst_LTLIBRARIES = libquadedge.la
77

8-
INCLUDES = -I$(top_srcdir)/include
8+
AM_CPPFLAGS = -I$(top_srcdir)/include
99

1010
libquadedge_la_SOURCES = \
1111
QuadEdge.cpp \

‎src/util/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SUBDIRS =
55

66
noinst_LTLIBRARIES = libutil.la
77

8-
INCLUDES = -I$(top_srcdir)/include
8+
AM_CPPFLAGS = -I$(top_srcdir)/include
99

1010
libutil_la_SOURCES = \
1111
Assert.cpp \

‎swig/ruby/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ BUILT_SOURCES = geos_wrap.cxx
1717
rubyextensiondirdir = $(RUBY_EXTENSION_DIR)
1818

1919
# Setup includes
20-
INCLUDES = -I$(RUBY_INCLUDE_DIR) -I$(RUBY_INCLUDE_DIR)/$(RUBY_SITE_ARCH)
20+
AM_CPPFLAGS = -I$(RUBY_INCLUDE_DIR) -I$(RUBY_INCLUDE_DIR)/$(RUBY_SITE_ARCH)
2121

2222
# Build Ruby module as shared library
2323
rubyextensiondir_LTLIBRARIES = geos.la

‎tests/bigtest/Makefile.am

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ TestSweepLineSpeed_LDADD = $(LIBS)
1717
bug234_SOURCES = bug234.cpp
1818
bug234_LDADD = $(LIBS)
1919

20-
INCLUDES = -I$(top_srcdir)/include
21-
INCLUDES += -I$(top_srcdir)/src/io/markup
20+
AM_CPPFLAGS = -I$(top_srcdir)/include
21+
AM_CPPFLAGS += -I$(top_srcdir)/src/io/markup
2222

2323
EXTRA_DIST = CMakeLists.txt
2424

‎tests/geostest/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# This file is part of project GEOS (http://trac.osgeo.org/geos/)
33
#
4-
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi
4+
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi
55

66
EXTRA_DIST = \
77
brokengrammar \

‎tests/perf/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SUBDIRS = \
55
operation \
66
capi
77

8-
INCLUDES = -I$(top_srcdir)/include
8+
AM_CPPFLAGS = -I$(top_srcdir)/include
99

1010
noinst_PROGRAMS = ClassSizes
1111

‎tests/perf/capi/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ top_builddir=@top_builddir@
99
check_PROGRAMS = memleak_mp_prep
1010

1111
LIBS = $(top_builddir)/capi/libgeos_c.la
12-
INCLUDES = -I$(top_builddir)/capi -I$(top_srcdir)/include
12+
AM_CPPFLAGS = -I$(top_builddir)/capi -I$(top_srcdir)/include
1313

1414
memleak_mp_prep_SOURCES = memleak_mp_prep.c
1515
memleak_mp_prep_LDADD = $(LIBS)

‎tests/perf/operation/buffer/Makefile.am

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ LIBS = $(top_builddir)/src/libgeos.la
1212
IteratedBufferStressTest_SOURCES = IteratedBufferStressTest.cpp
1313
IteratedBufferStressTest_LDADD = $(LIBS)
1414

15-
INCLUDES = -I$(top_srcdir)/include
16-
INCLUDES += -I$(top_srcdir)/src/io/markup
15+
AM_CPPFLAGS = -I$(top_srcdir)/include
16+
AM_CPPFLAGS += -I$(top_srcdir)/src/io/markup

0 commit comments

Comments
 (0)