string: Sort headers, routines, tests and tests-translation

Sort headers, routines, tests and tests-translation.  Put one entry per
line.

diff --git a/string/Makefile b/string/Makefile
index b65f602..641e062 100644 (file)
--- a/string/Makefile
+++ b/string/Makefile
@@ -22,52 +22,174 @@ subdir     := string
 
 include ../Makeconfig
 
-headers                := string.h bits/string_fortified.h                     \
-                  strings.h bits/strings_fortified.h                   \
-                  byteswap.h bits/byteswap.h                           \
-                  endian.h bits/endian.h bits/endianness.h             \
-                  bits/uintn-identity.h                                \
-                  memory.h argz.h envz.h
-
-routines       := strcat strchr strcmp strcoll strcpy strcspn          \
-                  strverscmp strdup strndup                            \
-                  strerror _strerror strlen strnlen                    \
-                  strncat strncmp strncpy                              \
-                  strrchr strpbrk strsignal strspn strstr strtok       \
-                  strtok_r strxfrm memchr memcmp memcmpeq memmove memset       \
-                  mempcpy bcopy bzero ffs ffsll stpcpy stpncpy         \
-                  strcasecmp strncase strcasecmp_l strncase_l          \
-                  memccpy memcpy wordcopy strsep strcasestr            \
-                  swab strfry memfrob memmem rawmemchr strchrnul       \
-                  $(addprefix argz-,append count create ctsep next     \
-                                    delete extract insert stringify    \
-                                    addsep replace)                    \
-                  envz basename                                        \
-                  strcoll_l strxfrm_l string-inlines memrchr           \
-                  xpg-strerror strerror_l explicit_bzero               \
-                  sigdescr_np sigabbrev_np strerrorname_np             \
-                  strerrordesc_np
-
-strop-tests    := memchr memcmp memcpy memcpy-large memcmpeq memmove mempcpy   \
-                  memset memccpy stpcpy stpncpy strcat strchr strcmp strcpy    \
-                  strcspn strlen strncmp strncpy strpbrk strrchr strspn memmem \
-                  strstr strcasestr strnlen strcasecmp strncasecmp     \
-                  strncat rawmemchr strchrnul bcopy bzero memrchr      \
-                  explicit_bzero
-tests          := tester inl-tester noinl-tester testcopy test-ffs     \
-                  tst-strlen stratcliff tst-svc tst-inlcall            \
-                  bug-strncat1 bug-strspn1 bug-strpbrk1 tst-bswap      \
-                  tst-strtok tst-strxfrm bug-strcoll1 tst-strfry       \
-                  bug-strtok1 $(addprefix test-,$(strop-tests))        \
-                  bug-envz1 tst-strxfrm2 tst-endian tst-svc2           \
-                  tst-strtok_r bug-strcoll2 tst-cmp tst-xbzero-opt     \
-                  test-endian-types test-endian-file-scope             \
-                  test-endian-sign-conversion tst-memmove-overflow     \
-                  test-sig_np
+headers := \
+  argz.h \
+  bits/byteswap.h \
+  bits/endian.h \
+  bits/endianness.h \
+  bits/string_fortified.h \
+  bits/strings_fortified.h \
+  bits/uintn-identity.h \
+  byteswap.h \
+  endian.h \
+  envz.h \
+  memory.h \
+  string.h \
+  strings.h \
+# headers
+
+routines := \
+  _strerror \
+  argz-addsep \
+  argz-append \
+  argz-count \
+  argz-create \
+  argz-ctsep \
+  argz-delete \
+  argz-extract \
+  argz-insert \
+  argz-next \
+  argz-replace \
+  argz-stringify \
+  basename \
+  bcopy \
+  bzero \
+  envz \
+  explicit_bzero \
+  ffs \
+  ffsll \
+  memccpy \
+  memchr \
+  memcmp \
+  memcmpeq \
+  memcpy \
+  memfrob \
+  memmem \
+  memmove \
+  mempcpy \
+  memrchr \
+  memset \
+  rawmemchr \
+  sigabbrev_np \
+  sigdescr_np \
+  stpcpy \
+  stpncpy \
+  strcasecmp \
+  strcasecmp_l \
+  strcasestr \
+  strcat \
+  strchr \
+  strchrnul \
+  strcmp \
+  strcoll \
+  strcoll_l \
+  strcpy \
+  strcspn \
+  strdup \
+  strerror \
+  strerror_l \
+  strerrordesc_np \
+  strerrorname_np \
+  strfry \
+  string-inlines \
+  strlen \
+  strncase \
+  strncase_l \
+  strncat \
+  strncmp \
+  strncpy \
+  strndup \
+  strnlen \
+  strpbrk \
+  strrchr \
+  strsep \
+  strsignal \
+  strspn \
+  strstr \
+  strtok \
+  strtok_r \
+  strverscmp \
+  strxfrm \
+  strxfrm_l \
+  swab \
+  wordcopy \
+  xpg-strerror \
+# routines
+
+tests := \
+  bug-envz1 \
+  bug-strcoll1 \
+  bug-strcoll2 \
+  bug-strncat1 \
+  bug-strpbrk1 \
+  bug-strspn1 \
+  bug-strtok1 \
+  inl-tester \
+  noinl-tester \
+  stratcliff \
+  test-bcopy \
+  test-bzero \
+  test-endian-file-scope \
+  test-endian-sign-conversion \
+  test-endian-types \
+  test-explicit_bzero \
+  test-ffs \
+  test-memccpy \
+  test-memchr \
+  test-memcmp \
+  test-memcmpeq \
+  test-memcpy \
+  test-memcpy-large \
+  test-memmem \
+  test-memmove \
+  test-mempcpy \
+  test-memrchr \
+  test-memset \
+  test-rawmemchr \
+  test-sig_np \
+  test-stpcpy \
+  test-stpncpy \
+  test-strcasecmp \
+  test-strcasestr \
+  test-strcat \
+  test-strchr \
+  test-strchrnul \
+  test-strcmp \
+  test-strcpy \
+  test-strcspn \
+  test-strlen \
+  test-strncasecmp \
+  test-strncat \
+  test-strncmp \
+  test-strncpy \
+  test-strnlen \
+  test-strpbrk \
+  test-strrchr \
+  test-strspn \
+  test-strstr \
+  testcopy \
+  tester \
+  tst-bswap \
+  tst-cmp \
+  tst-endian \
+  tst-inlcall \
+  tst-memmove-overflow \
+  tst-strfry \
+  tst-strlen \
+  tst-strtok \
+  tst-strtok_r \
+  tst-strxfrm \
+  tst-strxfrm2 \
+  tst-svc \
+  tst-svc2 \
+  tst-xbzero-opt \
+# tests
 
 # Both tests require the .mo translation files generated by msgfmt.
-tests-translation := tst-strsignal                                     \
-                    tst-strerror
+tests-translation := \
+  tst-strerror \
+  tst-strsignal \
+# tests-translation
 
 tests-container   += $(tests-translation)
 ifeq ($(MSGFMT),:)