[COMMITTED] build: make poked to use the same gnulib than poke

[Jose E. Marchesi]

Adding more gnulib instances is problematic.  So this patch makes
poked to use the same gnulib than poke.

Unfortunately, this means poked links to many libraries it really
doesn't need.

Probably the best thing to do in the medium/long term is to have
libpoke, poke and poked each have their own separated source trees.

In the meanwhile this must suffice.

2022-03-08  Jose E. Marchesi  <jemarch@gnu.org>

        * configure.ac: Remove gl-poked/Makefile.
        * Makefile.am (ACLOCAL_AMFLAGS): Do not include m4/poked.
        (SUBDIRS): Remove gl-poked.
        * bootstrap.conf (ACLOCAL_FLAGS): Likewise.
        Remove poked_modules.
        * poked/Makefile.am (poked_LDADD): Use the gnulib in gl/.
---
 ChangeLog         |  9 +++++++++
 Makefile.am       |  4 ++--
 bootstrap.conf    | 11 ++---------
 configure.ac      |  1 -
 poked/Makefile.am |  2 +-
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 65a520a9..8d39f00f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2022-03-08  Jose E. Marchesi  <jemarch@gnu.org>
 
+       * configure.ac: Remove gl-poked/Makefile.
+       * Makefile.am (ACLOCAL_AMFLAGS): Do not include m4/poked.
+       (SUBDIRS): Remove gl-poked.
+       * bootstrap.conf (ACLOCAL_FLAGS): Likewise.
+       Remove poked_modules.
+       * poked/Makefile.am (poked_LDADD): Use the gnulib in gl/.
+
+2022-03-08  Jose E. Marchesi  <jemarch@gnu.org>
+
        * libpoke/libpoke.c (pk_call): Expose exit_exception in the
        interface.
        * libpoke/libpoke.h: Change prototype accordingly.
diff --git a/Makefile.am b/Makefile.am
index c214f608..ad408f06 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
-ACLOCAL_AMFLAGS = -I m4 -I m4/poked -I m4/libpoke
-SUBDIRS = jitter gl maps pickles gl-libpoke gl-poked libpoke poke poked utils \
+ACLOCAL_AMFLAGS = -I m4 -I m4/libpoke
+SUBDIRS = jitter gl maps pickles gl-libpoke libpoke poke poked utils \
           doc man testsuite etc po
 
 EXTRA_DIST = INSTALL.generic DEPENDENCIES
diff --git a/bootstrap.conf b/bootstrap.conf
index 750330ee..8a16795c 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-# gnulib modules used for this project.
+# gnulib modules used by poke and poked.
 gnulib_modules="
   accept
   access
@@ -68,10 +68,6 @@ gnulib_modules="
   vsnprintf-posix
   "
 
-# gnulib modules used in poked/.
-poked_modules="
-"
-
 # gnulib modules used in libpoke/.
 libpoke_modules="
   basename-lgpl
@@ -132,7 +128,7 @@ gnulib_name=libgnu
 
 # Support for additional gnulib-tool invocations
 # (keep this consistent with ACLOCAL_AMFLAGS in Makefile.am)
-ACLOCAL_FLAGS='-I m4/poked -I m4/libpoke'
+ACLOCAL_FLAGS='-I m4/libpoke'
 
 checkout_only_file=
 
@@ -223,9 +219,6 @@ bootstrap_post_import_hook ()
   # create gl-libpoke
   "${GNULIB_SRCDIR}"/gnulib-tool --import --lib=libgnu 
--source-base=gl-libpoke --m4-base=m4/libpoke --doc-base=doc 
--aux-dir=build-aux --no-conditional-dependencies --libtool --without-tests 
--macro-prefix=libpoke ${libpoke_modules}
 
-  # create gl-poked
-  "${GNULIB_SRCDIR}"/gnulib-tool --import --lib=libgnu --source-base=gl-poked 
--m4-base=m4/poked --doc-base=doc --aux-dir=build-aux 
--no-conditional-dependencies --libtool --without-tests --macro-prefix=poked 
${poked_modules}
-
   if $use_git && test -d .git && check_exists git; then
     echo 'Updating the Jitter submodule'
     git submodule update --init -- ./jitter
diff --git a/configure.ac b/configure.ac
index 85919e9c..3ee06bad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -251,7 +251,6 @@ dnl Generate output files
 AC_CONFIG_FILES(Makefile
                 gl/Makefile
                 gl-libpoke/Makefile
-                gl-poked/Makefile
                 libpoke/Makefile
                 poke/Makefile
                 poked/Makefile
diff --git a/poked/Makefile.am b/poked/Makefile.am
index 15596f39..f5e3b54e 100644
--- a/poked/Makefile.am
+++ b/poked/Makefile.am
@@ -36,7 +36,7 @@ poked_CPPFLAGS = -I$(top_srcdir)/common \
                  -I$(top_srcdir)/libpoke -I$(top_builddir)/libpoke \
                  -DPKGDATADIR=\"$(pkgdatadir)\"
 poked_CFLAGS = -Wall
-poked_LDADD = $(top_builddir)/gl-poked/libgnu.la \
+poked_LDADD = $(top_builddir)/gl/libgnu.la \
               $(top_builddir)/libpoke/libpoke.la \
               -lpthread
 poked_LDFLAGS =
-- 
2.11.0