aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorCharles Karney <ckarney@karney.com>2015-10-01 07:44:24 -0400
committerCharles Karney <ckarney@karney.com>2015-10-01 07:44:24 -0400
commit18d4720d28c0f4ed6af0e4a5a90413676e2b5d66 (patch)
tree45d8c41c6ad430a9d8258d98194f44568754d9fd /src/Makefile.am
parent86b2155cf14a205951a41cc2ce8d574feedde03a (diff)
parentb5d0d2d4dd1d2431f3e88e5d26e6105ce9a5c6bf (diff)
downloadPROJ-18d4720d28c0f4ed6af0e4a5a90413676e2b5d66.tar.gz
PROJ-18d4720d28c0f4ed6af0e4a5a90413676e2b5d66.zip
Merge branch 'master' into dmstor-fix
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index e53e7082..5d89cc28 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ AM_CFLAGS = @C_WFLAGS@
bin_PROGRAMS = proj nad2bin geod cs2cs
EXTRA_PROGRAMS = multistresstest test228
-INCLUDES = -DPROJ_LIB=\"$(pkgdatadir)\" \
+AM_CPPFLAGS = -DPROJ_LIB=\"$(pkgdatadir)\" \
-DMUTEX_@MUTEX_SETTING@ @JNI_INCLUDE@
include_HEADERS = proj_api.h projects.h geodesic.h \
@@ -29,7 +29,7 @@ test228_LDADD = libproj.la @THREAD_LIB@
lib_LTLIBRARIES = libproj.la
-libproj_la_LDFLAGS = -no-undefined -version-info 9:0:0
+libproj_la_LDFLAGS = -no-undefined -version-info 10:0:0
libproj_la_SOURCES = \
pj_list.h \