On Wed Dec 24, 2025 at 3:31 PM CET, Jelte Fennema-Nio wrote:
Oops. Fixed in attached.
I had accidentally included a trailing backspace in one of the lists. To my surprise that worked fine. Since these trailing separators result in smaller git diffs when a new item is added at the end of the list, I decided to put such trailing backslashes in all the lists in this patch.
From eae0b29d74299891e1bd3ad2bf39af646125f4ff Mon Sep 17 00:00:00 2001 From: Jelte Fennema-Nio <[email protected]> Date: Wed, 24 Dec 2025 10:55:25 +0100 Subject: [PATCH v3] cleanup: Split long Makefile lists across lines and sort them This makes sure that the lines don't get excessively long, while keeping diffs that add/remove elements small. Co-Authored-By: Jacob Champion <[email protected]> --- contrib/pageinspect/Makefile | 11 ++++++++++- src/backend/optimizer/Makefile | 7 ++++++- src/backend/storage/Makefile | 12 +++++++++++- src/bin/scripts/Makefile | 10 +++++++++- src/interfaces/ecpg/Makefile | 7 ++++++- src/pl/tcl/Makefile | 11 ++++++++++- src/test/Makefile | 10 +++++++++- src/test/examples/Makefile | 8 +++++++- 8 files changed, 68 insertions(+), 8 deletions(-) diff --git a/contrib/pageinspect/Makefile b/contrib/pageinspect/Makefile index 9dee7653310..2a8717fe678 100644 --- a/contrib/pageinspect/Makefile +++ b/contrib/pageinspect/Makefile @@ -23,7 +23,16 @@ DATA = pageinspect--1.12--1.13.sql \ pageinspect--1.0--1.1.sql PGFILEDESC = "pageinspect - functions to inspect contents of database pages" -REGRESS = page btree brin gin gist hash checksum oldextversions +# page is first because it creates the extension +REGRESS = \ + page \ + brin \ + btree \ + checksum \ + gin \ + gist \ + hash \ + oldextversions \ ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/src/backend/optimizer/Makefile b/src/backend/optimizer/Makefile index f523e5e33ea..28ba196cb5c 100644 --- a/src/backend/optimizer/Makefile +++ b/src/backend/optimizer/Makefile @@ -8,6 +8,11 @@ subdir = src/backend/optimizer top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -SUBDIRS = geqo path plan prep util +SUBDIRS = \ + geqo \ + path \ + plan \ + prep \ + util \ include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/storage/Makefile b/src/backend/storage/Makefile index eec03f6f2b4..b0cdd973108 100644 --- a/src/backend/storage/Makefile +++ b/src/backend/storage/Makefile @@ -8,6 +8,16 @@ subdir = src/backend/storage top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -SUBDIRS = aio buffer file freespace ipc large_object lmgr page smgr sync +SUBDIRS = \ + aio \ + buffer \ + file \ + freespace \ + ipc \ + large_object \ + lmgr \ + page \ + smgr \ + sync \ include $(top_srcdir)/src/backend/common.mk diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile index 019ca06455d..2d040f7048b 100644 --- a/src/bin/scripts/Makefile +++ b/src/bin/scripts/Makefile @@ -16,7 +16,15 @@ subdir = src/bin/scripts top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -PROGRAMS = createdb createuser dropdb dropuser clusterdb vacuumdb reindexdb pg_isready +PROGRAMS = \ + clusterdb \ + createdb \ + createuser \ + dropdb \ + dropuser \ + pg_isready \ + reindexdb \ + vacuumdb \ override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport) diff --git a/src/interfaces/ecpg/Makefile b/src/interfaces/ecpg/Makefile index 3002bc3c1bb..67596b5cc38 100644 --- a/src/interfaces/ecpg/Makefile +++ b/src/interfaces/ecpg/Makefile @@ -2,7 +2,12 @@ subdir = src/interfaces/ecpg top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -SUBDIRS = include pgtypeslib ecpglib compatlib preproc +SUBDIRS = \ + compatlib \ + ecpglib \ + include \ + pgtypeslib \ + preproc \ # Suppress parallel build of subdirectories to avoid a bug in GNU make 3.82, cf # https://savannah.gnu.org/bugs/?30653 diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile index dd57f7d694c..dabefa3ff6c 100644 --- a/src/pl/tcl/Makefile +++ b/src/pl/tcl/Makefile @@ -30,7 +30,16 @@ DATA = pltcl.control pltcl--1.0.sql \ pltclu.control pltclu--1.0.sql REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-extension=pltcl -REGRESS = pltcl_setup pltcl_queries pltcl_trigger pltcl_call pltcl_start_proc pltcl_subxact pltcl_unicode pltcl_transaction +# pltcl_setup is first because the other tests depend on the objects it creates +REGRESS = \ + pltcl_setup \ + pltcl_call \ + pltcl_queries \ + pltcl_start_proc \ + pltcl_subxact \ + pltcl_transaction \ + pltcl_trigger \ + pltcl_unicode \ # Tcl on win32 ships with import libraries only for Microsoft Visual C++, # which are not compatible with mingw gcc. Therefore we need to build a diff --git a/src/test/Makefile b/src/test/Makefile index 511a72e6238..4b98beb57ee 100644 --- a/src/test/Makefile +++ b/src/test/Makefile @@ -12,7 +12,15 @@ subdir = src/test top_builddir = ../.. include $(top_builddir)/src/Makefile.global -SUBDIRS = perl postmaster regress isolation modules authentication recovery subscription +SUBDIRS = \ + authentication \ + isolation \ + modules \ + perl \ + postmaster \ + recovery \ + regress \ + subscription \ ifeq ($(with_icu),yes) SUBDIRS += icu diff --git a/src/test/examples/Makefile b/src/test/examples/Makefile index e72d058e0c4..83f3d373ad4 100644 --- a/src/test/examples/Makefile +++ b/src/test/examples/Makefile @@ -14,7 +14,13 @@ override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) LDFLAGS_INTERNAL += $(libpq_pgport) -PROGS = testlibpq testlibpq2 testlibpq3 testlibpq4 testlo testlo64 +PROGS = \ + testlibpq \ + testlibpq2 \ + testlibpq3 \ + testlibpq4 \ + testlo \ + testlo64 \ all: $(PROGS) base-commit: dc6c879455e2db9adb7cf656ac29fdddeac39d77 -- 2.52.0
