diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-02-04 14:48:52 +0100 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2019-02-04 20:30:12 +0100 |
| commit | d6aaddc5e0cb2bd9080a8fc4b77de947172c81d8 (patch) | |
| tree | d5f76a37e4cadc6fff0e1b86a487209aa5057bbb /data/Makefile.am | |
| parent | 2e6dde7a7eae34b8f93c078480db077891f03068 (diff) | |
| download | PROJ-d6aaddc5e0cb2bd9080a8fc4b77de947172c81d8.tar.gz PROJ-d6aaddc5e0cb2bd9080a8fc4b77de947172c81d8.zip | |
Remove all traces of nad2bin and nad2nad
The source material for the default grids used by
PROJ has been moved to the proj-datumgrid repository. For that
reason it is no longer necessary to include the nad2bin program
in the PROJ repository and source distribution. From now on the
nad2bin application will be kept in the proj-datumgrid repo.
Previously the null grid was generated by running nad2bin on the
null.lla file. Since nad2bin is no longer available null.lla has
been replaced by its binary counterpart null. This file will be
distributed and installed alongside PROJ.
Build scripts and documenation has been adjusted so that nad2bin
is not mentioned anywhere. Additionally all references to nad2nad
has been removed as well. nad2nad has not been part of the PROJ
distribution for quite some time so this has been long overdue.
Diffstat (limited to 'data/Makefile.am')
| -rw-r--r-- | data/Makefile.am | 32 |
1 files changed, 5 insertions, 27 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 3e98e59f..8234c034 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,7 +1,7 @@ DATAPATH = $(top_srcdir)/data pkgdata_DATA = GL27 nad.lst nad27 nad83 world other.extra \ - CH \ + CH null \ ITRF2000 ITRF2008 ITRF2014 proj.db SQL_ORDERED_LIST = sql/begin.sql \ @@ -40,34 +40,12 @@ EXTRA_DIST = GL27 nad.lst nad27 nad83 \ world other.extra \ CH \ ITRF2000 ITRF2008 ITRF2014 \ - CMakeLists.txt tests/test_nodata.gtx null.lla \ + CMakeLists.txt tests/test_nodata.gtx null \ generate_all_sql_in.cmake sql_filelist.cmake \ $(SQL_ORDERED_LIST) -process-nad2bin: - @if [ -f $(DATAPATH)/null.lla -a ! -f null ] || [ -f $(DATAPATH)/conus.lla -a ! -f conus ] ; then \ - for x in $(DATAPATH)/*.lla ; do \ - DEST=`basename $$x .lla`; \ - echo "../src/nad2bin$(EXEEXT) $$DEST < $$x"; \ - ../src/nad2bin$(EXEEXT) $$DEST < $$x ; \ - done; \ - fi - -install-data-local: process-nad2bin +install-data-local: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) - @if [ -f $(DATAPATH)/null.lla -a ! -f $(DATAPATH)/null ] || [ -f $(DATAPATH)/conus.lla -a ! -f $(DATAPATH)/conus ] ; then \ - for x in $(DATAPATH)/*.lla ; do \ - DEST=$(DESTDIR)$(pkgdatadir)/`basename $$x .lla`; \ - echo "../src/nad2bin$(EXEEXT) $$DEST < $$x"; \ - ../src/nad2bin$(EXEEXT) $$DEST < $$x ; \ - if [ $$? -ne 0 ] ; then \ - echo "nad2bin$(EXEEXT) failed to install $$DEST"; \ - exit 1; \ - fi; \ - done; \ - else \ - echo "nad2nad NADCON source files not present"; \ - fi @for gridfile in $(DATAPATH)/*.gsb $(DATAPATH)/*.gtx $(DATAPATH)/ntv1_can.dat dummy \ $(DATAPATH)/alaska $(DATAPATH)/conus $(DATAPATH)/hawaii $(DATAPATH)/null \ $(DATAPATH)/prvi $(DATAPATH)/stgeorge $(DATAPATH)/stlrnc $(DATAPATH)/stpaul \ @@ -97,9 +75,9 @@ proj.db: $(DATAPATH)/sql/*.sql exit 1; \ fi - + # For out-of-tree builds, link all file of the source data dir to the generated data -check-local: process-nad2bin +check-local: @if [ ! -f GL27 ]; then \ for x in $(DATAPATH)/*; do \ ln -sf $$x .; \ |