aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorFrank Warmerdam <warmerdam@pobox.com>2013-05-10 03:19:09 +0000
committerFrank Warmerdam <warmerdam@pobox.com>2013-05-10 03:19:09 +0000
commita7bbac84cc8f3b2681d33ecf671a1ce81cee1072 (patch)
treeadc69679d604a44591347ee860206593378c9e3b /src/Makefile.am
parent1a41cfd9f5b4874bed644bf7b2f76c573171564f (diff)
downloadPROJ-a7bbac84cc8f3b2681d33ecf671a1ce81cee1072.tar.gz
PROJ-a7bbac84cc8f3b2681d33ecf671a1ce81cee1072.zip
Major upgrade to geodesic support from Charles Karney (#197).
Syncs geodesic routines with GeographicLib. Adds geodesic.3 man page. geod_* api exposed publically. geodesic.h is installed. git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2333 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index bbf28ba6..c1d1998a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,15 +4,14 @@ EXTRA_PROGRAMS = multistresstest
INCLUDES = -DPROJ_LIB=\"$(pkgdatadir)\" \
-DMUTEX_@MUTEX_SETTING@ @JNI_INCLUDE@
-include_HEADERS = proj_api.h org_proj4_Projections.h org_proj4_PJ.h
+include_HEADERS = proj_api.h org_proj4_Projections.h org_proj4_PJ.h geodesic.h
EXTRA_DIST = makefile.vc proj.def
proj_SOURCES = proj.c gen_cheb.c p_series.c
cs2cs_SOURCES = cs2cs.c gen_cheb.c p_series.c
nad2bin_SOURCES = nad2bin.c
-geod_SOURCES = geod.c geod_set.c geod_interface.c geod_interface.h \
- geodesic.c geodesic.h
+geod_SOURCES = geod.c geod_set.c geod_interface.c geod_interface.h
multistresstest_SOURCES = multistresstest.c
proj_LDADD = libproj.la
@@ -64,8 +63,7 @@ libproj_la_SOURCES = \
nad_cvt.c nad_init.c nad_intr.c emess.c emess.h \
pj_apply_gridshift.c pj_datums.c pj_datum_set.c pj_transform.c \
geocent.c geocent.h pj_utils.c pj_gridinfo.c pj_gridlist.c \
- jniproj.c pj_mutex.c pj_initcache.c pj_apply_vgridshift.c
-
+ jniproj.c pj_mutex.c pj_initcache.c pj_apply_vgridshift.c geodesic.c
install-exec-local:
rm -f $(DESTDIR)$(bindir)/invproj$(EXEEXT)