From c3004417afc98585089a9282d1d4d60cdef5317a Mon Sep 17 00:00:00 2001
From: Carlos O'Donell <carlos@redhat.com>
Date: Thu, 11 May 2023 14:00:41 -0400
Subject: [PATCH] stdio-common: Reformat Makefile.

Reflow Makefile.
Sort using scripts/sort-makefile-lines.py.

Code generation is changed as routines are linked in sorted order
as expected.

No regressions on x86_64 and i686.
---
 stdio-common/Makefile | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 7cf8d814ea..1b4997afc8 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -22,7 +22,12 @@ subdir	:= stdio-common
 
 include ../Makeconfig
 
-headers	:= stdio_ext.h printf.h bits/printf-ldbl.h bits/stdio_lim.h
+headers := \
+  bits/printf-ldbl.h \
+  bits/stdio_lim.h \
+  printf.h \
+  stdio_ext.h \
+  # headers
 
 routines := \
   _itoa \
@@ -41,18 +46,18 @@ routines := \
   getw \
   grouping_iterator \
   iovfscanf \
-  isoc99_fscanf \
-  isoc99_scanf \
-  isoc99_sscanf \
-  isoc99_vfscanf \
-  isoc99_vscanf \
-  isoc99_vsscanf \
   isoc23_fscanf \
   isoc23_scanf \
   isoc23_sscanf \
   isoc23_vfscanf \
   isoc23_vscanf \
   isoc23_vsscanf \
+  isoc99_fscanf \
+  isoc99_scanf \
+  isoc99_sscanf \
+  isoc99_vfscanf \
+  isoc99_vscanf \
+  isoc99_vsscanf \
   itoa-digits \
   itoa-udigits \
   itowa-digits \
@@ -238,9 +243,9 @@ tests := \
   tst-unlockedio \
   tst-vfprintf-mbs-prec \
   tst-vfprintf-user-type \
+  tst-vfprintf-width-i18n \
   tst-vfprintf-width-prec \
   tst-vfprintf-width-prec-alloc \
-  tst-vfprintf-width-i18n \
   tst-wc-printf \
   tstdiomisc \
   tstgetln \
@@ -250,6 +255,7 @@ tests := \
 
 tests-container += \
   tst-popen3
+  # tests-container
 
 generated += \
   errlist-data-aux-shared.S \
@@ -262,7 +268,11 @@ tests-internal = \
   tst-grouping_iterator \
   # tests-internal
 
-test-srcs = tst-unbputc tst-printf tst-printfsz-islongdouble
+test-srcs = \
+  tst-printf \
+  tst-printfsz-islongdouble \
+  tst-unbputc \
+  # test-srcs
 
 ifeq ($(run-built-tests),yes)
 tests-special += \
@@ -340,7 +350,7 @@ LOCALES := \
   ja_JP.EUC-JP \
   ps_AF.UTF-8 \
   tg_TJ.UTF-8 \
- # LOCALES
+  # LOCALES
 include ../gen-locales.mk
 
 $(objpfx)bug14.out: $(gen-locales)
-- 
2.11.4.GIT