From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 12 Jan 2011 06:10:37 +0000 (-0800)
Subject: * Makefile.in (GNULIB_MODULES): Change ftoastr to dtoastr.
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~238
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ecbfcc83bf862f5f9d78ad9100c89c44cde8d4a3;p=emacs.git

* Makefile.in (GNULIB_MODULES): Change ftoastr to dtoastr.
This avoids building ftoastr and ldtoastr, which aren't needed.  See
<http://lists.gnu.org/archive/html/bug-gnulib/2011-01/msg00199.html>.
---

diff --git a/ChangeLog b/ChangeLog
index 861c351a259..54b6958607e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2011-01-09  Paul Eggert  <eggert@cs.ucla.edu>
+2011-01-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* Makefile.in (GNULIB_MODULES): Change ftoastr to dtoastr.
+	This avoids building ftoastr and ldtoastr, which aren't needed.  See
+	<http://lists.gnu.org/archive/html/bug-gnulib/2011-01/msg00199.html>.
 
 	* .bzrignore: Add .h files that are host-dependent.
 	Add lib/.deps/, lib/arg-nonnull.h, lib/c++defs.h, lib/getopt.h,
@@ -8,7 +12,7 @@
 
 	* lib/Makefile.in: Regenerate.
 	* lib/COPYING: New file, a copy of COPYING.
-	
+
 	* configure: Regenerate.
 	* configure.in (AC_USE_SYSTEM_EXTENSIONS): Remove: gnulib does this.
 
@@ -19,7 +23,7 @@
 	* aclocal.m4, configure, lib/Makefile.in, m4/getopt.m4:
 	* m4/gnulib-cache.m4, m4/gnulib-comp.m4, src/config.in:
 	Regenerate.
-	
+
 	Use gnulib's getopt-gnu module.
 	* Makefile.in (GNULIB_MODULES): Add getopt-gnu.
 	(AUTOCONF_INPUTS): Remove getopt.m4; aclocal.m4 is a good-enough
@@ -27,7 +31,7 @@
 	* configure.in: Do not configure getopt, as gnulib does that now.
 	* make-dist: Do not worry about lib-src/getopt.h, as gnulib handles
 	getopt now, in lib.
-	
+
 	Regenerate.
 	* arg-nonnull.h, c++defs.h, lib/mktime-internal.h, lib/mktime.c:
 	* lib/stddef.in.h, lib/time.h, lib/time.in.h, lib/time_r.c:
@@ -61,7 +65,7 @@
 	* aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk:
 	* m4/gnulib-cache.m4, m4/gnulib-comp.m4, src/config.in:
 	Regenerate.
-	
+
 	Use gnulib's ftoastr module.
 	* Makefile.in (GNULIB_MODULES): Add ftoastr.  Remove dummy.
 
diff --git a/Makefile.in b/Makefile.in
index 439c3736a4e..72e642c79c0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -330,7 +330,7 @@ $(gnulib_srcdir):
 # Update modules from gnulib, for maintainers, who should have it in
 # $(gnulib_srcdir) (relative to $(srcdir) and should have build tools
 # as per $(gnulib_srcdir)/DEPENDENCIES.
-GNULIB_MODULES = ftoastr getopt-gnu mktime
+GNULIB_MODULES = dtoastr getopt-gnu mktime
 GNULIB_TOOL_FLAGS = \
  --import --no-changelog --no-vc-files --makefile-name=gnulib.mk
 sync-from-gnulib: $(gnulib_srcdir)