localedata: Sort Makefile variables.

Sort Makefile variables using scrips/sort-makefile-lines.py.

No regressions on x86_64.

localedata/Makefile

@@ -28,18 +28,26 @@ charmaps := $(wildcard charmaps/[A-I]*) $(wildcard charmaps/[J-Z]*)
 # List with all available character set descriptions.
 locales := $(wildcard locales/*)
 
-
 subdir-dirs = tests-mbwc
 vpath %.c tests-mbwc
 vpath %.h tests-mbwc
 
-
+test-srcs := \
-test-srcs := collate-test xfrm-test tst-fmon tst-rpmatch tst-trans \
+  collate-test \
-	     tst-ctype tst-langinfo-newlocale tst-langinfo-setlocale \
+  tst-ctype \
-	     tst-langinfo-newlocale-static tst-langinfo-setlocale-static \
+  tst-fmon \
-	     tst-numeric
+  tst-langinfo-newlocale \
+  tst-langinfo-newlocale-static \
+  tst-langinfo-setlocale \
+  tst-langinfo-setlocale-static \
+  tst-numeric \
+  tst-rpmatch \
+  tst-trans \
+  xfrm-test \
+  # test-srcs
 # List of test input files (list sorted alphabetically):
 test-input := \
+  C.UTF-8 \
   am_ET.UTF-8 \
   az_AZ.UTF-8 \
   be_BY.UTF-8 \
@@ -48,7 +56,6 @@ test-input := \
   bg_BG.UTF-8 \
   br_FR.UTF-8 \
   bs_BA.UTF-8 \
-	C.UTF-8 \
   ckb_IQ.UTF-8 \
   cmn_TW.UTF-8 \
   crh_UA.UTF-8 \
@@ -124,7 +131,7 @@ test-input := \
   yi_US.UTF-8 \
   yo_NG.UTF-8 \
   zh_CN.UTF-8 \
-	$(NULL)
+  # test-input
 
 test-input-data = $(addsuffix .in, $(test-input))
 test-output := $(foreach s, .out .xout, \
@@ -135,29 +142,92 @@ ld-test-srcs := $(addprefix tests/,$(addsuffix .cm,$(ld-test-names)) \
 				   $(addsuffix .ds,test5 test6) \
 				   test6.c trans.def)
 
-fmon-tests = n01y12 n02n40 n10y31 n11y41 n12y11 n20n32 n30y20 n41n00 \
+fmon-tests = \
-	     y01y10 y02n22 y22n42 y30y21 y32n31 y40y00 y42n21
+  n01y12 \
+  n02n40 \
+  n10y31 \
+  n11y41 \
+  n12y11 \
+  n20n32 \
+  n30y20 \
+  n41n00 \
+  y01y10 \
+  y02n22 \
+  y22n42 \
+  y30y21 \
+  y32n31 \
+  y40y00 \
+  y42n21 \
+  # fmon-tests
 
-generated += $(test-input) $(test-output) sort-test.out tst-locale.out \
+generated += \
-	     tst-leaks.mtrace mtrace-tst-leaks.out
+  $(test-input) \
-generated-dirs += $(ld-test-names) tt_TT de_DE.437			\
+  $(test-output) \
+  mtrace-tst-leaks.out \
+  sort-test.out \
+  tst-leaks.mtrace \
+  tst-locale.out \
+  # generated
+generated-dirs += \
   $(addprefix tstfmon_,$(fmon-tests)) \
+  $(ld-test-names) \
+  de_DE.437 \
+  tt_TT \
+  # generated-dirs
 
 ifeq ($(run-built-tests),yes)
-locale_test_suite := tst_iswalnum tst_iswalpha tst_iswcntrl            \
+locale_test_suite := \
-		     tst_iswctype tst_iswdigit tst_iswgraph            \
+  tst_iswalnum \
-		     tst_iswlower tst_iswprint tst_iswpunct            \
+  tst_iswalpha \
-		     tst_iswspace tst_iswupper tst_iswxdigit tst_mblen \
+  tst_iswcntrl \
-		     tst_mbrlen tst_mbrtowc tst_mbsrtowcs tst_mbstowcs \
+  tst_iswctype \
-		     tst_mbtowc tst_strcoll tst_strfmon tst_strxfrm    \
+  tst_iswdigit \
-		     tst_swscanf tst_towctrans tst_towlower            \
+  tst_iswgraph \
-		     tst_towupper tst_wcrtomb tst_wcscat tst_wcschr    \
+  tst_iswlower \
-		     tst_wcscmp tst_wcscoll tst_wcscpy tst_wcscspn     \
+  tst_iswprint \
-		     tst_wcslen tst_wcsncat tst_wcsncmp tst_wcsncpy    \
+  tst_iswpunct \
-		     tst_wcspbrk tst_wcsrtombs tst_wcsspn tst_wcsstr   \
+  tst_iswspace \
-		     tst_wcstod tst_wcstok tst_wcstombs tst_wcswidth   \
+  tst_iswupper \
-		     tst_wcsxfrm tst_wctob tst_wctomb tst_wctrans      \
+  tst_iswxdigit \
-		     tst_wctype tst_wcwidth
+  tst_mblen \
+  tst_mbrlen \
+  tst_mbrtowc \
+  tst_mbsrtowcs \
+  tst_mbstowcs \
+  tst_mbtowc \
+  tst_strcoll \
+  tst_strfmon \
+  tst_strxfrm \
+  tst_swscanf \
+  tst_towctrans \
+  tst_towlower \
+  tst_towupper \
+  tst_wcrtomb \
+  tst_wcscat \
+  tst_wcschr \
+  tst_wcscmp \
+  tst_wcscoll \
+  tst_wcscpy \
+  tst_wcscspn \
+  tst_wcslen \
+  tst_wcsncat \
+  tst_wcsncmp \
+  tst_wcsncpy \
+  tst_wcspbrk \
+  tst_wcsrtombs \
+  tst_wcsspn \
+  tst_wcsstr \
+  tst_wcstod \
+  tst_wcstok \
+  tst_wcstombs \
+  tst_wcswidth \
+  tst_wcsxfrm \
+  tst_wctob \
+  tst_wctomb \
+  tst_wctrans \
+  tst_wctype \
+  tst_wcwidth \
+  # locale_test_suite
 
 tests = \
   $(locale_test_suite) \
@@ -194,7 +264,8 @@ endif
 endif
 endif
 tests-container = \
-			tst-localedef-hardlinks
+  tst-localedef-hardlinks \
+  # tests-container
 
 # Files to install.
 ifeq ($(INSTALL_UNCOMPRESSED),yes)
@@ -211,19 +282,28 @@ endif
 
 tests: $(objdir)/iconvdata/gconv-modules
 
-tests-static += tst-langinfo-newlocale-static tst-langinfo-setlocale-static
+tests-static += \
+  tst-langinfo-newlocale-static \
+  tst-langinfo-setlocale-static \
+  # tests-static
 
 ifeq ($(run-built-tests),yes)
-tests-special += $(objpfx)sort-test.out $(objpfx)tst-fmon.out \
+tests-special += \
-		 $(objpfx)tst-locale.out $(objpfx)tst-rpmatch.out \
+  $(objpfx)sort-test.out \
-		 $(objpfx)tst-trans.out $(objpfx)tst-ctype.out \
+  $(objpfx)tst-ctype.out \
-		 $(objpfx)tst-langinfo-newlocale.out \
+  $(objpfx)tst-fmon.out \
-		 $(objpfx)tst-langinfo-setlocale.out \
   $(objpfx)tst-langinfo-newlocale-static.out \
+  $(objpfx)tst-langinfo-newlocale.out \
   $(objpfx)tst-langinfo-setlocale-static.out \
-		 $(objpfx)tst-numeric.out
+  $(objpfx)tst-langinfo-setlocale.out \
+  $(objpfx)tst-locale.out \
+  $(objpfx)tst-numeric.out \
+  $(objpfx)tst-rpmatch.out \
+  $(objpfx)tst-trans.out \
+  # tests-special
 # We have to generate locales (list sorted alphabetically)
 LOCALES := \
+  C.UTF-8 \
   am_ET.UTF-8 \
   az_AZ.UTF-8 \
   be_BY.UTF-8 \
@@ -232,7 +312,6 @@ LOCALES := \
   bg_BG.UTF-8 \
   br_FR.UTF-8 \
   bs_BA.UTF-8 \
-	C.UTF-8 \
   ckb_IQ.UTF-8 \
   cmn_TW.UTF-8 \
   crh_UA.UTF-8 \
@@ -320,7 +399,7 @@ LOCALES := \
   yo_NG.UTF-8 \
   zh_CN.UTF-8 \
   zh_TW.EUC-TW \
-	$(NULL)
+  # LOCALES
 
 include ../gen-locales.mk