summaryrefslogtreecommitdiff
path: root/lib/Makefile.in
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2018-03-07 05:54:53 +0100
committerJörg Frings-Fürst <debian@jff.email>2018-03-07 05:54:53 +0100
commit76ef1d8e3249e82a6965fd17157bee00a7857ff3 (patch)
tree7d3d34b059039faf525d1e95bbdc1945a9fa103c /lib/Makefile.in
parent0cb66c451a1a4e717878b8296b79c8d7cfd38b30 (diff)
parent93e8e16be294d19261c7378dd2e46d3f35f06926 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'lib/Makefile.in')
-rw-r--r--lib/Makefile.in30
1 files changed, 16 insertions, 14 deletions
diff --git a/lib/Makefile.in b/lib/Makefile.in
index e52262b8..f780ac59 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -14,7 +14,7 @@
@SET_MAKE@
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -2349,6 +2349,7 @@ HAVE_ISNANF = @HAVE_ISNANF@
HAVE_ISNANL = @HAVE_ISNANL@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LANGINFO_ALTMON = @HAVE_LANGINFO_ALTMON@
HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
@@ -2946,19 +2947,19 @@ EXTRA_DIST = alloca.in.h amemxfrm.h array-mergesort.h c-strcaseeq.h \
isnand-nolibm.h isnand.c float+.h isnan.c isnanf-nolibm.h \
isnanf.c float+.h isnan.c isnanl-nolibm.h isnanl.c iswblank.c \
langinfo.in.h limits.in.h config.charset ref-add.sin \
- ref-del.sin localename.h malloc.c malloca.h malloca.valgrind \
- math.in.h mbchar.h mbrtowc.c mbsinit.c memchr.c \
- memchr.valgrind memcmp2.h printf-frexp.h printf-frexp.c \
- printf-frexpl.h relocatable.c relocatable.h \
- relocatable.valgrind float+.h signbitd.c signbitf.c signbitl.c \
- _Noreturn.h arg-nonnull.h c++defs.h unused-parameter.h \
- warn-on-use.h stdbool.in.h stddef.in.h stdint.in.h stdlib.in.h \
- streq.h iconveh.h string.in.h strncat.c str-two-way.h strstr.c \
- sys_types.in.h $(top_srcdir)/build-aux/config.rpath \
- unicase.in.h unicase/cased.h unicase/caseprop.h \
- unictype/bitmap.h unicase/caseprop.h unicase/ignorable.h \
- unictype/bitmap.h unicase/locale-languages.h \
- unicase/locale-languages.gperf unicase/special-casing-table.h \
+ ref-del.sin localename.h malloc.c malloca.h math.in.h mbchar.h \
+ mbrtowc.c mbsinit.c memchr.c memchr.valgrind memcmp2.h \
+ printf-frexp.h printf-frexp.c printf-frexpl.h relocatable.c \
+ relocatable.h relocatable.valgrind float+.h signbitd.c \
+ signbitf.c signbitl.c _Noreturn.h arg-nonnull.h c++defs.h \
+ unused-parameter.h warn-on-use.h stdbool.in.h stddef.in.h \
+ stdint.in.h stdlib.in.h streq.h iconveh.h string.in.h \
+ strncat.c str-two-way.h strstr.c sys_types.in.h \
+ $(top_srcdir)/build-aux/config.rpath unicase.in.h \
+ unicase/cased.h unicase/caseprop.h unictype/bitmap.h \
+ unicase/caseprop.h unicase/ignorable.h unictype/bitmap.h \
+ unicase/locale-languages.h unicase/locale-languages.gperf \
+ unicase/special-casing-table.h \
unicase/special-casing-table.gperf unicase/special-casing.in.h \
unicase/casefold.h unicase/simple-mapping.h \
unicase/tocasefold.h unicase/simple-mapping.h \
@@ -4669,6 +4670,7 @@ langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U
-e 's/@''GNULIB_NL_LANGINFO''@/$(GNULIB_NL_LANGINFO)/g' \
-e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \
-e 's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \
+ -e 's|@''HAVE_LANGINFO_ALTMON''@|$(HAVE_LANGINFO_ALTMON)|g' \
-e 's|@''HAVE_LANGINFO_ERA''@|$(HAVE_LANGINFO_ERA)|g' \
-e 's|@''HAVE_LANGINFO_YESEXPR''@|$(HAVE_LANGINFO_YESEXPR)|g' \
-e 's|@''HAVE_NL_LANGINFO''@|$(HAVE_NL_LANGINFO)|g' \