From: Paul Eggert Date: Mon, 13 Mar 2017 22:50:44 +0000 (-0700) Subject: gnulib-tool: minor --gnu-make fixups X-Git-Tag: v1.0~6329 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=d6088547633af472625ab815452004c22fda6d58;p=gnulib.git 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. --- diff --git a/ChangeLog b/ChangeLog index 3e79fccfc1..c468516b87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2017-03-13 Paul Eggert + + 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 gnulib-tool: new option --gnu-make diff --git a/gnulib-tool b/gnulib-tool index 18b801ec30..3ff40b8790 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