Re: [PATCH] Make own set of gnulib modules for libpoke

[Jose E. Marchesi]

Hi Tim.
OK for master.
Thanks!

    2020-05-05  Tim Rühsen  <address@hidden>
    
            * .gitignore: Add /gl-libpoke.
            * Makefile.am: Add gl-libpoke to SUBDIRS.
            * bootstrap.conf: Invoke gnulib-tool to generate gl-libpoke.
            Cleanup gnulib module lists.
            Remove --lgpl=3 from gnulib-tool invocation.
            * configure.ac: Add m4/libpoke to AC_CONFIG_MACRO_DIRS.
            Add libpoke_EARLY.
            Add gl-libpoke/Makefile to AC_CONFIG_FILES.
            * libpoke/Makefile.am: Use gl-libpoke/libgnu.la in 
libpoke_la_LIBADD.
    ---
     .gitignore          |  1 +
     ChangeLog           | 12 ++++++++++++
     Makefile.am         |  2 +-
     bootstrap.conf      | 34 +++++++++++++++++++++++++++-------
     configure.ac        |  2 ++
     libpoke/Makefile.am |  4 ++--
     6 files changed, 45 insertions(+), 10 deletions(-)
    
    diff --git a/.gitignore b/.gitignore
    index 367050f9..f814af6e 100644
    --- a/.gitignore
    +++ b/.gitignore
    @@ -22,6 +22,7 @@ config.h.in
     /configure.lineno
     /gl
     /gl-libutils
    +/gl-libpoke
     /po/.gitignore
     /po/.reference
     /po/LINGUAS
    diff --git a/Makefile.am b/Makefile.am
    index 6c4a2aa3..77200dc2 100644
    --- a/Makefile.am
    +++ b/Makefile.am
    @@ -1,5 +1,5 @@
     ACLOCAL_AMFLAGS = -I m4
    -SUBDIRS = jitter gl pickles gl-libutils libutils libpoke poke doc man 
testsuite etc po
    +SUBDIRS = jitter gl pickles gl-libutils libutils gl-libpoke libpoke poke 
doc man testsuite etc po
    
     noinst_SCRIPTS = run
    
    diff --git a/bootstrap.conf b/bootstrap.conf
    index d7888f21..5abd4767 100644
    --- a/bootstrap.conf
    +++ b/bootstrap.conf
    @@ -24,23 +24,19 @@ gnulib_modules="
       byteswap
       findprog
       fstat
    -  gcd
       gendocs
       gethostname
       getline
       getopt-gnu
       isatty
       libtextstyle-optional
    -  list
       maintainer-makefile
       mkstemp
       parse-datetime
       pmccabe2html
    -  pathmax
       printf-posix
       progname
       pthread
    -  random
       readline
       secure_getenv
       socket
    @@ -48,8 +44,6 @@ gnulib_modules="
       stdbool
       strchrnul
       streq
    -  strtoull
    -  tempname
       tmpdir
       unlink
       update-copyright
    @@ -66,6 +60,29 @@ libutils_modules="
       stddef
       strerror
       strstr
    +  xalloc
    +  "
    +
    +# gnulib modules used in libpoke/.
    +libpoke_modules="
    +  fstat
    +  gcd
    +  gettext-h
    +  isatty
    +  mkstemp
    +  printf-posix
    +  random
    +  snprintf
    +  stdarg
    +  stdbool
    +  stddef
    +  strchrnul
    +  streq
    +  strtoull
    +  tempname
    +  tmpdir
    +  xalloc
    +  xstrndup
       "
    
     # TODO: Remove this after the 1.0 release. Until then, this helps 
developers
    @@ -134,7 +151,10 @@ makeinfo    6.0
     bootstrap_post_import_hook ()
     {
       # create gl-libutils
    -  ${GNULIB_SRCDIR}/gnulib-tool --import --lib=libgnu 
--source-base=gl-libutils --m4-base=m4/libutils --doc-base=doc 
--aux-dir=build-aux --lgpl=3 --no-conditional-dependencies --libtool 
--without-tests --macro-prefix=libutils ${libutils_modules}
    +  ${GNULIB_SRCDIR}/gnulib-tool --import --lib=libgnu 
--source-base=gl-libutils --m4-base=m4/libutils --doc-base=doc 
--aux-dir=build-aux --no-conditional-dependencies --libtool --without-tests 
--macro-prefix=libutils ${libutils_modules}
    +
    +  # 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}
    
       echo 'Updating the Jitter submodule'
       git submodule update --init -- ./jitter
    diff --git a/configure.ac b/configure.ac
    index f44ff941..b7b5dba0 100644
    --- a/configure.ac
    +++ b/configure.ac
    @@ -36,6 +36,7 @@ dnl AB_INIT
     AC_PROG_CC
     gl_EARLY
     libutils_EARLY
    +libpoke_EARLY
    
     LT_INIT
     AC_PROG_CC_C99
    @@ -130,6 +131,7 @@ dnl Generate output files
     AC_CONFIG_FILES(Makefile
                     gl/Makefile
                     gl-libutils/Makefile
    +                gl-libpoke/Makefile
                     libutils/Makefile
                     libpoke/Makefile
                     poke/Makefile
    diff --git a/libpoke/Makefile.am b/libpoke/Makefile.am
    index 26dbb11d..64d96473 100644
    --- a/libpoke/Makefile.am
    +++ b/libpoke/Makefile.am
    @@ -75,14 +75,14 @@ MOSTLYCLEANFILES += pkl-tab.output
    
     AM_LFLAGS = -d
    
    -libpoke_la_CPPFLAGS = -I$(top_builddir)/gl -I$(top_srcdir)/gl \
    +libpoke_la_CPPFLAGS = -I$(top_builddir)/gl-libpoke 
-I$(top_srcdir)/gl-libpoke \
                           -I$(top_builddir)/libutils -I$(top_srcdir)/libutils \
                           -DPKL_DEBUG \
                           -DPKGDATADIR=\"$(pkgdatadir)\" \
                           -DPKGINFODIR=\"$(infodir)\" \
                           -DLOCALEDIR=\"$(localedir)\"
     libpoke_la_CFLAGS = -Wall $(BDW_GC_CFLAGS) $(LIBNBD_CFLAGS)
    -libpoke_la_LIBADD = ../gl/libgnu.la ../libutils/libutils.la 
libpvmjitter.la \
    +libpoke_la_LIBADD = ../gl-libpoke/libgnu.la ../libutils/libutils.la 
libpvmjitter.la \
                         $(BDW_GC_LIBS) \
                         $(LIBNBD_LIBS)
     libpoke_la_LDFLAGS =
    --
    2.26.2