From f4385442bc16f418795da62ce28a9ab2c94c4207 Mon Sep 17 00:00:00 2001 From: Paul Ramsey Date: Thu, 2 Jun 2022 17:40:08 -0700 Subject: [PATCH] Fix build to include all files needed by cmake too --- Makefile.am | 3 ++- configure.ac | 2 ++ util/Makefile.am | 2 +- util/geosop/Makefile.am | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index a9d78fcc59..7f67be869b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,8 @@ SUBDIRS = \ macros \ tests \ benchmarks \ - tools + tools \ + util BUILT_SOURCES = diff --git a/configure.ac b/configure.ac index 1788345119..660f051070 100644 --- a/configure.ac +++ b/configure.ac @@ -422,6 +422,8 @@ AC_OUTPUT([ tools/Makefile tools/geos-config tools/astyle/Makefile + util/Makefile + util/geosop/Makefile ]) dnl AC_MSG_RESULT([ ------------ GEOS Build ------------ ]) diff --git a/util/Makefile.am b/util/Makefile.am index 3a5ca2fa4c..c46e837217 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -2,7 +2,7 @@ # This file is part of project GEOS (http://trac.osgeo.org/geos/) # SUBDIRS = \ - geosop \ + geosop LIBS = $(top_builddir)/src/libgeos.la diff --git a/util/geosop/Makefile.am b/util/geosop/Makefile.am index 38bca5d376..5b5f2e3f78 100644 --- a/util/geosop/Makefile.am +++ b/util/geosop/Makefile.am @@ -20,6 +20,7 @@ geosop_SOURCES = \ geosop_LDADD = $(top_builddir)/src/libgeos.la + AM_CPPFLAGS = -I$(top_srcdir)/include EXTRA_DIST = CMakeLists.txt