[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: argz whitespace
From: |
Eric Blake |
Subject: |
Re: argz whitespace |
Date: |
Tue, 20 May 2008 07:20:58 -0600 |
User-agent: |
Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.14) Gecko/20080421 Thunderbird/2.0.0.14 Mnenhy/0.7.5.666 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
According to Eric Blake on 5/20/2008 6:32 AM:
| Also, would anyone be interested in a patch that renames argz_.h to
| argz.in.h to match gnulib? Gnulib recently changed to avoid _ in file
| names where possible, and these days, platforms that don't handle two . in
| a file name are generally not worth porting to.
| http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=5155f7d
Like so. OK to apply?
- --
Don't work too hard, make some time for fun as well!
Eric Blake address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iEYEARECAAYFAkgy0DoACgkQ84KuGfSFAYAW9ACgl11yavUGy87W5rTAzZT3YBUk
2RgAnj4FJE60ulcy2Ngz9yx/NgBjJmqm
=VoIS
-----END PGP SIGNATURE-----
>From d5e648bd6102c30fdcd73e4196648c2f15b1c27a Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Tue, 20 May 2008 07:18:45 -0600
Subject: [PATCH] Reflect gnulib renaming in argz module.
* libltdl/argz_.h: Rename...
* libltdl/argz.in.h: ...to this.
* libtoolize.m4sh (all_pkgltdl_files): Reflect rename.
* tests/libtoolize.at (diagnose missing LT_CONFIG_LTDL_DIR)
(diagnose missing LTDL_INIT invocation)
(nonrecursive ltdl with AC_CONFIG_MACRO_DIR)
(subproject ltdl with non-shared directories): Likewise.
* Makefile.am (ltdldatafiles): Likewise.
* libltdl/Makefile.inc (EXTRA_DIST): Likewise.
(libltdl/argz.h): Update dependency.
Signed-off-by: Eric Blake <address@hidden>
---
ChangeLog | 12 ++++++++++++
Makefile.am | 2 +-
libltdl/Makefile.inc | 9 +++++----
libltdl/{argz_.h => argz.in.h} | 0
libtoolize.m4sh | 5 +++--
tests/libtoolize.at | 10 +++++-----
6 files changed, 26 insertions(+), 12 deletions(-)
rename libltdl/{argz_.h => argz.in.h} (100%)
diff --git a/ChangeLog b/ChangeLog
index 1ec69ae..4e03005 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
2008-05-20 Eric Blake <address@hidden>
+ Reflect gnulib renaming in argz module.
+ * libltdl/argz_.h: Rename...
+ * libltdl/argz.in.h: ...to this.
+ * libtoolize.m4sh (all_pkgltdl_files): Reflect rename.
+ * tests/libtoolize.at (diagnose missing LT_CONFIG_LTDL_DIR)
+ (diagnose missing LTDL_INIT invocation)
+ (nonrecursive ltdl with AC_CONFIG_MACRO_DIR)
+ (subproject ltdl with non-shared directories): Likewise.
+ * Makefile.am (ltdldatafiles): Likewise.
+ * libltdl/Makefile.inc (EXTRA_DIST): Likewise.
+ (libltdl/argz.h): Update dependency.
+
Resynchronize argz whitespace changes from gnulib.
* libltdl/m4/argz.m4: Kill trailing whitespace.
* libltdl/argz.c: Likewise.
diff --git a/Makefile.am b/Makefile.am
index 0085c7f..003f9d9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -357,8 +357,8 @@ ltdldatafiles = libltdl/COPYING.LIB \
libltdl/Makefile.in \
libltdl/config-h.in \
libltdl/configure \
- libltdl/argz_.h \
libltdl/argz.c \
+ libltdl/argz.in.h \
libltdl/loaders/dld_link.c \
libltdl/loaders/dlopen.c \
libltdl/loaders/dyld.c \
diff --git a/libltdl/Makefile.inc b/libltdl/Makefile.inc
index 71cb30f..3c4b52b 100644
--- a/libltdl/Makefile.inc
+++ b/libltdl/Makefile.inc
@@ -1,6 +1,7 @@
## Makefile.inc -- includable Makefile.am snippet
##
-## Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
+## Copyright (C) 2003, 2004, 2005, 2007, 2008 Free Software
+## Foundation, Inc.
## Written by Gary V. Vaughan, 2003
##
## NOTE: The canonical source of this file is maintained with the
@@ -139,15 +140,15 @@ EXTRA_DIST += libltdl/COPYING.LIB \
## --------------------------- ##
BUILT_SOURCES += libltdl/$(ARGZ_H)
-EXTRA_DIST += libltdl/argz_.h \
+EXTRA_DIST += libltdl/argz.in.h \
libltdl/argz.c
# We need the following in order to create an <argz.h> when the system
# doesn't have one that works with the given compiler.
all-local $(lib_OBJECTS): libltdl/$(ARGZ_H)
-libltdl/argz.h: libltdl/argz_.h
+libltdl/argz.h: libltdl/argz.in.h
$(mkinstalldirs) . libltdl/
- cp $(srcdir)/libltdl/argz_.h address@hidden
+ cp $(srcdir)/libltdl/argz.in.h address@hidden
mv address@hidden $@
MOSTLYCLEANFILES += libltdl/argz.h \
libltdl/argz.h-t
diff --git a/libltdl/argz_.h b/libltdl/argz.in.h
similarity index 100%
rename from libltdl/argz_.h
rename to libltdl/argz.in.h
diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 0c7cf02..7af221d 100644
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -5,7 +5,8 @@ m4_divert_push([SCRIPT])#! /bin/sh
# libtoolize (GNU @PACKAGE@@TIMESTAMP@) @VERSION@
# Written by Gary V. Vaughan <address@hidden>, 2003
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation,
Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software
+# Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -122,7 +123,7 @@ configure_ac=configure.in
# ensure a clean upgrade.
all_pkgconfig_files="config.guess config.sub ltmain.sh"
all_pkgmacro_files="argz.m4 libtool.m4 ltdl.m4 ltoptions.m4 ltsugar.m4
ltversion.in ltversion.m4 lt~obsolete.m4"
-all_pkgltdl_files="COPYING.LIB Makefile Makefile.in Makefile.inc Makefile.am
README acinclude.m4 aclocal.m4 argz_.h argz.c config.h.in config-h.in configure
configure.ac configure.in libltdl/lt__alloc.h libltdl/lt__dirent.h
libltdl/lt__glibc.h libltdl/lt__private.h libltdl/lt__strl.h
libltdl/lt_dlloader.h libltdl/lt_error.h libltdl/lt_system.h libltdl/slist.h
loaders/dld_link.c loaders/dlopen.c loaders/dyld.c loaders/load_add_on.c
loaders/loadlibrary.c loaders/preopen.c loaders/shl_load.c lt__alloc.c
lt__dirent.c lt__strl.c lt_dlloader.c lt_error.c ltdl.c ltdl.h slist.c"
+all_pkgltdl_files="COPYING.LIB Makefile Makefile.in Makefile.inc Makefile.am
README acinclude.m4 aclocal.m4 argz.c argz.in.h config.h.in config-h.in
configure configure.ac configure.in libltdl/lt__alloc.h libltdl/lt__dirent.h
libltdl/lt__glibc.h libltdl/lt__private.h libltdl/lt__strl.h
libltdl/lt_dlloader.h libltdl/lt_error.h libltdl/lt_system.h libltdl/slist.h
loaders/dld_link.c loaders/dlopen.c loaders/dyld.c loaders/load_add_on.c
loaders/loadlibrary.c loaders/preopen.c loaders/shl_load.c lt__alloc.c
lt__dirent.c lt__strl.c lt_dlloader.c lt_error.c ltdl.c ltdl.h slist.c"
# Parse environment options
{
diff --git a/tests/libtoolize.at b/tests/libtoolize.at
index fa229b9..42e6f69 100644
--- a/tests/libtoolize.at
+++ b/tests/libtoolize.at
@@ -297,8 +297,8 @@ libtoolize: copying file `m4/lt~obsolete.m4'
libtoolize: putting libltdl files in `ltdl'.
libtoolize: copying file `ltdl/COPYING.LIB'
libtoolize: copying file `ltdl/README'
-libtoolize: copying file `ltdl/argz_.h'
libtoolize: copying file `ltdl/argz.c'
+libtoolize: copying file `ltdl/argz.in.h'
libtoolize: copying file `ltdl/loaders/dld_link.c'
libtoolize: copying file `ltdl/loaders/dlopen.c'
libtoolize: copying file `ltdl/loaders/dyld.c'
@@ -376,8 +376,8 @@ libtoolize: copying file `ltdl/aclocal.m4'
libtoolize: linking file `ltdl/Makefile.in'
libtoolize: linking file `ltdl/config-h.in'
libtoolize: linking file `ltdl/configure'
-libtoolize: linking file `ltdl/argz_.h'
libtoolize: linking file `ltdl/argz.c'
+libtoolize: linking file `ltdl/argz.in.h'
libtoolize: linking file `ltdl/loaders/dld_link.c'
libtoolize: linking file `ltdl/loaders/dlopen.c'
libtoolize: linking file `ltdl/loaders/dyld.c'
@@ -475,8 +475,8 @@ libtoolize: copying file `ltdl/aclocal.m4'
libtoolize: copying file `ltdl/Makefile.in'
libtoolize: copying file `ltdl/config-h.in'
libtoolize: copying file `ltdl/configure'
-libtoolize: copying file `ltdl/argz_.h'
libtoolize: copying file `ltdl/argz.c'
+libtoolize: copying file `ltdl/argz.in.h'
libtoolize: copying file `ltdl/loaders/dld_link.c'
libtoolize: copying file `ltdl/loaders/dlopen.c'
libtoolize: copying file `ltdl/loaders/dyld.c'
@@ -799,8 +799,8 @@ libtoolize: copying file `m4/lt~obsolete.m4'
libtoolize: putting libltdl files in LT_CONFIG_LTDL_DIR, `ltdl'.
libtoolize: copying file `ltdl/COPYING.LIB'
libtoolize: copying file `ltdl/README'
-libtoolize: copying file `ltdl/argz_.h'
libtoolize: copying file `ltdl/argz.c'
+libtoolize: copying file `ltdl/argz.in.h'
libtoolize: copying file `ltdl/loaders/dld_link.c'
libtoolize: copying file `ltdl/loaders/dlopen.c'
libtoolize: copying file `ltdl/loaders/dyld.c'
@@ -892,8 +892,8 @@ libtoolize: copying file `ltdl/aclocal.m4'
libtoolize: copying file `ltdl/Makefile.in'
libtoolize: copying file `ltdl/config-h.in'
libtoolize: copying file `ltdl/configure'
-libtoolize: copying file `ltdl/argz_.h'
libtoolize: copying file `ltdl/argz.c'
+libtoolize: copying file `ltdl/argz.in.h'
libtoolize: copying file `ltdl/loaders/dld_link.c'
libtoolize: copying file `ltdl/loaders/dlopen.c'
libtoolize: copying file `ltdl/loaders/dyld.c'
--
1.5.5.1