aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2021-10-09 19:13:50 +0200
committerEven Rouault <even.rouault@spatialys.com>2021-10-09 19:26:36 +0200
commit94414d32bb1965ab61b49d341167a22fc3b9d358 (patch)
treeeebff9ef0fc1318801aa08f23a90e4724ff6ebf4
parent71794914928d0d2649922d090fba1230981ddd1f (diff)
downloadPROJ-94414d32bb1965ab61b49d341167a22fc3b9d358.tar.gz
PROJ-94414d32bb1965ab61b49d341167a22fc3b9d358.zip
autoconf build: build invproj and invgeod in build directory
Due to libtool wrapper scripts, it is easier to build fully fledged binaries. The installed binaries will be symlinks, as before.
-rw-r--r--src/Makefile.am6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index bae922d5..f58e7602 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,10 +21,12 @@ EXTRA_DIST = bin_cct.cmake bin_gie.cmake bin_cs2cs.cmake \
apps/projsync.cpp
proj_SOURCES = apps/proj.cpp apps/emess.cpp apps/utils.cpp
+invproj_SOURCES = $(proj_SOURCES)
projinfo_SOURCES = apps/projinfo.cpp
cs2cs_SOURCES = apps/cs2cs.cpp apps/emess.cpp apps/utils.cpp
cct_SOURCES = apps/cct.cpp apps/proj_strtod.cpp apps/proj_strtod.h apps/optargpm.h
geod_SOURCES = apps/geod.cpp apps/geod_set.cpp apps/geod_interface.cpp apps/geod_interface.h apps/emess.cpp
+invgeod_SOURCES = $(geod_SOURCES)
if HAVE_CURL
projsync_SOURCES = apps/projsync.cpp
@@ -33,6 +35,7 @@ PROJSYNC_BIN = projsync
endif
bin_PROGRAMS = proj geod cs2cs gie cct projinfo $(PROJSYNC_BIN)
+noinst_PROGRAMS = invproj invgeod
gie_SOURCES = apps/gie.cpp apps/proj_strtod.cpp apps/proj_strtod.h apps/optargpm.h
multistresstest_SOURCES = tests/multistresstest.cpp
@@ -41,7 +44,9 @@ geodtest_SOURCES = tests/geodtest.cpp
cct_LDADD = libproj.la
cs2cs_LDADD = libproj.la
geod_LDADD = libproj.la
+invgeod_LDADD = $(geod_LDADD)
proj_LDADD = libproj.la
+invproj_LDADD = $(proj_LDADD)
projinfo_LDADD = libproj.la
gie_LDADD = libproj.la
@@ -272,7 +277,6 @@ wkt2_parser:
sed "s/\*yyssp = yystate/\*yyssp = (yytype_int16)yystate/" < $(top_srcdir)/src/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++)/"| sed "s/return yystpcpy (yyres, yystr) - yyres;/return (YYPTRDIFF_T)(yystpcpy (yyres, yystr) - yyres);/" | sed "s/YYPTRDIFF_T yysize = yyssp - yyss + 1;/YYPTRDIFF_T yysize = (YYPTRDIFF_T)(yyssp - yyss + 1);/"> $(top_srcdir)/src/wkt2_generated_parser.c.tmp
mv $(top_srcdir)/src/wkt2_generated_parser.c.tmp $(top_srcdir)/src/wkt2_generated_parser.c
-
install-exec-local: install-binPROGRAMS
rm -f $(DESTDIR)$(bindir)/invproj$(EXEEXT)
(cd $(DESTDIR)$(bindir); ln -s proj$(EXEEXT) invproj$(EXEEXT))