Mercurial > gnulib
changeset 39737:bf73bd094dbd
gnulib-tool: minor tweaks for --gnu-make
* gnulib-tool: Do not allow --gnu-make in test modes,
since they all require automake.
(func_emit_lib_Makefile_am): Don’t emit automake comment
if --gnu-make.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Wed, 04 Jul 2018 20:42:07 -0700 |
| parents | ccc75f091988 |
| children | c05640d27ca2 |
| files | ChangeLog gnulib-tool |
| diffstat | 2 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jul 04 20:18:48 2018 -0700 +++ b/ChangeLog Wed Jul 04 20:42:07 2018 -0700 @@ -1,5 +1,11 @@ 2018-07-04 Paul Eggert <eggert@cs.ucla.edu> + gnulib-tool: minor tweaks for --gnu-make + * gnulib-tool: Do not allow --gnu-make in test modes, + since they all require automake. + (func_emit_lib_Makefile_am): Don’t emit automake comment + if --gnu-make. + regex: work around conditional-dependencies glitch * modules/regex (Depends-on): Add langinfo. Without this change, I had problems building an experimental
--- a/gnulib-tool Wed Jul 04 20:18:48 2018 -0700 +++ b/gnulib-tool Wed Jul 04 20:42:07 2018 -0700 @@ -1490,6 +1490,11 @@ if test -z "$pobase" && test -n "$po_domain"; then func_warning "--po-domain has no effect without a --po-base option" fi + case $mode,$gnu_make in + *test*,true) + echo "gnulib-tool: --gnu-make not supported when including tests" + func_exit 1;; + esac # Canonicalize the inctests variable. case "$mode" in import | add-import | remove-import | update) @@ -3512,7 +3517,8 @@ sed_transform_check_PROGRAMS="$sed_noop" fi echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!" - echo "## Process this file with automake to produce Makefile.in." + $gnu_make || + echo "## Process this file with automake to produce Makefile.in." func_emit_copyright_notice if test -n "$actioncmd"; then # The maximum line length (excluding the terminating newline) of any file