aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorKristian Evers <kristianevers@gmail.com>2018-10-08 19:30:33 +0200
committerGitHub <noreply@github.com>2018-10-08 19:30:33 +0200
commit425cfd0f59c414d18cb5050f8560fb54310cf507 (patch)
treeb9fccd60a412f92fb66ff55252866c2dbfae41ff /data
parent31025ac9d8c4ff406bb4b4f36c7557a56d23bf33 (diff)
parentd4a1ea307207b0d28d4a139c881302198d296d33 (diff)
downloadPROJ-425cfd0f59c414d18cb5050f8560fb54310cf507.tar.gz
PROJ-425cfd0f59c414d18cb5050f8560fb54310cf507.zip
Merge pull request #1137 from rouault/drop_nmake
Remove nmake build system
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am2
-rw-r--r--data/makefile.vc32
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)