Regenerate.

6 files changed, 24 insertions, 24 deletions

diff --git a/configure b/configure
index a2a1d549b95..49dc050e7bc 100755
--- a/configure
+++ b/configure
@@ -5808,9 +5808,9 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
 
   # Code from module arg-nonnull:
   # Code from module c++defs:
+  # Code from module dtoastr:
   # Code from module extensions:
 
-  # Code from module ftoastr:
   # Code from module getopt-gnu:
   # Code from module getopt-posix:
   # Code from module gettext-h:
@@ -14642,9 +14642,9 @@ fi
   gl_source_base='lib'
   # Code from module arg-nonnull:
   # Code from module c++defs:
-  # Code from module extensions:
-  # Code from module ftoastr:
+  # Code from module dtoastr:
 
+  # Code from module extensions:
   # Code from module getopt-gnu:
 
 
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 93b9f3aa270..49a87ced4c5 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -24,7 +24,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files ftoastr getopt-gnu mktime
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files dtoastr getopt-gnu mktime
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -69,8 +69,7 @@ AR = ar
 ARFLAGS = cru
 libgnu_a_AR = $(AR) $(ARFLAGS)
 am__DEPENDENCIES_1 =
-am_libgnu_a_OBJECTS = ftoastr.$(OBJEXT) dtoastr.$(OBJEXT) \
-        ldtoastr.$(OBJEXT)
+am_libgnu_a_OBJECTS = dtoastr.$(OBJEXT)
 libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -471,19 +470,20 @@ x_default_search_path = @x_default_search_path@
 BUILT_SOURCES = arg-nonnull.h c++defs.h $(GETOPT_H) $(STDDEF_H) time.h \
         unistd.h warn-on-use.h
 EXTRA_DIST = $(top_srcdir)/./arg-nonnull.h $(top_srcdir)/./c++defs.h \
-        getopt.c getopt.in.h getopt1.c getopt_int.h intprops.h \
-        mktime-internal.h mktime.c stddef.in.h time.in.h time_r.c \
-        unistd.in.h $(top_srcdir)/./warn-on-use.h
+        ftoastr.c ftoastr.h getopt.c getopt.in.h getopt1.c \
+        getopt_int.h intprops.h mktime-internal.h mktime.c stddef.in.h \
+        time.in.h time_r.c unistd.in.h $(top_srcdir)/./warn-on-use.h
 MOSTLYCLEANFILES = core *.stackdump arg-nonnull.h arg-nonnull.h-t \
         c++defs.h c++defs.h-t getopt.h getopt.h-t stddef.h stddef.h-t \
         time.h time.h-t unistd.h unistd.h-t warn-on-use.h \
         warn-on-use.h-t
 noinst_LIBRARIES = libgnu.a
 DEFAULT_INCLUDES = -I. -I../src -I$(top_srcdir)/src
-libgnu_a_SOURCES = ftoastr.h ftoastr.c dtoastr.c ldtoastr.c gettext.h
+libgnu_a_SOURCES = dtoastr.c gettext.h
 libgnu_a_LIBADD = $(gl_LIBOBJS)
 libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
-EXTRA_libgnu_a_SOURCES = getopt.c getopt1.c mktime.c time_r.c
+EXTRA_libgnu_a_SOURCES = ftoastr.c getopt.c getopt1.c mktime.c \
+        time_r.c
 ARG_NONNULL_H = arg-nonnull.h
 CXXDEFS_H = c++defs.h
 WARN_ON_USE_H = warn-on-use.h
@@ -540,7 +540,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftoastr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldtoastr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mktime.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time_r.Po@am__quote@
 
diff --git a/lib/gnulib.mk b/lib/gnulib.mk
index f7f1aae5ca2..f1b5d236e21 100644
--- a/lib/gnulib.mk
+++ b/lib/gnulib.mk
@@ -9,7 +9,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files ftoastr getopt-gnu mktime
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files dtoastr getopt-gnu mktime
 
 
 MOSTLYCLEANFILES += core *.stackdump
@@ -69,11 +69,15 @@ EXTRA_DIST += $(top_srcdir)/./c++defs.h
 
 ## end   gnulib module c++defs
 
-## begin gnulib module ftoastr
+## begin gnulib module dtoastr
 
-libgnu_a_SOURCES += ftoastr.h ftoastr.c dtoastr.c ldtoastr.c
+libgnu_a_SOURCES += dtoastr.c
 
-## end   gnulib module ftoastr
+EXTRA_DIST += ftoastr.c ftoastr.h
+
+EXTRA_libgnu_a_SOURCES += ftoastr.c
+
+## end   gnulib module dtoastr
 
 ## begin gnulib module getopt-posix
 
diff --git a/lib/ldtoastr.c b/lib/ldtoastr.c
deleted file mode 100644
index bf54a3582e3..00000000000
--- a/lib/ldtoastr.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define LENGTH 3
-#include "ftoastr.c"
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index f04d2fdfaa9..4a2928d966d 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -15,12 +15,12 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files ftoastr getopt-gnu mktime
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files dtoastr getopt-gnu mktime
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
 gl_MODULES([
-  ftoastr
+  dtoastr
   getopt-gnu
   mktime
 ])
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
index fa0a9964073..32d3cce4307 100644
--- a/m4/gnulib-comp.m4
+++ b/m4/gnulib-comp.m4
@@ -28,9 +28,9 @@ AC_DEFUN([gl_EARLY],
   AC_REQUIRE([AC_PROG_RANLIB])
   # Code from module arg-nonnull:
   # Code from module c++defs:
+  # Code from module dtoastr:
   # Code from module extensions:
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-  # Code from module ftoastr:
   # Code from module getopt-gnu:
   # Code from module getopt-posix:
   # Code from module gettext-h:
@@ -63,9 +63,9 @@ AC_DEFUN([gl_INIT],
   gl_source_base='lib'
   # Code from module arg-nonnull:
   # Code from module c++defs:
-  # Code from module extensions:
-  # Code from module ftoastr:
+  # Code from module dtoastr:
   AC_REQUIRE([gl_C99_STRTOLD])
+  # Code from module extensions:
   # Code from module getopt-gnu:
   gl_FUNC_GETOPT_GNU
   gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu])
@@ -243,7 +243,6 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/getopt_int.h
   lib/gettext.h
   lib/intprops.h
-  lib/ldtoastr.c
   lib/mktime-internal.h
   lib/mktime.c
   lib/stddef.in.h