bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH] Generalize GNUmakefile, ...


From: Eric Blake
Subject: Re: [PATCH] Generalize GNUmakefile, ...
Date: Mon, 24 Mar 2008 05:46:10 -0600
User-agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.12) Gecko/20080213 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to Bruno Haible on 3/23/2008 7:27 AM:
| It's the right direction, but in the gnulib-tool part, a few things can be
| done better:

Thanks for picking up where I left off.

| I'm applying this, for the gnulib-tool part.

Leaving this for the GNUmakefile part.  I decided to go with an all
lowercase name for the module.  I also had to fix an issue with 'make
distclean' - now that the distclean-local rule lives in gnulib's
Makefile.am rather than the top level, it needs to specify the correct
directory.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.8 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkfnlIEACgkQ84KuGfSFAYA5zwCgzAtiE7nt+4qTZbsh5H5V+lAW
P2AAoJPq4TvTPuVYONs6sp2ahiH8bg8/
=NKt0
-----END PGP SIGNATURE-----
>From 3b3e9653139a9423e7d980cc6f9e3160111c9930 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Fri, 21 Mar 2008 22:29:37 -0600
Subject: [PATCH] Alter GNUmakefile to install into top directory.

* modules/maintainer-makefile: Split, and add dependency...
* modules/gnumakefile: to this new module.
* build-aux/GNUmakefile: Move...
* top/GNUmakefile: ...here.
* build-aux/maint.mk: Move...
* top/maint.mk: ...here.
* MODULES.html.sh (Support for maintaining...): Document new
module.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog                      |   12 ++++++++++++
 MODULES.html.sh                |    1 +
 modules/gnumakefile            |   32 ++++++++++++++++++++++++++++++++
 modules/maintainer-makefile    |    6 ++++--
 {build-aux => top}/GNUmakefile |    0 
 {build-aux => top}/maint.mk    |    0 
 6 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 modules/gnumakefile
 rename {build-aux => top}/GNUmakefile (100%)
 rename {build-aux => top}/maint.mk (100%)

diff --git a/ChangeLog b/ChangeLog
index 6aad852..fe72f6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-03-24  Eric Blake  <address@hidden>
+
+       Alter GNUmakefile to install into top directory.
+       * modules/maintainer-makefile: Split, and add dependency...
+       * modules/gnumakefile: to this new module.
+       * build-aux/GNUmakefile: Move...
+       * top/GNUmakefile: ...here.
+       * build-aux/maint.mk: Move...
+       * top/maint.mk: ...here.
+       * MODULES.html.sh (Support for maintaining...): Document new
+       module.
+
 2008-03-23  Bruno Haible  <address@hidden>
 
        * gnulib-tool: New options --vc-files, --no-vc-files.
diff --git a/MODULES.html.sh b/MODULES.html.sh
index 739f0d1..6614755 100755
--- a/MODULES.html.sh
+++ b/MODULES.html.sh
@@ -2735,6 +2735,7 @@ func_all_modules ()
   func_module autobuild
   func_module git-version-gen
   func_module gitlog-to-changelog
+  func_module gnumakefile
   func_module gnupload
   func_module maintainer-makefile
   func_module mktempd
diff --git a/modules/gnumakefile b/modules/gnumakefile
new file mode 100644
index 0000000..af85344
--- /dev/null
+++ b/modules/gnumakefile
@@ -0,0 +1,32 @@
+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:
+       if test x"$(VPATH)" != x ; then rm -f $(top_srcdir)/GNUmakefile ; fi
+
+Include:
+
+License:
+GPLed build tool
+
+Maintainer:
+coreutils
diff --git a/modules/maintainer-makefile b/modules/maintainer-makefile
index f35cd23..492ca69 100644
--- a/modules/maintainer-makefile
+++ b/modules/maintainer-makefile
@@ -2,8 +2,10 @@ Description:
 Helper GNUmakefile with syntax checks, build improvements, etc.
 
 Files:
-build-aux/GNUmakefile
-build-aux/maint.mk
+top/maint.mk
+
+Depends-on:
+gnumakefile
 
 License:
 GPLed build tool
diff --git a/build-aux/GNUmakefile b/top/GNUmakefile
similarity index 100%
rename from build-aux/GNUmakefile
rename to top/GNUmakefile
diff --git a/build-aux/maint.mk b/top/maint.mk
similarity index 100%
rename from build-aux/maint.mk
rename to top/maint.mk
-- 
1.5.4


reply via email to

[Prev in Thread] Current Thread [Next in Thread]