On 03/12/2017 11:58 PM, Thien-Thi Nguyen wrote:
+ if false && $gnu_make; then
Typo?
Thanks for catching that. It's a harmless typo, as the then-part is not
supposed to be executed; this was an alternative implementation I was
thinking of doing, but discarded in favor of the "${AUTOCONF} -t"
implementation. I installed the attached further patch, which also fixes
a minor problem in a comment in the output.
From a4a451452220915ec8d28cc834be01bbf26f5376 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 13 Mar 2017 15:50:44 -0700
Subject: [PATCH] gnulib-tool: minor --gnu-make fixups
* gnulib-tool (func_emit_lib_Makefile_am):
Remove useless code that was a blind alley during implementation.
Problem reported by Thien-Thi Nguyen in:
http://lists.gnu.org/archive/html/bug-gnulib/2017-03/msg00029.html
(func_import): Note the "--gnu-make" option in the output comment.
---
ChangeLog | 9 +++++++++
gnulib-tool | 22 +++-------------------
2 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3e79fcc..c468516 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2017-03-13 Paul Eggert <eggert@cs.ucla.edu>
+
+ gnulib-tool: minor --gnu-make fixups
+ * gnulib-tool (func_emit_lib_Makefile_am):
+ Remove useless code that was a blind alley during implementation.
+ Problem reported by Thien-Thi Nguyen in:
+ http://lists.gnu.org/archive/html/bug-gnulib/2017-03/msg00029.html
+ (func_import): Note the "--gnu-make" option in the output comment.
+
2017-03-12 Paul Eggert <eggert@cs.ucla.edu>
gnulib-tool: new option --gnu-make
diff --git a/gnulib-tool b/gnulib-tool
index 18b801e..3ff40b8 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -3650,25 +3650,6 @@ func_emit_lib_Makefile_am ()
fi
cat "$tmp"/allsnippets \
| sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g'
- # Determine variables the automake snippet mentions.
- if false && $gnu_make; then
- sed_get_makefile_vars='
- :again
- /@/!d
- s/^[^@]*@//
- h
- /^[a-zA-Z_][a-zA-Z_0-9]*@/{
- s/@.*//p
- g
- s/^[^@]*@//
- h
- }
- g
- b again
- '
- substs=`func_get_automake_snippet "$module" \
- | LC_ALL=C sed -e "$sed_get_makefile_vars"`
- fi
echo
echo "mostlyclean-local: mostlyclean-generic"
echo " @for dir in '' \$(MOSTLYCLEANDIRS); do \\"
@@ -5134,6 +5115,9 @@ s,^\(.................................................[^ ]*\) *,
func_append actioncmd " --lgpl=$lgpl"
fi
fi
+ if test -n "$gnu_make"; then
+ func_append actioncmd " --gnu-make"
+ fi
if test -n "$makefile_name"; then
func_append actioncmd " --makefile-name=$makefile_name"
fi
--
2.9.3
