Merge pull request #956 from Geomatys/master

Remove unused src/org_proj4_Projections.h file
OSGeo · Apr 27, 2018 · 5bbeb0c · 5bbeb0c
2 parents fdf8f02 + 56f0895
commit 5bbeb0c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 40 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -10,7 +10,7 @@ AM_CPPFLAGS =	-DPROJ_LIB=\"$(pkgdatadir)\" \
 		-DMUTEX_@MUTEX_SETTING@ @JNI_INCLUDE@
 
 include_HEADERS = proj.h proj_api.h projects.h geodesic.h \
-	org_proj4_Projections.h org_proj4_PJ.h
+	org_proj4_PJ.h
 
 EXTRA_DIST = makefile.vc proj.def bin_cct.cmake bin_gie.cmake bin_cs2cs.cmake \
 			 bin_geod.cmake bin_nad2bin.cmake bin_proj.cmake \

diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake
@@ -258,8 +258,7 @@ if(JNI_SUPPORT)
   set(SRC_LIBPROJ_CORE ${SRC_LIBPROJ_CORE}
                        jniproj.c )
   set(HEADERS_LIBPROJ ${HEADERS_LIBPROJ}
-                        org_proj4_PJ.h
-                        org_proj4_Projections.h)
+                        org_proj4_PJ.h)
   source_group("Source Files\\JNI" FILES ${SRC_LIBPROJ_JNI})
   add_definitions(-DJNI_ENABLED)
   include_directories( ${JNI_INCLUDE_DIRS})

diff --git a/src/org_proj4_Projections.h b/src/org_proj4_Projections.h