diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2013-05-10 03:19:09 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2013-05-10 03:19:09 +0000 |
| commit | a7bbac84cc8f3b2681d33ecf671a1ce81cee1072 (patch) | |
| tree | adc69679d604a44591347ee860206593378c9e3b /src/Makefile.in | |
| parent | 1a41cfd9f5b4874bed644bf7b2f76c573171564f (diff) | |
| download | PROJ-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.in')
| -rw-r--r-- | src/Makefile.in | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index eae1c90c..dd32d94b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -107,7 +107,7 @@ am_libproj_la_OBJECTS = PJ_aeqd.lo PJ_gnom.lo PJ_laea.lo \ pj_apply_gridshift.lo pj_datums.lo pj_datum_set.lo \ pj_transform.lo geocent.lo pj_utils.lo pj_gridinfo.lo \ pj_gridlist.lo jniproj.lo pj_mutex.lo pj_initcache.lo \ - pj_apply_vgridshift.lo + pj_apply_vgridshift.lo geodesic.lo libproj_la_OBJECTS = $(am_libproj_la_OBJECTS) libproj_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -118,7 +118,7 @@ am_cs2cs_OBJECTS = cs2cs.$(OBJEXT) gen_cheb.$(OBJEXT) \ cs2cs_OBJECTS = $(am_cs2cs_OBJECTS) cs2cs_DEPENDENCIES = libproj.la am_geod_OBJECTS = geod.$(OBJEXT) geod_set.$(OBJEXT) \ - geod_interface.$(OBJEXT) geodesic.$(OBJEXT) + geod_interface.$(OBJEXT) geod_OBJECTS = $(am_geod_OBJECTS) geod_DEPENDENCIES = libproj.la am_multistresstest_OBJECTS = multistresstest.$(OBJEXT) @@ -270,14 +270,12 @@ top_srcdir = @top_srcdir@ 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 cs2cs_LDADD = libproj.la @@ -325,7 +323,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 all: proj_config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -583,7 +581,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geod.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geod_interface.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geod_set.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geodesic.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geodesic.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jniproj.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mk_cheby.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multistresstest.Po@am__quote@ |