diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-09-18 13:45:35 +0200 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2018-09-18 19:43:10 +0200 |
| commit | eed0f16e8f85fff7fc8a190594fb39bc95cada74 (patch) | |
| tree | 423ddbbd5526a8c98999fd1b2e80473473bbf017 /src | |
| parent | 793f403aaddbfff64cabbb609a092c347dd659e9 (diff) | |
| download | PROJ-eed0f16e8f85fff7fc8a190594fb39bc95cada74.tar.gz PROJ-eed0f16e8f85fff7fc8a190594fb39bc95cada74.zip | |
Do not install projects.h
In version 6 we stop exposing the deprecated projects.h API to the world outside PROJ.
Closes #835
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/lib_proj.cmake | 1 | ||||
| -rw-r--r-- | src/test228.c | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 567c6e56..84846c1c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,7 +10,7 @@ check_PROGRAMS = geodtest AM_CPPFLAGS = -DPROJ_LIB=\"$(pkgdatadir)\" \ -DMUTEX_@MUTEX_SETTING@ @JNI_INCLUDE@ -include_HEADERS = proj.h proj_api.h projects.h geodesic.h \ +include_HEADERS = proj.h proj_api.h geodesic.h \ org_proj4_PJ.h EXTRA_DIST = makefile.vc proj.def bin_cct.cmake bin_gie.cmake bin_cs2cs.cmake \ @@ -44,7 +44,7 @@ lib_LTLIBRARIES = libproj.la libproj_la_LDFLAGS = -no-undefined -version-info 14:1:1 libproj_la_SOURCES = \ - pj_list.h proj_internal.h proj_math.h\ + pj_list.h proj_internal.h proj_math.h projects.h\ PJ_aeqd.c PJ_gnom.c PJ_laea.c PJ_mod_ster.c \ PJ_nsper.c PJ_nzmg.c PJ_ortho.c PJ_stere.c PJ_sterea.c \ PJ_aea.c PJ_bipc.c PJ_bonne.c PJ_eqdc.c PJ_isea.c PJ_ccon.c\ diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake index 33f37bb0..0779568a 100644 --- a/src/lib_proj.cmake +++ b/src/lib_proj.cmake @@ -227,7 +227,6 @@ SET(SRC_LIBPROJ_CORE ) set(HEADERS_LIBPROJ - projects.h proj_api.h proj.h geodesic.h diff --git a/src/test228.c b/src/test228.c index fe2c07ee..83d29f8f 100644 --- a/src/test228.c +++ b/src/test228.c @@ -1,3 +1,7 @@ +#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H +#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H +#endif + #include "proj_api.h" #include <stdio.h> /* for printf declaration */ |