diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2018-12-17 19:30:34 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2018-12-17 20:01:05 +0100 |
| commit | 898b8595276779cd8613e0c4b267181a76acecab (patch) | |
| tree | ff1bfd55bd1919ca28ffb335470d0f901d0de09c /src/Makefile.am | |
| parent | dcb58eb624f87fad1362bfc593b274f84fa44889 (diff) | |
| download | PROJ-898b8595276779cd8613e0c4b267181a76acecab.tar.gz PROJ-898b8595276779cd8613e0c4b267181a76acecab.zip | |
Add WKT2 grammar validation
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 9cf1eb88..02b30c7d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,7 +16,7 @@ include_HEADERS = proj.h proj_experimental.h proj_constants.h proj_api.h geodesi EXTRA_DIST = bin_cct.cmake bin_gie.cmake bin_cs2cs.cmake \ bin_geod.cmake bin_nad2bin.cmake bin_proj.cmake bin_projinfo.cmake \ lib_proj.cmake CMakeLists.txt bin_geodtest.cmake geodtest.c \ - pj_wkt1_grammar.y + pj_wkt1_grammar.y pj_wkt2_grammar.y proj_SOURCES = proj.c gen_cheb.c p_series.c projinfo_SOURCES = projinfo.cpp @@ -96,8 +96,11 @@ libproj_la_SOURCES = \ proj_4D_api.c PJ_cart.c PJ_pipeline.c PJ_horner.c PJ_helmert.c \ PJ_vgridshift.c PJ_hgridshift.c PJ_unitconvert.c PJ_molodensky.c \ PJ_deformation.c pj_internal.c PJ_axisswap.c PJ_affine.c \ + pj_wkt_parser.hpp pj_wkt_parser.cpp \ pj_wkt1_parser.h pj_wkt1_parser.cpp \ - pj_wkt1_generated_parser.h pj_wkt1_generated_parser.c + pj_wkt1_generated_parser.h pj_wkt1_generated_parser.c \ + pj_wkt2_parser.h pj_wkt2_parser.cpp \ + pj_wkt2_generated_parser.h pj_wkt2_generated_parser.c # The sed hack is to please MSVC @@ -106,6 +109,11 @@ wkt1_parser: sed "s/\*yyssp = yystate/\*yyssp = (yytype_int16)yystate/" < $(top_srcdir)/src/pj_wkt1_generated_parser.c | sed "s/yyerrorlab:/#if 0\nyyerrorlab:/" | sed "s/yyerrlab1:/#endif\nyyerrlab1:/" | sed "s/for (yylen = 0; yystr\[yylen\]; yylen++)/for (yylen = 0; yystr \&\& yystr\[yylen\]; yylen++)/" > $(top_srcdir)/src/pj_wkt1_generated_parser.c.tmp mv $(top_srcdir)/src/pj_wkt1_generated_parser.c.tmp $(top_srcdir)/src/pj_wkt1_generated_parser.c +wkt2_parser: + bison --no-lines -d -p pj_wkt2_ -o$(top_srcdir)/src/pj_wkt2_generated_parser.c $(top_srcdir)/src/pj_wkt2_grammar.y + sed "s/\*yyssp = yystate/\*yyssp = (yytype_int16)yystate/" < $(top_srcdir)/src/pj_wkt2_generated_parser.c | sed "s/yyerrorlab:/#if 0\nyyerrorlab:/" | sed "s/yyerrlab1:/#endif\nyyerrlab1:/" | sed "s/for (yylen = 0; yystr\[yylen\]; yylen++)/for (yylen = 0; yystr \&\& yystr\[yylen\]; yylen++)/" > $(top_srcdir)/src/pj_wkt2_generated_parser.c.tmp + mv $(top_srcdir)/src/pj_wkt2_generated_parser.c.tmp $(top_srcdir)/src/pj_wkt2_generated_parser.c + install-exec-local: rm -f $(DESTDIR)$(bindir)/invproj$(EXEEXT) |