# HG changeset patch # User Paul Eggert # Date 1294812786 28800 # Node ID f3056cf0073aca33fbd82a5a0d310c74efd71cbf # Parent ecce7818cd6f374ae92a21e92004af269a09d36e Regenerate. diff -r ecce7818cd6f -r f3056cf0073a configure --- a/configure Tue Jan 11 22:10:37 2011 -0800 +++ b/configure Tue Jan 11 22:13:06 2011 -0800 @@ -5808,9 +5808,9 @@ # 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 @@ gl_source_base='lib' # 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: diff -r ecce7818cd6f -r f3056cf0073a lib/Makefile.in --- a/lib/Makefile.in Tue Jan 11 22:10:37 2011 -0800 +++ b/lib/Makefile.in Tue Jan 11 22:13:06 2011 -0800 @@ -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 @@ 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 @@ 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 @@ @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 -r ecce7818cd6f -r f3056cf0073a lib/gnulib.mk --- a/lib/gnulib.mk Tue Jan 11 22:10:37 2011 -0800 +++ b/lib/gnulib.mk Tue Jan 11 22:13:06 2011 -0800 @@ -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 @@ ## end gnulib module c++defs -## begin gnulib module ftoastr +## begin gnulib module dtoastr + +libgnu_a_SOURCES += dtoastr.c -libgnu_a_SOURCES += ftoastr.h ftoastr.c dtoastr.c ldtoastr.c +EXTRA_DIST += ftoastr.c ftoastr.h -## end gnulib module ftoastr +EXTRA_libgnu_a_SOURCES += ftoastr.c + +## end gnulib module dtoastr ## begin gnulib module getopt-posix diff -r ecce7818cd6f -r f3056cf0073a lib/ldtoastr.c --- a/lib/ldtoastr.c Tue Jan 11 22:10:37 2011 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -#define LENGTH 3 -#include "ftoastr.c" diff -r ecce7818cd6f -r f3056cf0073a m4/gnulib-cache.m4 --- a/m4/gnulib-cache.m4 Tue Jan 11 22:10:37 2011 -0800 +++ b/m4/gnulib-cache.m4 Tue Jan 11 22:13:06 2011 -0800 @@ -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 -r ecce7818cd6f -r f3056cf0073a m4/gnulib-comp.m4 --- a/m4/gnulib-comp.m4 Tue Jan 11 22:10:37 2011 -0800 +++ b/m4/gnulib-comp.m4 Tue Jan 11 22:13:06 2011 -0800 @@ -28,9 +28,9 @@ 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 @@ gl_source_base='lib' # Code from module arg-nonnull: # Code from module c++defs: + # Code from module dtoastr: + AC_REQUIRE([gl_C99_STRTOLD]) # Code from module extensions: - # Code from module ftoastr: - AC_REQUIRE([gl_C99_STRTOLD]) # Code from module getopt-gnu: gl_FUNC_GETOPT_GNU gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu]) @@ -243,7 +243,6 @@ lib/getopt_int.h lib/gettext.h lib/intprops.h - lib/ldtoastr.c lib/mktime-internal.h lib/mktime.c lib/stddef.in.h