1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49
|
Description: Set automake option subdir-object to remain forward compatible.
Author: Bas Couwenberg <sebastic@xs4all.nl>
--- a/src/operation/overlay/Makefile.am
+++ b/src/operation/overlay/Makefile.am
@@ -1,6 +1,9 @@
#
# This file is part of project GEOS (http://trac.osgeo.org/geos/)
#
+
+AUTOMAKE_OPTIONS = subdir-objects
+
SUBDIRS =
noinst_LTLIBRARIES = libopoverlay.la
--- a/src/planargraph/Makefile.am
+++ b/src/planargraph/Makefile.am
@@ -1,6 +1,9 @@
#
# This file is part of project GEOS (http://trac.osgeo.org/geos/)
#
+
+AUTOMAKE_OPTIONS = subdir-objects
+
SUBDIRS =
noinst_LTLIBRARIES = libplanargraph.la
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -1,6 +1,9 @@
#
# This file is part of project GEOS (http://trac.osgeo.org/geos/)
#
+
+AUTOMAKE_OPTIONS = subdir-objects
+
INCLUDES = -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
@@ -5,6 +5,8 @@
#top_srcdir=@top_srcdir@
#top_builddir=@top_builddir@
+AUTOMAKE_OPTIONS = subdir-objects
+
TESTS = testrunner
CLEANFILES = testrunner
|