Remove nmake build system

10 files changed, 25 insertions, 351 deletions

diff --git a/Makefile.am b/Makefile.am
index 9e5787e0..760a4da9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS	=	src man data jniwrap cmake test
 
-EXTRA_DIST = makefile.vc nmake.opt CMakeLists.txt CITATION
+EXTRA_DIST = CMakeLists.txt CITATION
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = proj.pc
diff --git a/README.md b/README.md
index b82db7c2..8767fc01 100644
--- a/README.md
+++ b/README.md
@@ -91,32 +91,6 @@ If you are building from the git repository you have to first run
 
 which will generate a configure script that can be used as described above.
 
-### Building on Windows with NMAKE
-
-PROJ can be built with Microsoft Visual C/C++ using the `makefile.vc`
-in the `PROJ` directory.  First edit the `PROJ\nmake.opt` and
-modify the `INSTDIR` value at the top to point to the directory
-where the PROJ tree shall be installed.
-If you want to install into `C:\PROJ`, it can remain unchanged.
-Then use the `makefile.vc` to build the software e.g.:
-
-    C:\> cd proj
-    C:\PROJ> nmake /f makefile.vc
-    C:\PROJ> nmake /f makefile.vc install-all
-
-Note that you have to have the VC++ environment variables, and path
-setup properly.  This may involve running the `VCVARS32.BAT`
-script out of the Visual C++ tree.
-
-The `makefile.vc` builds `proj.exe`, `proj.dll` and `proj.lib`.
-
-On Windows you have to set the `PROJ_LIB` environment variable to make
-sure that PROJ can find the resource files that it needs. For the
-default install directory you can set `PROJ_LIB` with:
-
-    C:\> set PROJ_LIB=C:\PROJ\share
-
-
 ### Distribution files and format
 
 Sources are distributed in one or more files.  The principle elements
diff --git a/appveyor.yml b/appveyor.yml
index 1fdc27ca..11059e92 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,76 +6,50 @@ environment:
   matrix:
 
 # VS 2015
-  - BUILD_TYPE: cmake
-    VS_VERSION: Visual Studio 14
+  - VS_VERSION: Visual Studio 14
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
 
 # VS 2017
-  - BUILD_TYPE: cmake
-    VS_VERSION: Visual Studio 15
+  - VS_VERSION: Visual Studio 15
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
 
-  - BUILD_TYPE: nmake
-
 shallow_clone: true
 
 build_script:
   - echo build_script
-  - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x86" call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat"
-  - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
-  - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
-  - if "%BUILD_TYPE%" == "nmake" nmake /f makefile.vc
-  - if "%BUILD_TYPE%" == "nmake" nmake /f makefile.vc install-all
-  - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" cd src
-  - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" nmake /f makefile.vc multistresstest.exe
-# Disabled for now as it scales badly
-#  - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" multistresstest.exe
-  - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" cd ..
-  - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x64" SET VS_FULL=%VS_VERSION% Win64
-  - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x86" SET VS_FULL=%VS_VERSION%
-  - if "%BUILD_TYPE%" == "cmake" echo "%VS_FULL%"
+  - if "%platform%" == "x64" SET VS_FULL=%VS_VERSION% Win64
+  - if "%platform%" == "x86" SET VS_FULL=%VS_VERSION%
+  - echo "%VS_FULL%"
 #
-  - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x64" mkdir build_dll
-  - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x64" cd build_dll
-  - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x64" cmake -G "%VS_FULL%" .. -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBPROJ_SHARED=ON -DCMAKE_C_FLAGS="/WX"
-  - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x64" cmake --build . --config Release
-  - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x64" cd ..
+  - if "%platform%" == "x64" mkdir build_dll
+  - if "%platform%" == "x64" cd build_dll
+  - if "%platform%" == "x64" cmake -G "%VS_FULL%" .. -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBPROJ_SHARED=ON -DCMAKE_C_FLAGS="/WX"
+  - if "%platform%" == "x64" cmake --build . --config Release
+  - if "%platform%" == "x64" cd ..
 #
-  - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x86" mkdir build_static
-  - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x86" cd build_static
-  - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x86" cmake -G "%VS_FULL%" .. -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBPROJ_SHARED=OFF -DCMAKE_C_FLAGS="/WX"
-  - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x86" cmake --build . --config Release
-  - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x86" cd ..
+  - if "%platform%" == "x86" mkdir build_static
+  - if "%platform%" == "x86" cd build_static
+  - if "%platform%" == "x86" cmake -G "%VS_FULL%" .. -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBPROJ_SHARED=OFF -DCMAKE_C_FLAGS="/WX"
+  - if "%platform%" == "x86" cmake --build . --config Release
+  - if "%platform%" == "x86" cd ..
 
 test_script:
   - echo test_script
-  - if "%BUILD_TYPE%" == "cmake" set PROJ_LIB=C:\projects\proj-4\data
-  - if "%BUILD_TYPE%" == "nmake" set PROJ_LIB=C:\PROJ\SHARE
-  - if "%BUILD_TYPE%" == "nmake" mkdir %PROJ_LIB%\tests
-  - if "%BUILD_TYPE%" == "nmake" copy data\tests\*.* %PROJ_LIB%\tests
+  - set PROJ_LIB=C:\projects\proj-4\data
   - set CURDIR=%CD%
   - cd %PROJ_LIB%
   - curl -O http://download.osgeo.org/proj/proj-datumgrid-1.7.zip
   - 7z e -aoa -y proj-datumgrid-1.7.zip
   - dir
   - cd ..
-  - if "%BUILD_TYPE%" == "nmake" dir
-  - if "%BUILD_TYPE%" == "nmake" cd bin
-  - if "%BUILD_TYPE%" == "nmake" echo "Contents of current directory:"
-  - if "%BUILD_TYPE%" == "nmake" dir
-  - if "%BUILD_TYPE%" == "nmake" echo "Contents of ..\test\gie:"
-  - if "%BUILD_TYPE%" == "nmake" dir ..\test\gie
-  - if "%BUILD_TYPE%" == "nmake" echo "Contents of PROJ_LIB " %PROJ_LIB%
-  - if "%BUILD_TYPE%" == "nmake" dir %PROJ_LIB%
-  - if "%BUILD_TYPE%" == "nmake" gie.exe ..\test\gie\*.gie ..\test\gigs\*.gie
   - cd %CURDIR%
 #
-  - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x64" cd build_dll
-  - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x64" ctest -C Release
-  - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x64" cd ..
+  - if "%platform%" == "x64" cd build_dll
+  - if "%platform%" == "x64" ctest -C Release
+  - if "%platform%" == "x64" cd ..
 #
-  - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x86" cd build_static
-  - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x86" ctest -C Release
-  - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x86" cd ..
+  - if "%platform%" == "x86" cd build_static
+  - if "%platform%" == "x86" ctest -C Release
+  - if "%platform%" == "x86" cd ..
 
 deploy: off
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)
diff --git a/docs/source/faq.rst b/docs/source/faq.rst
index a03eae31..a218e1a8 100644
--- a/docs/source/faq.rst
+++ b/docs/source/faq.rst
@@ -49,9 +49,6 @@ After downloading and unpacking the PROJ source, also download and unpack the
 set of datum shift files.  See :ref:`download` for instructions how to fetch
 and install these files
 
-On Windows the extra nadshift target must be used.  For instance
-``nmake /f makefile.vc nadshift`` in the ``proj/src`` directory.
-
 A default build and install on Unix will normally build knowledge of the
 directory where the grid shift files are installed into the PROJ library
 (usually ``/usr/local/share/proj``).  On Windows the library is normally built
diff --git a/makefile.vc b/makefile.vc
deleted file mode 100644
index d4fb12bd..00000000
--- a/makefile.vc
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# NMAKE Makefile to build PROJ.4 on Windows
-#
-# This makefile.vc delegates making targets to src\makefile.vc
-# so it's just a thin wrapper.
-#
-MAKE = nmake
-RM = -del
-
-default:    
-	cd src
-	$(MAKE) /f makefile.vc
-	cd ..\data
-	$(MAKE) /f makefile.vc
-	cd ..
-
-clean:	
-	cd src
-	$(MAKE) /f makefile.vc clean
-	cd ..\data
-	$(MAKE) /f makefile.vc clean
-	cd ..
-
-install-all:
-	cd src
-	$(MAKE) /f makefile.vc install
-	cd ..\data
-	$(MAKE) /f makefile.vc install-all
-	cd ..
-
diff --git a/nmake.opt b/nmake.opt
deleted file mode 100644
index edf608e1..00000000
--- a/nmake.opt
+++ /dev/null
@@ -1,38 +0,0 @@
-!IFDEF EXT_NMAKE_OPT
-!INCLUDE $(EXT_NMAKE_OPT)
-!ENDIF
-
-# Directory tree where PROJ will be installed.
-!IFNDEF INSTDIR
-INSTDIR=C:\PROJ
-!ENDIF
-
-# Set the following to the directory where the PROJ distribution data files
-# (ie, the contents of ..\data) are to be installed.  It is possible to later
-# move the data files to another directory, and define the PROJ_LIB
-# environment variable to point to that directory.  It is also possible to
-# have PROJ_LIB name the original data directory of the unpacked PROJ
-# distribution.  Any setting of the PROJ_LIB environment variable takes
-# precedence at runtime over the setting of the PROJ_LIB_DIR macro stored in
-# the compiled software.
-!IFNDEF PROJ_LIB_DIR
-PROJ_LIB_DIR=$(INSTDIR)\SHARE
-!ENDIF
-
-# Uncomment the first for an optimized build, or the second for debug.
-!IFNDEF OPTFLAGS
-!IFNDEF DEBUG
-OPTFLAGS=	/Ox /Op /MD
-!ELSE
-OPTFLAGS=	/Zi /MDd /Fdproj.pdb
-!ENDIF
-!ENDIF
-
-# Uncomment the first for linking exes against DLL or second for static
-EXE_PROJ =	proj_i.lib
-#EXE_PROJ =	proj.lib
-
-# Set the version number for the DLL.  Normally we leave this blank since
-# we want software that is dynamically loading the DLL to have no problem
-# with version numbers.
-VERSION=
diff --git a/src/Makefile.am b/src/Makefile.am
index c1fbc12e..ae5e0a2e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,7 +13,7 @@ AM_CPPFLAGS =	-DPROJ_LIB=\"$(pkgdatadir)\" \
 include_HEADERS = proj.h proj_api.h geodesic.h \
 	org_proj4_PJ.h
 
-EXTRA_DIST = makefile.vc proj.def bin_cct.cmake bin_gie.cmake bin_cs2cs.cmake \
+EXTRA_DIST = proj.def bin_cct.cmake bin_gie.cmake bin_cs2cs.cmake \
 			 bin_geod.cmake bin_nad2bin.cmake bin_proj.cmake \
 			 lib_proj.cmake CMakeLists.txt bin_geodtest.cmake geodtest.c
 
diff --git a/src/makefile.vc b/src/makefile.vc
deleted file mode 100644
index 73c68c0f..00000000
--- a/src/makefile.vc
+++ /dev/null
@@ -1,171 +0,0 @@
-#
-# makefile.vc - builds PROJ.4 library with Visual C++
-#
-!INCLUDE ..\nmake.opt
-
-azimuthal = \
-	PJ_aeqd.obj PJ_gnom.obj PJ_laea.obj PJ_mod_ster.obj \
-	PJ_nsper.obj PJ_nzmg.obj PJ_ortho.obj PJ_stere.obj PJ_sterea.obj \
-	proj_rouss.obj
-
-conic = \
-	PJ_aea.obj PJ_bipc.obj PJ_bonne.obj PJ_eqdc.obj \
-	PJ_imw_p.obj PJ_lcc.obj PJ_poly.obj \
-	PJ_rpoly.obj PJ_sconics.obj PJ_lcca.obj PJ_ccon.obj
-
-cylinder = \
-	PJ_cass.obj PJ_cc.obj PJ_cea.obj PJ_eqc.obj \
-	PJ_gall.obj PJ_labrd.obj PJ_lsat.obj PJ_misrsom.obj PJ_merc.obj \
-	PJ_mill.obj PJ_ocea.obj PJ_omerc.obj PJ_patterson.obj PJ_somerc.obj \
-	PJ_tcc.obj PJ_tcea.obj PJ_tmerc.obj PJ_geos.obj \
-	PJ_gstmerc.obj proj_etmerc.obj PJ_comill.obj
-
-misc = \
-	PJ_airy.obj PJ_aitoff.obj PJ_august.obj PJ_bacon.obj \
-	PJ_chamb.obj PJ_hammer.obj PJ_lagrng.obj PJ_larr.obj \
-	PJ_lask.obj PJ_nocol.obj PJ_ob_tran.obj PJ_oea.obj \
-	PJ_sch.obj PJ_tpeqd.obj PJ_vandg.obj PJ_vandg2.obj \
-    PJ_vandg4.obj PJ_wag7.obj PJ_latlong.obj PJ_krovak.obj \
-    PJ_geoc.obj pj_geocent.obj PJ_healpix.obj PJ_qsc.obj
-
-pseudo = \
-	PJ_boggs.obj PJ_collg.obj PJ_crast.obj PJ_denoy.obj \
-	PJ_eck1.obj PJ_eck2.obj PJ_eck3.obj PJ_eck4.obj \
-	PJ_eck5.obj PJ_fahey.obj PJ_fouc_s.obj PJ_gins8.obj \
-	PJ_gn_sinu.obj PJ_goode.obj PJ_igh.obj PJ_hatano.obj PJ_loxim.obj \
-	PJ_mbt_fps.obj PJ_mbtfpp.obj PJ_mbtfpq.obj PJ_moll.obj \
-	PJ_nell.obj PJ_nell_h.obj PJ_putp2.obj PJ_putp3.obj \
-	PJ_putp4p.obj PJ_putp5.obj PJ_putp6.obj PJ_robin.obj \
-	PJ_sts.obj PJ_urm5.obj PJ_urmfps.obj PJ_wag2.obj \
-	PJ_wag3.obj PJ_wink1.obj PJ_wink2.obj PJ_isea.obj \
-	PJ_calcofi.obj PJ_natearth.obj PJ_natearth2.obj PJ_times.obj \
-	PJ_eqearth.obj
-
-support = \
-	aasincos.obj adjlon.obj bch2bps.obj bchgen.obj pj_gauss.obj \
-	biveval.obj dmstor.obj mk_cheby.obj pj_auth.obj \
-	pj_deriv.obj pj_ell_set.obj pj_ellps.obj pj_errno.obj \
-	pj_factors.obj pj_fwd.obj pj_init.obj pj_inv.obj \
-	pj_list.obj pj_malloc.obj pj_mlfn.obj pj_msfn.obj \
-	pj_open_lib.obj pj_param.obj pj_phi2.obj pj_pr_list.obj \
-	pj_qsfn.obj pj_strerrno.obj pj_tsfn.obj pj_units.obj \
-	pj_zpoly1.obj rtodms.obj vector1.obj pj_release.obj \
-	geocent.obj pj_transform.obj pj_datum_set.obj pj_datums.obj \
-	pj_apply_gridshift.obj pj_gc_reader.obj pj_gridcatalog.obj \
-	nad_cvt.obj nad_init.obj nad_intr.obj \
-	pj_utils.obj pj_gridlist.obj pj_gridinfo.obj \
-	proj_mdist.obj pj_mutex.obj pj_initcache.obj \
-	pj_ctx.obj pj_fileapi.obj pj_log.obj pj_apply_vgridshift.obj \
-	pj_strtod.obj pj_internal.obj pj_math.obj
-
-pipeline = \
-	proj_4D_api.obj PJ_cart.obj PJ_pipeline.obj PJ_horner.obj PJ_helmert.obj \
-	PJ_vgridshift.obj PJ_hgridshift.obj PJ_unitconvert.obj PJ_molodensky.obj \
-	PJ_deformation.obj PJ_axisswap.obj PJ_affine.obj
-
-geodesic = geodesic.obj
-
-LIBOBJ	=	$(support) $(pseudo) $(azimuthal) $(conic) $(cylinder) $(misc) \
-	$(geodesic) $(pipeline)
-PROJEXE_OBJ	= proj.obj gen_cheb.obj p_series.obj emess.obj
-CS2CSEXE_OBJ	= cs2cs.obj gen_cheb.obj p_series.obj emess.obj
-GEODEXE_OBJ	= geod.obj geod_set.obj geod_interface.obj emess.obj
-CCTEXE_OBJ = cct.obj proj_strtod.obj
-GIEEXE_OBJ = gie.obj proj_strtod.obj
-
-MULTISTRESSTEST_OBJ = multistresstest.obj
-PROJ_DLL 	= proj$(VERSION).dll
-PROJ_EXE    = proj.exe
-CS2CS_EXE   = cs2cs.exe
-GEOD_EXE    = geod.exe
-CCT_EXE     = cct.exe
-GIE_EXE     = gie.exe
-NAD2BIN_EXE = nad2bin.exe
-MULTISTRESSTEST_EXE = multistresstest.exe
-
-CFLAGS	=	/nologo -I. -DPROJ_LIB=\"$(PROJ_LIB_DIR)\" \
-		-DHAVE_STRERROR=1 -DHAVE_LOCALECONV=1 $(OPTFLAGS)
-
-default:	all
-
-all: proj.lib $(PROJ_EXE) $(CS2CS_EXE) $(GEOD_EXE) $(CCT_EXE) $(GIE_EXE) $(NAD2BIN_EXE)
-
-proj.lib:	$(LIBOBJ)
-	if exist proj.lib del proj.lib
-	lib /out:proj.lib $(LIBOBJ)
-
-$(PROJ_DLL):	proj_i.lib
-
-proj_i.lib:	$(LIBOBJ)
-	link /debug /dll /def:proj.def /out:$(PROJ_DLL) /implib:proj_i.lib \
-			$(LIBOBJ)
-	if exist $(PROJ_DLL).manifest mt -manifest $(PROJ_DLL).manifest -outputresource:$(PROJ_DLL);2
-
-$(PROJ_EXE):	$(PROJEXE_OBJ) $(EXE_PROJ)
-	cl $(PROJEXE_OBJ) $(EXE_PROJ) /link setargv.obj
-	if exist $(PROJ_EXE).manifest mt -manifest $(PROJ_EXE).manifest -outputresource:$(PROJ_EXE);1
-
-$(CS2CS_EXE):	$(CS2CSEXE_OBJ) $(EXE_PROJ)
-	cl $(CS2CSEXE_OBJ) $(EXE_PROJ) /link setargv.obj
-	if exist $(CS2CS_EXE).manifest mt -manifest $(CS2CS_EXE).manifest -outputresource:$(CS2CS_EXE);1
-
-$(GEOD_EXE):	$(GEODEXE_OBJ) $(EXE_PROJ)
-	cl $(GEODEXE_OBJ) $(EXE_PROJ) /link setargv.obj
-	if exist $(GEOD_EXE).manifest mt -manifest $(GEOD_EXE).manifest -outputresource:$(GEOD_EXE);1
-
-$(CCT_EXE):	$(CCTEXE_OBJ) $(EXE_PROJ)
-	cl $(CCTEXE_OBJ) $(EXE_PROJ) /link setargv.obj
-	if exist $(CCT_EXE).manifest mt -manifest $(CCT_EXE).manifest -outputresource:$(CCT_EXE);1
-
-$(GIE_EXE):	$(GIEEXE_OBJ) $(EXE_PROJ)
-	cl $(GIEEXE_OBJ) $(EXE_PROJ) /link setargv.obj
-	if exist $(GIE_EXE).manifest mt -manifest $(GIE_EXE).manifest -outputresource:$(GIE_EXE);1
-
-$(NAD2BIN_EXE):	nad2bin.obj emess.obj $(EXE_PROJ)
-	cl nad2bin.obj emess.obj $(EXE_PROJ) /link setargv.obj
-
-$(MULTISTRESSTEST_EXE): $(MULTISTRESSTEST_OBJ)
-	cl $(MULTISTRESSTEST_OBJ) $(EXE_PROJ)
-	if exist $(MULTISTRESSTEST_EXE).manifest mt -manifest $(MULTISTRESSTEST_EXE).manifest -outputresource:$(MULTISTRESSTEST_EXE);1
-
-nadshift:	nad2bin.exe
-	cd ..\data
-	..\src\nad2bin.exe < conus.lla conus
-	..\src\nad2bin.exe < MD.lla MD
-	..\src\nad2bin.exe < TN.lla TN
-	..\src\nad2bin.exe < WI.lla WI
-	..\src\nad2bin.exe < WO.lla WO
-	..\src\nad2bin.exe < alaska.lla alaska
-	..\src\nad2bin.exe < hawaii.lla hawaii
-	..\src\nad2bin.exe < prvi.lla prvi
-	..\src\nad2bin.exe < stgeorge.lla stgeorge
-	..\src\nad2bin.exe < stlrnc.lla stlrnc
-	..\src\nad2bin.exe < stpaul.lla stpaul
-	..\src\nad2bin.exe < null.lla null
-	cd ..\src
-
-clean:
-	del *.dll
-	del *.exe
-	del *.exp
-	del *.manifest
-	del *.lib
-	del *.obj
-	del *.pdb
-
-install: all
-	-mkdir $(INSTDIR)
-	-mkdir $(INSTDIR)\bin
-	-mkdir $(INSTDIR)\share
-	-mkdir $(INSTDIR)\lib
-	-mkdir $(INSTDIR)\include
-	-mkdir $(INSTDIR)\test
-	-mkdir $(INSTDIR)\test\gie
-	copy *.exe $(INSTDIR)\bin
-	copy *.dll $(INSTDIR)\bin
-	copy *.lib $(INSTDIR)\lib
-	copy proj.h     $(INSTDIR)\include
-	copy proj_api.h $(INSTDIR)\include
-	copy projects.h $(INSTDIR)\include
-	copy geodesic.h $(INSTDIR)\include
-	copy ..\test\gie\*.gie $(INSTDIR)\test\gie