Update to 2.17

[platform/upstream/glibc.git] / localedata / Makefile

diff --git a/localedata/Makefile b/localedata/Makefile
index 6dc2524..d1218f5 100644 (file)
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2015 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
@@ -34,8 +34,7 @@ vpath %.h tests-mbwc
 
 
 test-srcs := collate-test xfrm-test tst-fmon tst-rpmatch tst-trans \
-            tst-mbswcs1 tst-mbswcs2 tst-mbswcs3 tst-mbswcs4 tst-mbswcs5 \
-            tst-ctype tst-wctype tst-langinfo tst-langinfo-static tst-numeric
+            tst-ctype tst-langinfo tst-langinfo-static tst-numeric
 test-input := de_DE.ISO-8859-1 en_US.ISO-8859-1 da_DK.ISO-8859-1 \
              hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 tr_TR.UTF-8 fr_FR.UTF-8 \
              si_LK.UTF-8
@@ -52,7 +51,7 @@ fmon-tests = n01y12 n02n40 n10y31 n11y41 n12y11 n20n32 n30y20 n41n00 \
             y01y10 y02n22 y22n42 y30y21 y32n31 y40y00 y42n21
 
 generated += $(test-input) $(test-output) sort-test.out tst-locale.out \
-            tst-mbswcs.out tst-leaks.mtrace mtrace-tst-leaks.out
+            tst-leaks.mtrace mtrace-tst-leaks.out
 generated-dirs += $(ld-test-names) tt_TT de_DE.437                     \
                  $(addprefix tstfmon_,$(fmon-tests))                   \
 
@@ -73,8 +72,10 @@ locale_test_suite := tst_iswalnum tst_iswalpha tst_iswcntrl            \
                     tst_wctype tst_wcwidth
 
 tests = $(locale_test_suite) tst-digits tst-setlocale bug-iconv-trans \
-       tst-leaks tst-mbswcs6 tst-xlocale1 tst-xlocale2 bug-usesetlocale \
-       tst-strfmon1 tst-sscanf bug-setlocale1 tst-setlocale2
+       tst-leaks tst-mbswcs1 tst-mbswcs2 tst-mbswcs3 tst-mbswcs4 tst-mbswcs5 \
+       tst-mbswcs6 tst-xlocale1 tst-xlocale2 bug-usesetlocale \
+       tst-strfmon1 tst-sscanf bug-setlocale1 tst-setlocale2 tst-setlocale3 \
+       tst-wctype
 tests-static = bug-setlocale1-static
 tests += $(tests-static)
 ifeq (yes,$(build-shared))
@@ -91,22 +92,21 @@ install-others := $(addprefix $(inst_i18ndir)/, \
 
 tests: $(objdir)/iconvdata/gconv-modules
 
+tests-static += tst-langinfo-static
+
+ifeq ($(run-built-tests),yes)
 tests-special += $(objpfx)sort-test.out $(objpfx)tst-fmon.out \
                 $(objpfx)tst-locale.out $(objpfx)tst-rpmatch.out \
-                $(objpfx)tst-trans.out $(objpfx)tst-mbswcs.out \
-                $(objpfx)tst-ctype.out $(objpfx)tst-wctype.out \
+                $(objpfx)tst-trans.out $(objpfx)tst-ctype.out \
                 $(objpfx)tst-langinfo.out $(objpfx)tst-langinfo-static.out \
                 $(objpfx)tst-numeric.out
-tests-static += tst-langinfo-static
-
-ifeq ($(run-built-tests),yes)
 # We have to generate locales
 LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 \
           en_US.ISO-8859-1 en_US.UTF-8 ja_JP.EUC-JP da_DK.ISO-8859-1 \
           hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 ja_JP.SJIS fr_FR.ISO-8859-1 \
           nb_NO.ISO-8859-1 nn_NO.ISO-8859-1 tr_TR.UTF-8 cs_CZ.UTF-8 \
           zh_TW.EUC-TW fa_IR.UTF-8 fr_FR.UTF-8 ja_JP.UTF-8 si_LK.UTF-8 \
-          tr_TR.ISO-8859-9
+          tr_TR.ISO-8859-9 en_GB.UTF-8
 LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^ ]*/\1/g')
 CHARMAPS := $(shell echo "$(LOCALES)" | \
                    sed -e 's/[^ .]*[.]\([^ ]*\)/\1/g' -e s/SJIS/SHIFT_JIS/g)
@@ -126,14 +126,6 @@ $(inst_i18ndir)/charmaps/%.gz: charmaps/% $(+force)
 # Install the locale source files in the appropriate directory.
 $(inst_i18ndir)/locales/%: locales/% $(+force); $(do-install)
 
-# gcc does not know all the format specifiers we are using here.
-CFLAGS-tst-mbswcs1.c = -Wno-format
-CFLAGS-tst-mbswcs2.c = -Wno-format
-CFLAGS-tst-mbswcs3.c = -Wno-format
-CFLAGS-tst-mbswcs4.c = -Wno-format
-CFLAGS-tst-mbswcs5.c = -Wno-format
-CFLAGS-tst-trans.c = -Wno-format
-
 
 ifeq ($(run-built-tests),yes)
 generated-dirs += $(LOCALES)
@@ -189,24 +181,12 @@ $(objpfx)tst-trans.out: tst-trans.sh $(objpfx)tst-trans \
                 '$(test-program-prefix-before-env)' \
                 '$(test-program-prefix-after-env)'; \
        $(evaluate-test)
-$(objpfx)tst-mbswcs.out: tst-mbswcs.sh $(objpfx)tst-mbswcs1 \
-                        $(objpfx)tst-mbswcs2 $(objpfx)tst-mbswcs3 \
-                        $(objpfx)tst-mbswcs4 $(objpfx)tst-mbswcs5 \
-                        $(addprefix $(objpfx),$(CTYPE_FILES))
-       $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'; \
-       $(evaluate-test)
 $(objpfx)tst-ctype.out: tst-ctype.sh $(objpfx)tst-ctype \
                        $(objpfx)sort-test.out \
                        $(addprefix $(objpfx),$(CTYPE_FILES))
        $(SHELL) $< $(common-objpfx) '$(test-program-cmd-before-env)' \
                 '$(run-program-env)' '$(test-program-cmd-after-env)'; \
        $(evaluate-test)
-$(objpfx)tst-wctype.out: tst-wctype.sh $(objpfx)tst-wctype \
-                       $(objpfx)sort-test.out tst-wctype.input \
-                       $(addprefix $(objpfx),$(CTYPE_FILES))
-       $(SHELL) $< $(common-objpfx) '$(test-program-cmd-before-env)' \
-                '$(run-program-env)' '$(test-program-cmd-after-env)'; \
-       $(evaluate-test)
 $(objpfx)tst-langinfo.out: tst-langinfo.sh $(objpfx)tst-langinfo \
                        $(objpfx)sort-test.out \
                        $(addprefix $(objpfx),$(CTYPE_FILES))
@@ -229,7 +209,7 @@ INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES))
 
 # Sometimes the whole collection of locale files should be installed.
 LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
-$(elf-objpfx)ld.so --library-path $(rpath-link) $(common-objpfx)locale/localedef
+$(rtld-prefix) $(common-objpfx)locale/localedef
 install-locales: $(INSTALL-SUPPORTED-LOCALES)
 
 install-locales-dir:
@@ -250,6 +230,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
        echo ' done'; \
 
 tst-setlocale-ENV = LC_ALL=ja_JP.EUC-JP
+tst-wctype-ENV = LC_ALL=ja_JP.EUC-JP
 
 tst-leaks-ENV = MALLOC_TRACE=$(objpfx)tst-leaks.mtrace
 $(objpfx)mtrace-tst-leaks.out: $(objpfx)tst-leaks.out