Jim Meyering <[email protected]> writes: > Simon Josefsson wrote: >> Building the 'gnumakefile' module fails: >> >> http://autobuild.josefsson.org/gnulib-mega/log-201206201113065857000.txt >> >> Looking at that module, I wonder if that module is useful at all without >> maintainer-makefile? It seems GNUmakefile is tightly coupled together >> with maint.mk. Should GNUmakefile be moved into the maintainer-makefile >> module, and the gnumakefile module be removed? > > Hi Simon, > > Thanks for noticing. That sounds like a good plan. > Do you feel like doing that and deprecating the gnumakefile module?
Here is a patch to implement that. I haven't pushed it. What do you think, should this or Eric's approach go in? I don't care strongly, assuming Eric's patch solves my problem. If we keep two modules, some documentation on what is appropriate to put in GNUmakefile and what to put in maint.mk would be useful. That line isn't clear to me now. /Simon >From 5406a811e1fa842b3b1dc75994e8e30aa4f63601 Mon Sep 17 00:00:00 2001 From: Simon Josefsson <[email protected]> Date: Thu, 21 Jun 2012 05:08:14 +0200 Subject: [PATCH] gnumakefile: Remove module. Use maintainer-makefile instead. * NEWS: Doc fix. * modules/maintainer-makefile: Added information from the gnumakefile module. * modules/gnumakefile: Removed. * gnulib-tool: Remove exception for gnumakefile module. * MODULES.html.sh: Removed gnumakefile. --- ChangeLog | 10 ++++++++++ MODULES.html.sh | 1 - NEWS | 5 +++++ gnulib-tool | 4 ++-- modules/gnumakefile | 32 -------------------------------- modules/maintainer-makefile | 17 ++++++++++++++++- 6 files changed, 33 insertions(+), 36 deletions(-) delete mode 100644 modules/gnumakefile diff --git a/ChangeLog b/ChangeLog index 199b06c..c34c267 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2012-06-21 Simon Josefsson <[email protected]> + + gnumakefile: Remove module. Use maintainer-makefile instead. + * NEWS: Doc fix. + * modules/maintainer-makefile: Added information from the + gnumakefile module. + * modules/gnumakefile: Removed. + * gnulib-tool: Remove exception for gnumakefile module. + * MODULES.html.sh: Removed gnumakefile. + 2012-06-20 John Darrington <[email protected]> (tiny change) tmpfile, clean-temp: Fix invocation of GetVersionEx. diff --git a/MODULES.html.sh b/MODULES.html.sh index b14ad0d..ade4710 100755 --- a/MODULES.html.sh +++ b/MODULES.html.sh @@ -3521,7 +3521,6 @@ func_all_modules () func_module git-version-gen func_module gitlog-to-changelog func_module gnu-web-doc-update - func_module gnumakefile func_module gnupload func_module maintainer-makefile func_module mktempd diff --git a/NEWS b/NEWS index 7aaa550..5718a2f 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,11 @@ Important notes Date Modules Changes +2012-06-21 gnumakefile Module removed, use maintainer-makefile instead. + The gnumakefile module was tightly coupled together + with maintainer-makefile so that the former + wouldn't work without the latter. + 2012-01-07 quotearg In the C locale, the function will no longer use the grave accent character to begin a quoted string (`like this'). It will use apostrophes diff --git a/gnulib-tool b/gnulib-tool index 16f9b2f..f8a0a3e 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -3886,7 +3886,7 @@ func_emit_initmacro_done () func_emit_autoconf_snippet () { if { case $module in - gnumakefile | maintainer-makefile) + maintainer-makefile) # These modules are meant to be used only in the top-level directory. $toplevel ;; *) @@ -5796,7 +5796,7 @@ func_create_testdir () func_verify_module if test -n "$module"; then case $module in - gnumakefile | maintainer-makefile) + maintainer-makefile) # These modules are meant to be used only in the top-level directory. ;; *) diff --git a/modules/gnumakefile b/modules/gnumakefile deleted file mode 100644 index a86475a..0000000 --- a/modules/gnumakefile +++ /dev/null @@ -1,32 +0,0 @@ -Description: -Add GNU-make specific rules for maintainer use. - -Files: -top/GNUmakefile - -Depends-on: - -configure.ac: -# Autoconf 2.61a.99 and earlier don't support linking a file only -# in VPATH builds. But since GNUmakefile is for maintainer use -# only, it does not matter if we skip the link with older autoconf. -# Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH -# builds, so use a shell variable to bypass this. -GNUmakefile=GNUmakefile -m4_if(m4_version_compare([2.61a.100], - m4_defn([m4_PACKAGE_VERSION])), [1], [], - [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [], - [GNUmakefile=$GNUmakefile])]) - -Makefile.am: -distclean-local: clean-GNUmakefile -clean-GNUmakefile: - test x'$(VPATH)' != x && rm -f $(top_builddir)/GNUmakefile || : - -Include: - -License: -GPLed build tool - -Maintainer: -coreutils diff --git a/modules/maintainer-makefile b/modules/maintainer-makefile index 4199fa4..9358cd2 100644 --- a/modules/maintainer-makefile +++ b/modules/maintainer-makefile @@ -3,17 +3,32 @@ Helper GNUmakefile with syntax checks, build improvements, etc. See also readme-release. Files: +top/GNUmakefile top/maint.mk Depends-on: -gnumakefile useless-if-before-free vc-list-files configure.ac: +# Autoconf 2.61a.99 and earlier don't support linking a file only +# in VPATH builds. But since GNUmakefile is for maintainer use +# only, it does not matter if we skip the link with older autoconf. +# Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH +# builds, so use a shell variable to bypass this. +GNUmakefile=GNUmakefile +m4_if(m4_version_compare([2.61a.100], + m4_defn([m4_PACKAGE_VERSION])), [1], [], + [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [], + [GNUmakefile=$GNUmakefile])]) AC_CONFIG_COMMANDS_PRE([m4_ifdef([AH_HEADER], [AC_SUBST([CONFIG_INCLUDE], m4_defn([AH_HEADER]))])]) +Makefile.am: +distclean-local: clean-GNUmakefile +clean-GNUmakefile: + test x'$(VPATH)' != x && rm -f $(top_builddir)/GNUmakefile || : + License: GPLed build tool -- 1.7.9.5
