[geos-commits] r2844 - in trunk: . capi doc
include/geos/index/sweepline include/geos/operation macros
src/operation swig swig/python swig/python/tests swig/ruby
swig/ruby/test tests tests/bigtest tests/geostest tests/perf
tests/perf/operation tests/perf/operation/buffer tests/thread
tests/unit tests/xmltester tools
svn_geos at osgeo.org
svn_geos at osgeo.org
Tue Jan 12 22:03:39 EST 2010
Author: mloskot
Date: 2010-01-12 22:03:38 -0500 (Tue, 12 Jan 2010)
New Revision: 2844
Modified:
trunk/Makefile.am
trunk/capi/Makefile.am
trunk/doc/Makefile.am
trunk/include/geos/index/sweepline/Makefile.am
trunk/include/geos/operation/Makefile.am
trunk/macros/Makefile.am
trunk/src/operation/Makefile.am
trunk/swig/Makefile.am
trunk/swig/python/Makefile.am
trunk/swig/python/tests/Makefile.am
trunk/swig/ruby/Makefile.am
trunk/swig/ruby/test/Makefile.am
trunk/tests/Makefile.am
trunk/tests/bigtest/Makefile.am
trunk/tests/geostest/Makefile.am
trunk/tests/perf/Makefile.am
trunk/tests/perf/operation/Makefile.am
trunk/tests/perf/operation/buffer/Makefile.am
trunk/tests/thread/Makefile.am
trunk/tests/unit/Makefile.am
trunk/tests/xmltester/Makefile.am
trunk/tools/Makefile.am
Log:
Updated remaining directories doc, macros, tools, tests, swig, capi with new src and include location (#315). Fixed previous updates. Successfull build on Linux.
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2010-01-13 02:08:20 UTC (rev 2843)
+++ trunk/Makefile.am 2010-01-13 03:03:38 UTC (rev 2844)
@@ -24,4 +24,4 @@
ACLOCAL_AMFLAGS = -I macros
cl:
- cd $(srcdir) && svn2cl --authors=authors.svn -i -o ChangeLog
+ cd $(srcdir) && svn2cl --authors=authors.svn -i -o ChangeLog
Modified: trunk/capi/Makefile.am
===================================================================
--- trunk/capi/Makefile.am 2010-01-13 02:08:20 UTC (rev 2843)
+++ trunk/capi/Makefile.am 2010-01-13 03:03:38 UTC (rev 2844)
@@ -29,6 +29,6 @@
-no-undefined
dist-local:
- cp -p $(DIST_SOURCES) Makefile.am Makefile.in $(distdir)
+ cp -p $(DIST_SOURCES) Makefile.am Makefile.in $(distdir)
EXTRA_DIST = geos_c.h
Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am 2010-01-13 02:08:20 UTC (rev 2843)
+++ trunk/doc/Makefile.am 2010-01-13 03:03:38 UTC (rev 2844)
@@ -1,3 +1,7 @@
+# $Id$
+#
+# This file is part of project GEOS (http://trac.osgeo.org/geos/)
+#
prefix=@prefix@
top_srcdir=@top_srcdir@
top_builddir=@top_builddir@
@@ -4,12 +8,12 @@
noinst_PROGRAMS = example
-LIBS = $(top_builddir)/source/libgeos.la
+LIBS = $(top_builddir)/src/libgeos.la
example_SOURCES = example.cpp
example_LDADD = $(LIBS)
-INCLUDES = -I$(top_srcdir)/source/headers
+INCLUDES = -I$(top_srcdir)/include
DOXYGEN = doxygen
@@ -20,4 +24,3 @@
rm -Rf doxygen_docs
EXTRA_DIST = Doxyfile
-
Modified: trunk/include/geos/index/sweepline/Makefile.am
===================================================================
--- trunk/include/geos/index/sweepline/Makefile.am 2010-01-13 02:08:20 UTC (rev 2843)
+++ trunk/include/geos/index/sweepline/Makefile.am 2010-01-13 03:03:38 UTC (rev 2844)
@@ -12,4 +12,4 @@
SweepLineEvent.h \
SweepLineIndex.h \
SweepLineInterval.h \
- eweepLineOverlapAction.h
+ SweepLineOverlapAction.h
Modified: trunk/include/geos/operation/Makefile.am
===================================================================
--- trunk/include/geos/operation/Makefile.am 2010-01-13 02:08:20 UTC (rev 2843)
+++ trunk/include/geos/operation/Makefile.am 2010-01-13 03:03:38 UTC (rev 2844)
@@ -18,5 +18,5 @@
geosdir = $(includedir)/geos/operation
geos_HEADERS = \
- GeometryGraphOperation.h \
+ GeometryGraphOperation.h \
IsSimpleOp.h
Modified: trunk/macros/Makefile.am
===================================================================
--- trunk/macros/Makefile.am 2010-01-13 02:08:20 UTC (rev 2843)
+++ trunk/macros/Makefile.am 2010-01-13 03:03:38 UTC (rev 2844)
@@ -1,3 +1,7 @@
+# $Id$
+#
+# This file is part of project GEOS (http://trac.osgeo.org/geos/)
+#
prefix=@prefix@
top_srcdir=@top_srcdir@
GEOS_VERSION=@GEOS_VERSION@
Modified: trunk/src/operation/Makefile.am
===================================================================
--- trunk/src/operation/Makefile.am 2010-01-13 02:08:20 UTC (rev 2843)
+++ trunk/src/operation/Makefile.am 2010-01-13 03:03:38 UTC (rev 2844)
@@ -18,8 +18,8 @@
INCLUDES = -I$(top_srcdir)/include
liboperation_la_SOURCES = \
- GeometryGraphOperation.cpp \
- IsSimpleOp.cpp
+ GeometryGraphOperation.cpp \
+ IsSimpleOp.cpp
liboperation_la_LIBADD = \
buffer/libopbuffer.la \
Modified: trunk/swig/Makefile.am
===================================================================
--- trunk/swig/Makefile.am 2010-01-13 02:08:20 UTC (rev 2843)
+++ trunk/swig/Makefile.am 2010-01-13 03:03:38 UTC (rev 2844)
@@ -1,13 +1,16 @@
+# $Id$
+#
+# This file is part of project GEOS (http://trac.osgeo.org/geos/)
+#
if ENABLE_PYTHON
- MAYBEPYTHON = python
+ MAYBEPYTHON = python
endif
if ENABLE_RUBY
- MAYBERUBY = ruby
+ MAYBERUBY = ruby
endif
SUBDIRS = $(MAYBEPYTHON) $(MAYBERUBY)
EXTRA_DIST = \
geos.i
-
Modified: trunk/swig/python/Makefile.am
===================================================================
--- trunk/swig/python/Makefile.am 2010-01-13 02:08:20 UTC (rev 2843)
+++ trunk/swig/python/Makefile.am 2010-01-13 03:03:38 UTC (rev 2844)
@@ -1,3 +1,7 @@
+# $Id$
+#
+# This file is part of project GEOS (http://trac.osgeo.org/geos/)
+#
SUBDIRS = \
tests
@@ -23,7 +27,6 @@
_geos_la_LDFLAGS = -no-undefined -module -avoid-version
_geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la $(PYTHON_LDFLAGS)
-
if ENABLE_SWIG
geos_wrap.cxx: ../geos.i python.i
Modified: trunk/swig/python/tests/Makefile.am
===================================================================
--- trunk/swig/python/tests/Makefile.am 2010-01-13 02:08:20 UTC (rev 2843)
+++ trunk/swig/python/tests/Makefile.am 2010-01-13 03:03:38 UTC (rev 2844)
@@ -1,3 +1,7 @@
+# $Id$
+#
+# This file is part of project GEOS (http://trac.osgeo.org/geos/)
+#
PYTHON_TESTS = \
example.py \
test_geometry.py \
Modified: trunk/swig/ruby/Makefile.am
===================================================================
--- trunk/swig/ruby/Makefile.am 2010-01-13 02:08:20 UTC (rev 2843)
+++ trunk/swig/ruby/Makefile.am 2010-01-13 03:03:38 UTC (rev 2844)
@@ -1,3 +1,7 @@
+# $Id$
+#
+# This file is part of project GEOS (http://trac.osgeo.org/geos/)
+#
EXTRA_DIST = \
ruby.i
Modified: trunk/swig/ruby/test/Makefile.am
===================================================================
--- trunk/swig/ruby/test/Makefile.am 2010-01-13 02:08:20 UTC (rev 2843)
+++ trunk/swig/ruby/test/Makefile.am 2010-01-13 03:03:38 UTC (rev 2844)
@@ -1,18 +1,22 @@
+# $Id$
+#
+# This file is part of project GEOS (http://trac.osgeo.org/geos/)
+#
#geos_tests.rb runs the full Ruby geos test suite
-
-RUBY_TESTS = \
- example.rb \
- geos_tests.rb \
- test_buffer.rb \
+#
+RUBY_TESTS = \
+ example.rb \
+ geos_tests.rb \
+ test_buffer.rb \
test_combinations.rb \
- test_coordinate_sequence.rb \
- test_envelope.rb \
- test_geometry.rb \
- test_helper.rb \
- test_io.rb \
- test_operations.rb \
- test_relations.rb \
- test_srid.rb \
+ test_coordinate_sequence.rb \
+ test_envelope.rb \
+ test_geometry.rb \
+ test_helper.rb \
+ test_io.rb \
+ test_operations.rb \
+ test_relations.rb \
+ test_srid.rb \
test_version.rb
EXTRA_DIST = $(RUBY_TESTS)
Modified: trunk/tests/Makefile.am
===================================================================
--- trunk/tests/Makefile.am 2010-01-13 02:08:20 UTC (rev 2843)
+++ trunk/tests/Makefile.am 2010-01-13 03:03:38 UTC (rev 2844)
@@ -1,3 +1,7 @@
+# $Id$
+#
+# This file is part of project GEOS (http://trac.osgeo.org/geos/)
+#
SUBDIRS = \
bigtest \
xmltester \
Modified: trunk/tests/bigtest/Makefile.am
===================================================================
--- trunk/tests/bigtest/Makefile.am 2010-01-13 02:08:20 UTC (rev 2843)
+++ trunk/tests/bigtest/Makefile.am 2010-01-13 03:03:38 UTC (rev 2844)
@@ -1,3 +1,7 @@
+# $Id$
+#
+# This file is part of project GEOS (http://trac.osgeo.org/geos/)
+#
prefix=@prefix@
top_srcdir=@top_srcdir@
top_builddir=@top_builddir@
@@ -5,7 +9,7 @@
check_PROGRAMS = bug234
check_PROGRAMS += TestSweepLineSpeed
-LIBS = $(top_builddir)/source/libgeos.la
+LIBS = $(top_builddir)/src/libgeos.la
# -lmpatrol -lbfd -lintl -liberty -limagehlp
TestSweepLineSpeed_SOURCES = TestSweepLineSpeed.cpp GeometryTestFactory.cpp bigtest.h
@@ -14,8 +18,8 @@
bug234_SOURCES = bug234.cpp
bug234_LDADD = $(LIBS)
-INCLUDES = -I$(top_srcdir)/source/headers
-INCLUDES += -I$(top_srcdir)/source/io/markup
+INCLUDES = -I$(top_srcdir)/include
+INCLUDES += -I$(top_srcdir)/src/io/markup
#EXTRA_DIST = GeometryTestFactory.cpp
Modified: trunk/tests/geostest/Makefile.am
===================================================================
--- trunk/tests/geostest/Makefile.am 2010-01-13 02:08:20 UTC (rev 2843)
+++ trunk/tests/geostest/Makefile.am 2010-01-13 03:03:38 UTC (rev 2844)
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: Makefile.am 2841 2010-01-13 00:48:20Z mloskot $
#
-# tests/geostest program
+# This file is part of project GEOS (http://trac.osgeo.org/geos/)
#
-INCLUDES = -I$(top_srcdir)/source/headers -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi
+INCLUDES = -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 2010-01-13 02:08:20 UTC (rev 2843)
+++ trunk/tests/perf/Makefile.am 2010-01-13 03:03:38 UTC (rev 2844)
@@ -1,3 +1,7 @@
+# $Id: Makefile.am 2841 2010-01-13 00:48:20Z mloskot $
+#
+# This file is part of project GEOS (http://trac.osgeo.org/geos/)
+#
SUBDIRS = \
- operation
+ operation
Modified: trunk/tests/perf/operation/Makefile.am
===================================================================
--- trunk/tests/perf/operation/Makefile.am 2010-01-13 02:08:20 UTC (rev 2843)
+++ trunk/tests/perf/operation/Makefile.am 2010-01-13 03:03:38 UTC (rev 2844)
@@ -1,3 +1,7 @@
+# $Id: Makefile.am 2841 2010-01-13 00:48:20Z mloskot $
+#
+# This file is part of project GEOS (http://trac.osgeo.org/geos/)
+#
SUBDIRS = \
- buffer
+ buffer
Modified: trunk/tests/perf/operation/buffer/Makefile.am
===================================================================
--- trunk/tests/perf/operation/buffer/Makefile.am 2010-01-13 02:08:20 UTC (rev 2843)
+++ trunk/tests/perf/operation/buffer/Makefile.am 2010-01-13 03:03:38 UTC (rev 2844)
@@ -1,3 +1,7 @@
+# $Id: Makefile.am 2841 2010-01-13 00:48:20Z mloskot $
+#
+# This file is part of project GEOS (http://trac.osgeo.org/geos/)
+#
prefix=@prefix@
top_srcdir=@top_srcdir@
top_builddir=@top_builddir@
@@ -4,10 +8,10 @@
noinst_PROGRAMS = IteratedBufferStressTest
-LIBS = $(top_builddir)/source/libgeos.la
+LIBS = $(top_builddir)/src/libgeos.la
IteratedBufferStressTest_SOURCES = IteratedBufferStressTest.cpp
IteratedBufferStressTest_LDADD = $(LIBS)
-INCLUDES = -I$(top_srcdir)/source/headers
-INCLUDES += -I$(top_srcdir)/source/io/markup
+INCLUDES = -I$(top_srcdir)/include
+INCLUDES += -I$(top_srcdir)/src/io/markup
Modified: trunk/tests/thread/Makefile.am
===================================================================
--- trunk/tests/thread/Makefile.am 2010-01-13 02:08:20 UTC (rev 2843)
+++ trunk/tests/thread/Makefile.am 2010-01-13 03:03:38 UTC (rev 2844)
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: Makefile.am 2841 2010-01-13 00:48:20Z mloskot $
#
-# tests/thread builds threading test programs
+# This file is part of project GEOS (http://trac.osgeo.org/geos/)
#
-INCLUDES = -I$(top_srcdir)/source/headers -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi
+INCLUDES = -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 2010-01-13 02:08:20 UTC (rev 2843)
+++ trunk/tests/unit/Makefile.am 2010-01-13 03:03:38 UTC (rev 2844)
@@ -1,8 +1,8 @@
# $Id$
#
-# tests/unit builds geos_unit - unit tests runner program
+# This file is part of project GEOS (http://trac.osgeo.org/geos/)
#
-INCLUDES = -I$(top_srcdir)/source/headers -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi
TESTS = geos_unit
@@ -23,12 +23,13 @@
#bin_PROGRAMS = geos_tut
geos_unit_LDADD = \
- $(top_builddir)/source/libgeos.la \
+ $(top_builddir)/src/libgeos.la \
$(top_builddir)/capi/libgeos_c.la \
$(NULL)
-geos_unit_SOURCES = geos_unit.cpp \
+geos_unit_SOURCES = \
+ geos_unit.cpp \
algorithm/CGAlgorithms/isCCWTest.cpp \
algorithm/CGAlgorithms/isPointInRingTest.cpp \
algorithm/CGAlgorithms/computeOrientationTest.cpp \
Modified: trunk/tests/xmltester/Makefile.am
===================================================================
--- trunk/tests/xmltester/Makefile.am 2010-01-13 02:08:20 UTC (rev 2843)
+++ trunk/tests/xmltester/Makefile.am 2010-01-13 03:03:38 UTC (rev 2844)
@@ -1,3 +1,7 @@
+# $Id$
+#
+# This file is part of project GEOS (http://trac.osgeo.org/geos/)
+#
#prefix=@prefix@
#top_srcdir=@top_srcdir@
#top_builddir=@top_builddir@
@@ -76,7 +80,7 @@
#bin_PROGRAMS = XMLTester
# CTS
-LIBS = $(top_builddir)/source/libgeos.la
+LIBS = $(top_builddir)/src/libgeos.la
# -lmpatrol -lbfd -lintl -liberty -limagehlp
# CTS_SOURCES = CTS.cpp
@@ -85,20 +89,27 @@
SimpleWKTTester_SOURCES = SimpleWKTTester.cpp
SimpleWKTTester_LDADD = $(LIBS)
-XMLTester_SOURCES = XMLTester.cpp XMLTester.h \
- tinyxml/tinyxml.h tinyxml/tinyxml.cpp \
- tinyxml/tinystr.h tinyxml/tinystr.cpp \
- tinyxml/tinyxmlerror.cpp tinyxml/tinyxmlparser.cpp \
- BufferResultMatcher.h BufferResultMatcher.cpp \
- SingleSidedBufferResultMatcher.h SingleSidedBufferResultMatcher.cpp
+XMLTester_SOURCES = \
+ XMLTester.cpp \
+ XMLTester.h \
+ tinyxml/tinyxml.h \
+ tinyxml/tinyxml.cpp \
+ tinyxml/tinystr.h \
+ tinyxml/tinystr.cpp \
+ tinyxml/tinyxmlerror.cpp \
+ tinyxml/tinyxmlparser.cpp \
+ BufferResultMatcher.h \
+ BufferResultMatcher.cpp \
+ SingleSidedBufferResultMatcher.h \
+ SingleSidedBufferResultMatcher.cpp
XMLTester_LDADD = $(LIBS)
-INCLUDES = -I$(top_srcdir)/source/headers
-INCLUDES += -I$(top_srcdir)/source/io/tinyxml -DTIXML_USE_STL
+INCLUDES = -I$(top_srcdir)/include
+INCLUDES += -I$(top_srcdir)/src/io/tinyxml -DTIXML_USE_STL
static:
- $(CXX) $(CXXFLAGS) -I../headers -o staticXMLTester XMLTester.cpp MarkupSTL.o ../../source/geom/.libs/libgeos.a
+ $(CXX) $(CXXFLAGS) -I../include -o staticXMLTester XMLTester.cpp MarkupSTL.o ../../src/geom/.libs/libgeos.a
test: XMLTester
./XMLTester $(XMLTESTS)
Modified: trunk/tools/Makefile.am
===================================================================
--- trunk/tools/Makefile.am 2010-01-13 02:08:20 UTC (rev 2843)
+++ trunk/tools/Makefile.am 2010-01-13 03:03:38 UTC (rev 2844)
@@ -1 +1,4 @@
-bin_SCRIPTS = geos-config
+# $Id$
+#
+# This file is part of project GEOS (http://trac.osgeo.org/geos/)
+bin_SCRIPTS = geos-config
More information about the geos-commits
mailing list