[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: make use of gnulib-tool's --automake-subdir option
From: |
Akim Demaille |
Subject: |
Re: make use of gnulib-tool's --automake-subdir option |
Date: |
Sun, 19 Dec 2021 17:13:08 +0100 |
Hi Bruno,
> Le 18 déc. 2021 à 18:45, Bruno Haible <bruno@clisp.org> a écrit :
>
> Hi,
>
> Starting this week, Gnulib supports generating a "non-recursive" Automake
> Makefile.am snippet [1].
OMG, it's Christmas already! Thanks a lot Santa, my wish has come true!
> We plan to deprecate the older approach.
This hack of mine is more that 13 years old, and it's time for it to bitrot in
hell.
Thanks a lot Bruno! Installed as follows.
commit 013d59821994eda066fedceb0a137593244007ee
Author: Bruno Haible <bruno@clisp.org>
Date: Sat Dec 18 18:45:46 2021 +0100
gnulib: make use of gnulib-tool's --automake-subdir option
Starting this week, Gnulib supports generating a "non-recursive" Automake
Makefile.am snippet
https://lists.gnu.org/r/bug-gnulib/2021-12/msg00085.html.
* bootstrap.conf: Use gnulib-tool's --automake-subdir.
diff --git a/bootstrap.conf b/bootstrap.conf
index 1d8614e7..6b818fc6 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -34,7 +34,6 @@ gnulib_modules='
linked-list
malloc-gnu
mbfile mbswidth
- non-recursive-gnulib-prefix-hack
obstack
obstack-printf
perror progname
@@ -80,13 +79,10 @@ XGETTEXT_OPTIONS_RUNTIME=$XGETTEXT_OPTIONS'\\\
--keyword=YY_ \\\
'
-gnulib_tool_option_extras='--symlink --conditional-dependencies
--makefile-name=gnulib.mk --po-base=gnulib-po --po-domain=bison'
+gnulib_tool_option_extras='--symlink --conditional-dependencies
--makefile-name=gnulib.mk --automake-subdir --po-base=gnulib-po
--po-domain=bison'
bootstrap_post_import_hook()
{
- # Massage lib/gnulib.mk before using it later in the bootstrapping process.
- build-aux/prefix-gnulib-mk --lib-name="$gnulib_name" "lib/$gnulib_mk"
-
# Ensure that ChangeLog exists, for automake.
test -f ChangeLog || touch ChangeLog
}
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
index 45b851b3..2e9d5037 100644
--- a/build-aux/.gitignore
+++ b/build-aux/.gitignore
@@ -19,7 +19,6 @@
/libtool-reloc
/mdate-sh
/missing
-/prefix-gnulib-mk
/reloc-ldflags
/relocatable.sh.in
/test-driver
diff --git a/m4/.gitignore b/m4/.gitignore
index a1ea02f3..c3a50c44 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -142,7 +142,6 @@
/musl.m4
/nls.m4
/nocrash.m4
-/non-recursive-gnulib-prefix-hack.m4
/obstack-printf.m4
/obstack.m4
/off_t.m4