Re: [PATCH] Rename lib/ to gl/

[Tim Rühsen]

Missing ChangeLog, coming in the next try.

On 26.03.20 16:41, Tim Rühsen wrote:
> 2020-03-26  Tim Rühsen  <address@hidden>
> 
>       * Makefile.am: Rename lib to gl.
>       * bootstrap.conf: Set source_base=gl.
>       * configure.ac: Rename lib/ to gl/.
>       * src/Makefile.am: Rename lib to gl.
> ---
>  Makefile.am     | 2 +-
>  bootstrap.conf  | 6 ++++++
>  configure.ac    | 2 +-
>  src/Makefile.am | 4 ++--
>  4 files changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index 281ad979..06864b0d 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -1,5 +1,5 @@
>  ACLOCAL_AMFLAGS = -I m4
> -SUBDIRS = jitter lib pickles src doc man testsuite etc po
> +SUBDIRS = jitter gl pickles src doc man testsuite etc po
> 
>  noinst_SCRIPTS = run
> 
> diff --git a/bootstrap.conf b/bootstrap.conf
> index da908d10..644b6ef7 100644
> --- a/bootstrap.conf
> +++ b/bootstrap.conf
> @@ -56,6 +56,12 @@ gnulib_modules="
>  # not have to type --skip-po on every bootstrap call
>  SKIP_PO=t
> 
> +# gnulib library directory
> +source_base=gl
> +
> +# gnulib library name
> +gnulib_name=libpoke
> +
>  checkout_only_file=
> 
>  # Additional xgettext options to use.  Use "\\\newline" to break lines.
> diff --git a/configure.ac b/configure.ac
> index 5d602228..3316b241 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -127,7 +127,7 @@ fi
> 
>  dnl Generate output files
>  AC_CONFIG_FILES(Makefile
> -                lib/Makefile
> +                gl/Makefile
>                  src/Makefile
>                  pickles/Makefile
>                  doc/Makefile
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 3d53643d..734100fc 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -74,14 +74,14 @@ BUILT_SOURCES = pkl-tab.h pkl-lex.c \
>  AM_YFLAGS = -d -t --report=state
>  AM_LFLAGS = -d
> 
> -poke_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \
> +poke_CPPFLAGS = -I$(top_builddir)/gl -I$(top_srcdir)/gl \
>                  -DPKL_DEBUG \
>                  -DPKGDATADIR=\"$(pkgdatadir)\" \
>                  -DPKGINFODIR=\"$(infodir)\" \
>                  -DJITTER_VERSION=\"$(JITTER_VERSION)\" \
>                  -DLOCALEDIR=\"$(localedir)\"
>  poke_CFLAGS = -Wall $(BDW_GC_CFLAGS) $(LIBNBD_CFLAGS)
> -poke_LDADD = $(top_builddir)/lib/libpoke.la \
> +poke_LDADD = $(top_builddir)/gl/libpoke.la \
>               libpvmjitter.a \
>               $(LIBNBD_LIBS) \
>               $(LTLIBREADLINE) $(BDW_GC_LIBS) $(LIBTEXTSTYLE)
> --
> 2.26.0
>

signature.asc
Description: OpenPGP digital signature