Sync "language", "lang_name", "territory", "country_name" with CLDR/langtable

[thirdparty/glibc.git] / locale / Makefile

diff --git a/locale/Makefile b/locale/Makefile
index 42c6772ceb2329cfa7e7801dcf3f59146c99c7b8..1a19b6fa9964a02863b97418b02bd280ad0e235c 100644 (file)
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -1,5 +1,4 @@
-# Copyright (C) 1991,1992,1995-2003,2005,2009,2011,2012
-# Free Software Foundation, Inc.
+# Copyright (C) 1991-2019 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -14,14 +13,17 @@
 
 # You should have received a copy of the GNU Lesser General Public
 # License along with the GNU C Library; if not, see
-# <http://www.gnu.org/licenses/>.
+# <https://www.gnu.org/licenses/>.
 
 #
 #      Makefile for locales.
 #
 subdir := locale
 
-headers                = locale.h bits/locale.h langinfo.h xlocale.h
+include ../Makeconfig
+
+headers                = langinfo.h locale.h bits/locale.h \
+                 bits/types/locale_t.h bits/types/__locale_t.h
 routines       = setlocale findlocale loadlocale loadarchive \
                  localeconv nl_langinfo nl_langinfo_l mb_cur_max \
                  newlocale duplocale freelocale uselocale
@@ -35,6 +37,8 @@ others                = localedef locale
 install-bin    = localedef locale
 extra-objs     = $(localedef-modules:=.o) $(localedef-aux:=.o) \
                  $(locale-modules:=.o) $(lib-modules:=.o)
+generated      += C-translit.h
+before-compile += $(objpfx)C-translit.h
 
 extra-libs     = libBrokenLocale
 extra-libs-others = $(extra-libs)
@@ -51,14 +55,21 @@ localedef-modules   := localedef $(categories:%=ld-%) \
                           repertoire locarchive
 localedef-aux          := md5
 locale-modules         := locale locale-spec
-lib-modules            := charmap-dir simple-hash xmalloc xstrdup
+lib-modules            := charmap-dir simple-hash xmalloc xstrdup \
+                          record-status
 
 
 GPERF = gperf
 GPERFFLAGS = -acCgopt -k1,2,5,9,$$ -L ANSI-C
 
+ifeq ($(run-built-tests),yes)
+tests-special += $(objpfx)tst-locale-locpath.out
+endif
+
 include ../Rules
 
+CFLAGS-md5.c += -I../crypt
+
 programs/%-kw.h: programs/%-kw.gperf
        cd programs \
        && $(GPERF) $(GPERFFLAGS) -N $(@F:-kw.h=_hash) $(<F) > $(@F).new
@@ -69,37 +80,38 @@ $(objpfx)localedef: $(localedef-aux:%=$(objpfx)%.o)
 $(objpfx)locale: $(locale-modules:%=$(objpfx)%.o)
 $(objpfx)localedef $(objpfx)locale: $(lib-modules:%=$(objpfx)%.o)
 
-C-translit.h: C-translit.h.in gen-translit.pl
-       $(PERL) gen-translit.pl < $< > $@.tmp
+$(objpfx)C-translit.h: C-translit.h.in gen-translit.py
+       $(make-target-directory)
+       $(PYTHON) gen-translit.py < $< > $@.tmp
        mv -f $@.tmp $@
 
-localepath = "$(localedir):$(i18ndir)"
+# The path to the compiled binary locale archive or compiled locales,
+# along with the parent path to the source locales and source
+# charmaps.
+localepath = "$(complocaledir):$(i18ndir)"
 
 # -Iprograms doesn't really belong here, but this gets it at the head
 # of the list instead of the tail, where CPPFLAGS-$(lib) gets added.
 # We need it before the standard -I's to see programs/config.h first.
-locale-CPPFLAGS = -DLOCALEDIR='"$(localedir)"' \
-                 -DLOCALE_ALIAS_PATH='"$(msgcatdir)"' \
+locale-CPPFLAGS = -DCOMPLOCALEDIR='"$(complocaledir)"' \
+                 -DLOCALE_ALIAS_PATH='"$(localedir)"' \
                  -Iprograms
 
 CPPFLAGS-locale-programs = -DLOCALE_PATH='$(localepath)' \
                           -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
                           -DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \
-                          -DLOCSRCDIR='"$(i18ndir)/locales"' \
-                          -DHAVE_CONFIG_H -DNOT_IN_libc
+                          -DLOCSRCDIR='"$(i18ndir)/locales"'
 
-CFLAGS-charmap.c = -Wno-write-strings -Wno-char-subscripts
-CFLAGS-locfile.c = -Wno-write-strings -Wno-char-subscripts
-CFLAGS-charmap-dir.c = -Wno-write-strings
+CFLAGS-charmap.c += -Wno-write-strings -Wno-char-subscripts
+CFLAGS-locfile.c += -Wno-write-strings -Wno-char-subscripts
+CFLAGS-charmap-dir.c += -Wno-write-strings
 
-# This makes sure -DNOT_IN_libc et al are passed for all these modules.
-cpp-srcs-left := $(addsuffix .c,$(localedef-modules) $(localedef-aux) \
-                               $(locale-modules) $(lib-modules))
+# Set libof-* for each routine.
+cpp-srcs-left := $(localedef-modules) $(localedef-aux) $(locale-modules) \
+                $(lib-modules)
 lib := locale-programs
-include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
+include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
 
-# Depend on libc.so so a DT_NEEDED is generated in the shared objects.
-# This ensures they will load libc.so for needed symbols if loaded by
-# a statically-linked program that hasn't already loaded it.
-$(objpfx)libBrokenLocale.so: $(common-objpfx)libc.so \
-                            $(common-objpfx)libc_nonshared.a
+$(objpfx)tst-locale-locpath.out : tst-locale-locpath.sh $(objpfx)locale
+       $(SHELL) $< '$(common-objpfx)' '$(test-wrapper-env)' '$(run-program-env)' > $@; \
+       $(evaluate-test)