diff options
| author | Paul Eggert | 2011-01-11 22:13:06 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-11 22:13:06 -0800 |
| commit | f737437b23c75bb6924021df14b4f740ce370b21 (patch) | |
| tree | a8942a6d42625460682b532032f4af3ceea1ad73 /lib | |
| parent | ecbfcc83bf862f5f9d78ad9100c89c44cde8d4a3 (diff) | |
| download | emacs-f737437b23c75bb6924021df14b4f740ce370b21.tar.gz emacs-f737437b23c75bb6924021df14b4f740ce370b21.zip | |
Regenerate.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.in | 17 | ||||
| -rw-r--r-- | lib/gnulib.mk | 12 | ||||
| -rw-r--r-- | lib/ldtoastr.c | 2 |
3 files changed, 16 insertions, 15 deletions
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 @@ | |||
| 24 | # the same distribution terms as the rest of that program. | 24 | # the same distribution terms as the rest of that program. |
| 25 | # | 25 | # |
| 26 | # Generated by gnulib-tool. | 26 | # Generated by gnulib-tool. |
| 27 | # 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 | 27 | # 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 |
| 28 | 28 | ||
| 29 | VPATH = @srcdir@ | 29 | VPATH = @srcdir@ |
| 30 | pkgdatadir = $(datadir)/@PACKAGE@ | 30 | pkgdatadir = $(datadir)/@PACKAGE@ |
| @@ -69,8 +69,7 @@ AR = ar | |||
| 69 | ARFLAGS = cru | 69 | ARFLAGS = cru |
| 70 | libgnu_a_AR = $(AR) $(ARFLAGS) | 70 | libgnu_a_AR = $(AR) $(ARFLAGS) |
| 71 | am__DEPENDENCIES_1 = | 71 | am__DEPENDENCIES_1 = |
| 72 | am_libgnu_a_OBJECTS = ftoastr.$(OBJEXT) dtoastr.$(OBJEXT) \ | 72 | am_libgnu_a_OBJECTS = dtoastr.$(OBJEXT) |
| 73 | ldtoastr.$(OBJEXT) | ||
| 74 | libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS) | 73 | libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS) |
| 75 | depcomp = $(SHELL) $(top_srcdir)/depcomp | 74 | depcomp = $(SHELL) $(top_srcdir)/depcomp |
| 76 | am__depfiles_maybe = depfiles | 75 | am__depfiles_maybe = depfiles |
| @@ -471,19 +470,20 @@ x_default_search_path = @x_default_search_path@ | |||
| 471 | BUILT_SOURCES = arg-nonnull.h c++defs.h $(GETOPT_H) $(STDDEF_H) time.h \ | 470 | BUILT_SOURCES = arg-nonnull.h c++defs.h $(GETOPT_H) $(STDDEF_H) time.h \ |
| 472 | unistd.h warn-on-use.h | 471 | unistd.h warn-on-use.h |
| 473 | EXTRA_DIST = $(top_srcdir)/./arg-nonnull.h $(top_srcdir)/./c++defs.h \ | 472 | EXTRA_DIST = $(top_srcdir)/./arg-nonnull.h $(top_srcdir)/./c++defs.h \ |
| 474 | getopt.c getopt.in.h getopt1.c getopt_int.h intprops.h \ | 473 | ftoastr.c ftoastr.h getopt.c getopt.in.h getopt1.c \ |
| 475 | mktime-internal.h mktime.c stddef.in.h time.in.h time_r.c \ | 474 | getopt_int.h intprops.h mktime-internal.h mktime.c stddef.in.h \ |
| 476 | unistd.in.h $(top_srcdir)/./warn-on-use.h | 475 | time.in.h time_r.c unistd.in.h $(top_srcdir)/./warn-on-use.h |
| 477 | MOSTLYCLEANFILES = core *.stackdump arg-nonnull.h arg-nonnull.h-t \ | 476 | MOSTLYCLEANFILES = core *.stackdump arg-nonnull.h arg-nonnull.h-t \ |
| 478 | c++defs.h c++defs.h-t getopt.h getopt.h-t stddef.h stddef.h-t \ | 477 | c++defs.h c++defs.h-t getopt.h getopt.h-t stddef.h stddef.h-t \ |
| 479 | time.h time.h-t unistd.h unistd.h-t warn-on-use.h \ | 478 | time.h time.h-t unistd.h unistd.h-t warn-on-use.h \ |
| 480 | warn-on-use.h-t | 479 | warn-on-use.h-t |
| 481 | noinst_LIBRARIES = libgnu.a | 480 | noinst_LIBRARIES = libgnu.a |
| 482 | DEFAULT_INCLUDES = -I. -I../src -I$(top_srcdir)/src | 481 | DEFAULT_INCLUDES = -I. -I../src -I$(top_srcdir)/src |
| 483 | libgnu_a_SOURCES = ftoastr.h ftoastr.c dtoastr.c ldtoastr.c gettext.h | 482 | libgnu_a_SOURCES = dtoastr.c gettext.h |
| 484 | libgnu_a_LIBADD = $(gl_LIBOBJS) | 483 | libgnu_a_LIBADD = $(gl_LIBOBJS) |
| 485 | libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) | 484 | libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) |
| 486 | EXTRA_libgnu_a_SOURCES = getopt.c getopt1.c mktime.c time_r.c | 485 | EXTRA_libgnu_a_SOURCES = ftoastr.c getopt.c getopt1.c mktime.c \ |
| 486 | time_r.c | ||
| 487 | ARG_NONNULL_H = arg-nonnull.h | 487 | ARG_NONNULL_H = arg-nonnull.h |
| 488 | CXXDEFS_H = c++defs.h | 488 | CXXDEFS_H = c++defs.h |
| 489 | WARN_ON_USE_H = warn-on-use.h | 489 | WARN_ON_USE_H = warn-on-use.h |
| @@ -540,7 +540,6 @@ distclean-compile: | |||
| 540 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftoastr.Po@am__quote@ | 540 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftoastr.Po@am__quote@ |
| 541 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@ | 541 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@ |
| 542 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@ | 542 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@ |
| 543 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldtoastr.Po@am__quote@ | ||
| 544 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mktime.Po@am__quote@ | 543 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mktime.Po@am__quote@ |
| 545 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time_r.Po@am__quote@ | 544 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time_r.Po@am__quote@ |
| 546 | 545 | ||
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 @@ | |||
| 9 | # the same distribution terms as the rest of that program. | 9 | # the same distribution terms as the rest of that program. |
| 10 | # | 10 | # |
| 11 | # Generated by gnulib-tool. | 11 | # Generated by gnulib-tool. |
| 12 | # 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 | 12 | # 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 |
| 13 | 13 | ||
| 14 | 14 | ||
| 15 | MOSTLYCLEANFILES += core *.stackdump | 15 | MOSTLYCLEANFILES += core *.stackdump |
| @@ -69,11 +69,15 @@ EXTRA_DIST += $(top_srcdir)/./c++defs.h | |||
| 69 | 69 | ||
| 70 | ## end gnulib module c++defs | 70 | ## end gnulib module c++defs |
| 71 | 71 | ||
| 72 | ## begin gnulib module ftoastr | 72 | ## begin gnulib module dtoastr |
| 73 | 73 | ||
| 74 | libgnu_a_SOURCES += ftoastr.h ftoastr.c dtoastr.c ldtoastr.c | 74 | libgnu_a_SOURCES += dtoastr.c |
| 75 | 75 | ||
| 76 | ## end gnulib module ftoastr | 76 | EXTRA_DIST += ftoastr.c ftoastr.h |
| 77 | |||
| 78 | EXTRA_libgnu_a_SOURCES += ftoastr.c | ||
| 79 | |||
| 80 | ## end gnulib module dtoastr | ||
| 77 | 81 | ||
| 78 | ## begin gnulib module getopt-posix | 82 | ## begin gnulib module getopt-posix |
| 79 | 83 | ||
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 @@ | |||
| 1 | #define LENGTH 3 | ||
| 2 | #include "ftoastr.c" | ||