On Thu Dec 25, 2025 at 10:37 AM CET, Chao Li wrote:
If we look at existing Makefiles, they don’t add a tailing “\” in the last line of lists, so let’s keep consistent.
Alright, attached is one without the trailing backslash. If we want to add those let's indeed do it in a dedicated patch that makes all of such lists consistently use them.
From 9ad856a1be4dbe48792b4f2ce34957cd664d389e Mon Sep 17 00:00:00 2001 From: Jelte Fennema-Nio <[email protected]> Date: Wed, 24 Dec 2025 10:55:25 +0100 Subject: [PATCH v4] 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..4620bf71445 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..0e7e76a7150 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..2afb42ca96e 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..0adac081f2e 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..1977981aa95 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..7e59348964d 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..3eb0a06abb4 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..3a4e36465ba 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
