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 <postgres@jeltef.nl>
Co-Authored-By: Jacob Champion <jacob.champion@enterprisedb.com>
Reviewed-by: Chao Li <li.evan.chao@gmail.com>
Reviewed-by: Japin Li <japinli@hotmail.com>
Reviewed-by: Man Zeng <zengman@halodbtech.com>
Discussion: https://postgr.es/m/DF6HDGB559U5.3MPRFCWPONEAE@jeltef.nl
This commit is contained in:
Michael Paquier
2025-12-28 09:17:42 +09:00
parent a9123db14a
commit 9adf32da6b
11 changed files with 151 additions and 23 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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)

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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)