diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-10-11 11:19:02 +0200 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2018-10-11 11:19:02 +0200 |
| commit | 0e3debf173bfe9d9dccf337a5c41fe2e1bf1ded3 (patch) | |
| tree | 65c85a6fd82d8410f5fe743965f1b5d1b2d15a71 /data | |
| parent | e649eb7369caa87f0e5e8076fb7bffe72485b646 (diff) | |
| parent | 6c203a4395f30eae4f49230d2e2cb7652006b959 (diff) | |
| download | PROJ-0e3debf173bfe9d9dccf337a5c41fe2e1bf1ded3.tar.gz PROJ-0e3debf173bfe9d9dccf337a5c41fe2e1bf1ded3.zip | |
Merge remote-tracking branch 'osgeo/master' into bertin1953
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | data/makefile.vc | 32 |
2 files changed, 1 insertions, 33 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index c77efc8b..917e113a 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -10,7 +10,7 @@ EXTRA_DIST = GL27 nad.lst proj_def.dat nad27 nad83 \ esri.extra other.extra \ CH IGNF \ ITRF2000 ITRF2008 ITRF2014 \ - makefile.vc CMakeLists.txt tests/test_nodata.gtx null.lla + CMakeLists.txt tests/test_nodata.gtx null.lla process-nad2bin: @if [ -f $(DATAPATH)/null.lla -a ! -f null ] || [ -f $(DATAPATH)/conus.lla -a ! -f conus ] ; then \ diff --git a/data/makefile.vc b/data/makefile.vc deleted file mode 100644 index e235e8d8..00000000 --- a/data/makefile.vc +++ /dev/null @@ -1,32 +0,0 @@ -# -# makefile.vc - builds PROJ.4 library with Visual C++ -# - -!INCLUDE ..\nmake.opt - -OLD_GRIDS = conus MD TN WI WO alaska hawaii prvi stgeorge stlrnc stpaul null - -OTHER_FILES = FL GL27 nad.lst nad27 nad83 proj_def.dat world epsg esri \ - esri.extra other.extra IGNF ITRF2000 ITRF2008 ITRF2014 - - - -default: - if exist conus.lla $(MAKE) /f makefile.vc nadshift - -nadshift: - for %f in ( $(OLD_GRIDS) ) do ..\src\nad2bin.exe %f < %f.lla - -clean: - -for %f in ( $(OLD_GRIDS) ) do del %f - -install-nadgrids: - for %f in ( $(OLD_GRIDS) ) do copy %f $(PROJ_LIB_DIR) - -install-all: - -mkdir $(INSTDIR) - -mkdir $(PROJ_LIB_DIR) - for %f in ( $(OTHER_FILES) ) do copy %f $(PROJ_LIB_DIR) - if exist conus $(MAKE) /f makefile.vc install-nadgrids - -copy *.gsb $(PROJ_LIB_DIR) - -copy ntv1_can.dat $(PROJ_LIB_DIR) |