Re: Should gnulib lib_SOURCES contain .h files? also, splitting up ftoastr

[Paul Eggert]

On 01/11/11 14:06, Bruno Haible wrote:

> Yes, that's the most sensible way to do it.

Thanks to you and to Simon for the review and advice.  I installed
the following.  I'll fix up coreutils shortly, since it is using
all 3 modules now.

>From 3e2321975b7f5a1aee1ff55d7ec087dfe6bc3af6 Mon Sep 17 00:00:00 2001
From: Paul Eggert <address@hidden>
Date: Tue, 11 Jan 2011 16:36:12 -0800
Subject: [PATCH] ftoastr: split into 3 modules ftoastr, dtoastr, ldtoastr

This is so that a program like Emacs, which needs only dtoastr,
does not have to bother with distributing and compiling ftoastr
and ldtoastr.
* MODULES.html.sh: Document these modules (ftoastr wasn't documented).
* modules/dtoastr, modules/ldtoastr: New files.
* modules/ftoastr: Now works just for 'float'.
(Files): Remove lib/dtoastr.c, lib/ldtoastr.c.
(Makefile.am): Remove ftoastr.h (not needed and no effect),
dtoastr.c, ldtoastr.c.
---
 ChangeLog        |   13 +++++++++++++
 MODULES.html.sh  |    3 +++
 modules/dtoastr  |   26 ++++++++++++++++++++++++++
 modules/ftoastr  |    6 ++----
 modules/ldtoastr |   26 ++++++++++++++++++++++++++
 5 files changed, 70 insertions(+), 4 deletions(-)
 create mode 100644 modules/dtoastr
 create mode 100644 modules/ldtoastr

diff --git a/ChangeLog b/ChangeLog
index 31b8074..0a2d058 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-11  Paul Eggert  <address@hidden>
+
+       ftoastr: split into 3 modules ftoastr, dtoastr, ldtoastr
+       This is so that a program like Emacs, which needs only dtoastr,
+       does not have to bother with distributing and compiling ftoastr
+       and ldtoastr.
+       * MODULES.html.sh: Document these modules (ftoastr wasn't documented).
+       * modules/dtoastr, modules/ldtoastr: New files.
+       * modules/ftoastr: Now works just for 'float'.
+       (Files): Remove lib/dtoastr.c, lib/ldtoastr.c.
+       (Makefile.am): Remove ftoastr.h (not needed and no effect),
+       dtoastr.c, ldtoastr.c.
+
 2011-01-11  Jim Meyering  <address@hidden>
 
        save-cwd: remove #if-!HAVE_FCHDIR'd code; use the fchdir module
diff --git a/MODULES.html.sh b/MODULES.html.sh
index c4d92b1..708f3cc 100755
--- a/MODULES.html.sh
+++ b/MODULES.html.sh
@@ -2281,8 +2281,11 @@ func_all_modules ()
   func_echo "$element"
 
   func_begin_table
+  func_module dtoastr
+  func_module ftoastr
   func_module intprops
   func_module inttostr
+  func_module ldtoastr
   func_module xstrtoimax
   func_module xstrtoumax
   func_end_table
diff --git a/modules/dtoastr b/modules/dtoastr
new file mode 100644
index 0000000..60b09b4
--- /dev/null
+++ b/modules/dtoastr
@@ -0,0 +1,26 @@
+Description:
+Convert double to accurate string.
+
+Files:
+lib/ftoastr.h
+lib/ftoastr.c
+lib/dtoastr.c
+m4/c-strtod.m4
+
+Depends-on:
+intprops
+
+configure.ac:
+AC_REQUIRE([gl_C99_STRTOLD])
+
+Makefile.am:
+lib_SOURCES += dtoastr.c
+
+Include:
+"ftoastr.h"
+
+License:
+GPL
+
+Maintainer:
+Paul Eggert
diff --git a/modules/ftoastr b/modules/ftoastr
index 64d0a77..9010e94 100644
--- a/modules/ftoastr
+++ b/modules/ftoastr
@@ -1,11 +1,9 @@
 Description:
-Convert floating point to accurate string
+Convert float to accurate string.
 
 Files:
 lib/ftoastr.h
 lib/ftoastr.c
-lib/dtoastr.c
-lib/ldtoastr.c
 m4/c-strtod.m4
 
 Depends-on:
@@ -15,7 +13,7 @@ configure.ac:
 AC_REQUIRE([gl_C99_STRTOLD])
 
 Makefile.am:
-lib_SOURCES += ftoastr.h ftoastr.c dtoastr.c ldtoastr.c
+lib_SOURCES += ftoastr.c
 
 Include:
 "ftoastr.h"
diff --git a/modules/ldtoastr b/modules/ldtoastr
new file mode 100644
index 0000000..50731a5
--- /dev/null
+++ b/modules/ldtoastr
@@ -0,0 +1,26 @@
+Description:
+Convert long double to accurate string.
+
+Files:
+lib/ftoastr.h
+lib/ftoastr.c
+lib/ldtoastr.c
+m4/c-strtod.m4
+
+Depends-on:
+intprops
+
+configure.ac:
+AC_REQUIRE([gl_C99_STRTOLD])
+
+Makefile.am:
+lib_SOURCES += ldtoastr.c
+
+Include:
+"ftoastr.h"
+
+License:
+GPL
+
+Maintainer:
+Paul Eggert
-- 
1.7.3