diff options
| author | Paul Eggert | 2011-01-11 22:10:37 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-11 22:10:37 -0800 |
| commit | ecbfcc83bf862f5f9d78ad9100c89c44cde8d4a3 (patch) | |
| tree | 12443e4203d05aabc8d2ba1def7d277dc15a16df | |
| parent | 7ea547574105f338c900d0c59390287c750a18c0 (diff) | |
| download | emacs-ecbfcc83bf862f5f9d78ad9100c89c44cde8d4a3.tar.gz emacs-ecbfcc83bf862f5f9d78ad9100c89c44cde8d4a3.zip | |
* 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>.
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | Makefile.in | 2 |
2 files changed, 10 insertions, 6 deletions
| @@ -1,4 +1,8 @@ | |||
| 1 | 2011-01-09 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-01-11 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | |||
| 3 | * Makefile.in (GNULIB_MODULES): Change ftoastr to dtoastr. | ||
| 4 | This avoids building ftoastr and ldtoastr, which aren't needed. See | ||
| 5 | <http://lists.gnu.org/archive/html/bug-gnulib/2011-01/msg00199.html>. | ||
| 2 | 6 | ||
| 3 | * .bzrignore: Add .h files that are host-dependent. | 7 | * .bzrignore: Add .h files that are host-dependent. |
| 4 | Add lib/.deps/, lib/arg-nonnull.h, lib/c++defs.h, lib/getopt.h, | 8 | Add lib/.deps/, lib/arg-nonnull.h, lib/c++defs.h, lib/getopt.h, |
| @@ -8,7 +12,7 @@ | |||
| 8 | 12 | ||
| 9 | * lib/Makefile.in: Regenerate. | 13 | * lib/Makefile.in: Regenerate. |
| 10 | * lib/COPYING: New file, a copy of COPYING. | 14 | * lib/COPYING: New file, a copy of COPYING. |
| 11 | 15 | ||
| 12 | * configure: Regenerate. | 16 | * configure: Regenerate. |
| 13 | * configure.in (AC_USE_SYSTEM_EXTENSIONS): Remove: gnulib does this. | 17 | * configure.in (AC_USE_SYSTEM_EXTENSIONS): Remove: gnulib does this. |
| 14 | 18 | ||
| @@ -19,7 +23,7 @@ | |||
| 19 | * aclocal.m4, configure, lib/Makefile.in, m4/getopt.m4: | 23 | * aclocal.m4, configure, lib/Makefile.in, m4/getopt.m4: |
| 20 | * m4/gnulib-cache.m4, m4/gnulib-comp.m4, src/config.in: | 24 | * m4/gnulib-cache.m4, m4/gnulib-comp.m4, src/config.in: |
| 21 | Regenerate. | 25 | Regenerate. |
| 22 | 26 | ||
| 23 | Use gnulib's getopt-gnu module. | 27 | Use gnulib's getopt-gnu module. |
| 24 | * Makefile.in (GNULIB_MODULES): Add getopt-gnu. | 28 | * Makefile.in (GNULIB_MODULES): Add getopt-gnu. |
| 25 | (AUTOCONF_INPUTS): Remove getopt.m4; aclocal.m4 is a good-enough | 29 | (AUTOCONF_INPUTS): Remove getopt.m4; aclocal.m4 is a good-enough |
| @@ -27,7 +31,7 @@ | |||
| 27 | * configure.in: Do not configure getopt, as gnulib does that now. | 31 | * configure.in: Do not configure getopt, as gnulib does that now. |
| 28 | * make-dist: Do not worry about lib-src/getopt.h, as gnulib handles | 32 | * make-dist: Do not worry about lib-src/getopt.h, as gnulib handles |
| 29 | getopt now, in lib. | 33 | getopt now, in lib. |
| 30 | 34 | ||
| 31 | Regenerate. | 35 | Regenerate. |
| 32 | * arg-nonnull.h, c++defs.h, lib/mktime-internal.h, lib/mktime.c: | 36 | * arg-nonnull.h, c++defs.h, lib/mktime-internal.h, lib/mktime.c: |
| 33 | * lib/stddef.in.h, lib/time.h, lib/time.in.h, lib/time_r.c: | 37 | * lib/stddef.in.h, lib/time.h, lib/time.in.h, lib/time_r.c: |
| @@ -61,7 +65,7 @@ | |||
| 61 | * aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk: | 65 | * aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk: |
| 62 | * m4/gnulib-cache.m4, m4/gnulib-comp.m4, src/config.in: | 66 | * m4/gnulib-cache.m4, m4/gnulib-comp.m4, src/config.in: |
| 63 | Regenerate. | 67 | Regenerate. |
| 64 | 68 | ||
| 65 | Use gnulib's ftoastr module. | 69 | Use gnulib's ftoastr module. |
| 66 | * Makefile.in (GNULIB_MODULES): Add ftoastr. Remove dummy. | 70 | * Makefile.in (GNULIB_MODULES): Add ftoastr. Remove dummy. |
| 67 | 71 | ||
diff --git a/Makefile.in b/Makefile.in index 439c3736a4e..72e642c79c0 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -330,7 +330,7 @@ $(gnulib_srcdir): | |||
| 330 | # Update modules from gnulib, for maintainers, who should have it in | 330 | # Update modules from gnulib, for maintainers, who should have it in |
| 331 | # $(gnulib_srcdir) (relative to $(srcdir) and should have build tools | 331 | # $(gnulib_srcdir) (relative to $(srcdir) and should have build tools |
| 332 | # as per $(gnulib_srcdir)/DEPENDENCIES. | 332 | # as per $(gnulib_srcdir)/DEPENDENCIES. |
| 333 | GNULIB_MODULES = ftoastr getopt-gnu mktime | 333 | GNULIB_MODULES = dtoastr getopt-gnu mktime |
| 334 | GNULIB_TOOL_FLAGS = \ | 334 | GNULIB_TOOL_FLAGS = \ |
| 335 | --import --no-changelog --no-vc-files --makefile-name=gnulib.mk | 335 | --import --no-changelog --no-vc-files --makefile-name=gnulib.mk |
| 336 | sync-from-gnulib: $(gnulib_srcdir) | 336 | sync-from-gnulib: $(gnulib_srcdir) |