From 9adf32da6b48e423e632ac24d6c634021e1ab154 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Sun, 28 Dec 2025 09:17:42 +0900 Subject: [PATCH] Split some long Makefile lists This change makes more readable code diffs when adding new items or removing old items, while ensuring that lines do not get excessively long. Some SUBDIRS, PROGRAMS and REGRESS lists are split. Note that there are a few more REGRESS lists that could be split, particularly in contrib/. Author: Jelte Fennema-Nio Co-Authored-By: Jacob Champion Reviewed-by: Chao Li Reviewed-by: Japin Li Reviewed-by: Man Zeng Discussion: https://postgr.es/m/DF6HDGB559U5.3MPRFCWPONEAE@jeltef.nl --- contrib/pageinspect/Makefile | 11 +++++++- src/backend/Makefile | 32 +++++++++++++++++++---- src/backend/access/Makefile | 17 ++++++++++-- src/backend/optimizer/Makefile | 7 ++++- src/backend/storage/Makefile | 12 ++++++++- src/bin/scripts/Makefile | 10 ++++++- src/include/Makefile | 48 ++++++++++++++++++++++++++++------ src/interfaces/ecpg/Makefile | 7 ++++- src/pl/tcl/Makefile | 12 ++++++++- src/test/Makefile | 10 ++++++- src/test/examples/Makefile | 8 +++++- 11 files changed, 151 insertions(+), 23 deletions(-) diff --git a/contrib/pageinspect/Makefile b/contrib/pageinspect/Makefile index 9dee765331..eae989569d 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/Makefile b/src/backend/Makefile index 7344c8c7f5..43e1e60489 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -16,11 +16,33 @@ subdir = src/backend top_builddir = ../.. include $(top_builddir)/src/Makefile.global -SUBDIRS = access archive backup bootstrap catalog parser commands executor \ - foreign lib libpq \ - main nodes optimizer partitioning port postmaster \ - regex replication rewrite \ - statistics storage tcop tsearch utils $(top_builddir)/src/timezone \ +SUBDIRS = \ + access \ + archive \ + backup \ + bootstrap \ + catalog \ + parser \ + commands \ + executor \ + foreign \ + lib \ + libpq \ + main \ + nodes \ + optimizer \ + partitioning \ + port \ + postmaster \ + regex \ + replication \ + rewrite \ + statistics \ + storage \ + tcop \ + tsearch \ + utils \ + $(top_builddir)/src/timezone \ jit include $(srcdir)/common.mk diff --git a/src/backend/access/Makefile b/src/backend/access/Makefile index 1932d11d15..e88d72ea03 100644 --- a/src/backend/access/Makefile +++ b/src/backend/access/Makefile @@ -8,7 +8,20 @@ subdir = src/backend/access top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -SUBDIRS = brin common gin gist hash heap index nbtree rmgrdesc spgist \ - sequence table tablesample transam +SUBDIRS = \ + brin \ + common \ + gin \ + gist \ + hash \ + heap \ + index \ + nbtree \ + rmgrdesc \ + spgist \ + sequence \ + table \ + tablesample \ + transam include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/optimizer/Makefile b/src/backend/optimizer/Makefile index f523e5e33e..0e7e76a715 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 eec03f6f2b..2afb42ca96 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 019ca06455..0adac081f2 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/include/Makefile b/src/include/Makefile index 24c5452de9..4ef060e905 100644 --- a/src/include/Makefile +++ b/src/include/Makefile @@ -17,14 +17,46 @@ all: pg_config.h pg_config_os.h # Subdirectories containing installable headers -SUBDIRS = access archive bootstrap catalog commands common datatype \ - executor fe_utils foreign jit \ - lib libpq mb nodes optimizer parser partitioning postmaster \ - regex replication rewrite \ - statistics storage tcop snowball snowball/libstemmer tsearch \ - tsearch/dicts utils port port/atomics port/win32 port/win32_msvc \ - port/win32_msvc/sys port/win32/arpa port/win32/netinet \ - port/win32/sys portability +SUBDIRS = \ + access \ + archive \ + bootstrap \ + catalog \ + commands \ + common \ + datatype \ + executor \ + fe_utils \ + foreign \ + jit \ + lib \ + libpq \ + mb \ + nodes \ + optimizer \ + parser \ + partitioning \ + postmaster \ + regex \ + replication \ + rewrite \ + statistics \ + storage \ + tcop \ + snowball \ + snowball/libstemmer \ + tsearch \ + tsearch/dicts \ + utils \ + port \ + port/atomics \ + port/win32 \ + port/win32_msvc \ + port/win32_msvc/sys \ + port/win32/arpa \ + port/win32/netinet \ + port/win32/sys \ + portability # Install all headers install: all installdirs diff --git a/src/interfaces/ecpg/Makefile b/src/interfaces/ecpg/Makefile index 3002bc3c1b..1977981aa9 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 dd57f7d694..7dc7cf3497 100644 --- a/src/pl/tcl/Makefile +++ b/src/pl/tcl/Makefile @@ -30,7 +30,17 @@ 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 511a72e623..3eb0a06abb 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 e72d058e0c..3a4e36465b 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)