Split all OBJS style lines in makefiles into one-line-per-entry style.

When maintaining or merging patches, one of the most common sources
for conflicts are the list of objects in makefiles. Especially when
the split across lines has been changed on both sides, which is
somewhat common due to attempting to stay below 80 columns, those
conflicts are unnecessarily laborious to resolve.

By splitting, and alphabetically sorting, OBJS style lines into one
object per line, conflicts should be less frequent, and easier to
resolve when they still occur.

Author: Andres Freund
Discussion: https://postgr.es/m/20191029200901.vww4idgcxv74cwes@alap3.anarazel.de

contrib/adminpack/Makefile

@@ -1,7 +1,9 @@
 # contrib/adminpack/Makefile
 
 MODULE_big = adminpack
-OBJS = adminpack.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	adminpack.o
 PG_CPPFLAGS = -I$(libpq_srcdir)
 
 EXTENSION = adminpack

contrib/amcheck/Makefile

@@ -1,7 +1,9 @@
 # contrib/amcheck/Makefile
 
 MODULE_big	= amcheck
-OBJS		= verify_nbtree.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	verify_nbtree.o
 
 EXTENSION = amcheck
 DATA = amcheck--1.1--1.2.sql amcheck--1.0--1.1.sql amcheck--1.0.sql

contrib/auto_explain/Makefile

@@ -1,7 +1,9 @@
 # contrib/auto_explain/Makefile
 
 MODULE_big = auto_explain
-OBJS = auto_explain.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	auto_explain.o
 PGFILEDESC = "auto_explain - logging facility for execution plans"
 
 ifdef USE_PGXS

contrib/bloom/Makefile

@@ -1,7 +1,14 @@
 # contrib/bloom/Makefile
 
 MODULE_big = bloom
-OBJS = blcost.o blinsert.o blscan.o blutils.o blvacuum.o blvalidate.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	blcost.o \
+	blinsert.o \
+	blscan.o \
+	blutils.o \
+	blvacuum.o \
+	blvalidate.o
 
 EXTENSION = bloom
 DATA = bloom--1.0.sql

contrib/btree_gin/Makefile

@@ -1,7 +1,9 @@
 # contrib/btree_gin/Makefile
 
 MODULE_big = btree_gin
-OBJS = btree_gin.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	btree_gin.o
 
 EXTENSION = btree_gin
 DATA = btree_gin--1.0.sql btree_gin--1.0--1.1.sql btree_gin--1.1--1.2.sql \

contrib/btree_gist/Makefile

@@ -2,12 +2,31 @@
 
 MODULE_big = btree_gist
 
-OBJS =  btree_gist.o btree_utils_num.o btree_utils_var.o btree_int2.o \
+OBJS =  \
-        btree_int4.o btree_int8.o btree_float4.o btree_float8.o btree_cash.o \
+	$(WIN32RES) \
-        btree_oid.o btree_ts.o btree_time.o btree_date.o btree_interval.o \
+	btree_bit.o \
-        btree_macaddr.o btree_macaddr8.o btree_inet.o btree_text.o \
+	btree_bytea.o \
-		btree_bytea.o btree_bit.o btree_numeric.o btree_uuid.o \
+	btree_cash.o \
-		btree_enum.o $(WIN32RES)
+	btree_date.o \
+	btree_enum.o \
+	btree_float4.o \
+	btree_float8.o \
+	btree_gist.o \
+	btree_inet.o \
+	btree_int2.o \
+	btree_int4.o \
+	btree_int8.o \
+	btree_interval.o \
+	btree_macaddr.o \
+	btree_macaddr8.o \
+	btree_numeric.o \
+	btree_oid.o \
+	btree_text.o \
+	btree_time.o \
+	btree_ts.o \
+	btree_utils_num.o \
+	btree_utils_var.o \
+	btree_uuid.o
 
 EXTENSION = btree_gist
 DATA = btree_gist--unpackaged--1.0.sql btree_gist--1.0--1.1.sql \

contrib/cube/Makefile

@@ -1,7 +1,10 @@
 # contrib/cube/Makefile
 
 MODULE_big = cube
-OBJS= cube.o cubeparse.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	cube.o \
+	cubeparse.o
 
 EXTENSION = cube
 DATA = cube--1.2.sql cube--1.2--1.3.sql cube--1.3--1.4.sql \

contrib/dblink/Makefile

@@ -1,7 +1,9 @@
 # contrib/dblink/Makefile
 
 MODULE_big = dblink
-OBJS	= dblink.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	dblink.o
 PG_CPPFLAGS = -I$(libpq_srcdir)
 SHLIB_LINK_INTERNAL = $(libpq)
 

contrib/dict_int/Makefile

@@ -1,7 +1,9 @@
 # contrib/dict_int/Makefile
 
 MODULE_big = dict_int
-OBJS = dict_int.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	dict_int.o
 
 EXTENSION = dict_int
 DATA = dict_int--1.0.sql dict_int--unpackaged--1.0.sql

contrib/dict_xsyn/Makefile

@@ -1,7 +1,9 @@
 # contrib/dict_xsyn/Makefile
 
 MODULE_big = dict_xsyn
-OBJS = dict_xsyn.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	dict_xsyn.o
 
 EXTENSION = dict_xsyn
 DATA = dict_xsyn--1.0.sql dict_xsyn--unpackaged--1.0.sql

contrib/fuzzystrmatch/Makefile

@@ -1,7 +1,10 @@
 # contrib/fuzzystrmatch/Makefile
 
 MODULE_big = fuzzystrmatch
-OBJS = fuzzystrmatch.o dmetaphone.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	dmetaphone.o \
+	fuzzystrmatch.o
 
 EXTENSION = fuzzystrmatch
 DATA = fuzzystrmatch--1.1.sql fuzzystrmatch--1.0--1.1.sql \

contrib/hstore/Makefile

@@ -1,8 +1,13 @@
 # contrib/hstore/Makefile
 
 MODULE_big = hstore
-OBJS = hstore_io.o hstore_op.o hstore_gist.o hstore_gin.o hstore_compat.o \
+OBJS = \
-	$(WIN32RES)
+	$(WIN32RES) \
+	hstore_compat.o \
+	hstore_gin.o \
+	hstore_gist.o \
+	hstore_io.o \
+	hstore_op.o
 
 EXTENSION = hstore
 DATA = hstore--1.4.sql \

contrib/hstore_plperl/Makefile

@@ -1,7 +1,9 @@
 # contrib/hstore_plperl/Makefile
 
 MODULE_big = hstore_plperl
-OBJS = hstore_plperl.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	hstore_plperl.o
 PGFILEDESC = "hstore_plperl - hstore transform for plperl"
 
 

contrib/hstore_plpython/Makefile

@@ -1,7 +1,9 @@
 # contrib/hstore_plpython/Makefile
 
 MODULE_big = hstore_plpython$(python_majorversion)
-OBJS = hstore_plpython.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	hstore_plpython.o
 PGFILEDESC = "hstore_plpython - hstore transform for plpython"
 
 EXTENSION = hstore_plpythonu hstore_plpython2u hstore_plpython3u

contrib/intarray/Makefile

@@ -1,8 +1,15 @@
 # contrib/intarray/Makefile
 
 MODULE_big = _int
-OBJS = _int_bool.o _int_gist.o _int_op.o _int_tool.o \
+OBJS = \
-	_intbig_gist.o _int_gin.o _int_selfuncs.o $(WIN32RES)
+	$(WIN32RES) \
+	_int_bool.o \
+	_int_gin.o \
+	_int_gist.o \
+	_int_op.o \
+	_int_selfuncs.o \
+	_int_tool.o \
+	_intbig_gist.o
 
 EXTENSION = intarray
 DATA = intarray--1.2.sql intarray--1.1--1.2.sql intarray--1.0--1.1.sql \

contrib/jsonb_plperl/Makefile

@@ -1,7 +1,9 @@
 # contrib/jsonb_plperl/Makefile
 
 MODULE_big = jsonb_plperl
-OBJS = jsonb_plperl.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	jsonb_plperl.o
 PGFILEDESC = "jsonb_plperl - jsonb transform for plperl"
 
 PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plperl

contrib/jsonb_plpython/Makefile

@@ -1,7 +1,9 @@
 # contrib/jsonb_plpython/Makefile
 
 MODULE_big = jsonb_plpython$(python_majorversion)
-OBJS = jsonb_plpython.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	jsonb_plpython.o
 PGFILEDESC = "jsonb_plpython - transform between jsonb and plpythonu"
 
 PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plpython $(python_includespec) -DPLPYTHON_LIBNAME='"plpython$(python_majorversion)"'

contrib/ltree/Makefile

@@ -1,8 +1,17 @@
 # contrib/ltree/Makefile
 
 MODULE_big = ltree
-OBJS = 	ltree_io.o ltree_op.o lquery_op.o _ltree_op.o crc32.o \
+OBJS = \
-	ltxtquery_io.o ltxtquery_op.o ltree_gist.o _ltree_gist.o $(WIN32RES)
+	$(WIN32RES) \
+	_ltree_gist.o \
+	_ltree_op.o \
+	crc32.o \
+	lquery_op.o \
+	ltree_gist.o \
+	ltree_io.o \
+	ltree_op.o \
+	ltxtquery_io.o \
+	ltxtquery_op.o
 PG_CPPFLAGS = -DLOWER_NODE
 
 EXTENSION = ltree

contrib/ltree_plpython/Makefile

@@ -1,7 +1,9 @@
 # contrib/ltree_plpython/Makefile
 
 MODULE_big = ltree_plpython$(python_majorversion)
-OBJS = ltree_plpython.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	ltree_plpython.o
 PGFILEDESC = "ltree_plpython - ltree transform for plpython"
 
 EXTENSION = ltree_plpythonu ltree_plpython2u ltree_plpython3u

contrib/oid2name/Makefile

@@ -4,7 +4,9 @@ PGFILEDESC = "oid2name - examine the file structure"
 PGAPPICON = win32
 
 PROGRAM = oid2name
-OBJS	= oid2name.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	oid2name.o
 
 TAP_TESTS = 1
 

contrib/pageinspect/Makefile

@@ -1,8 +1,15 @@
 # contrib/pageinspect/Makefile
 
 MODULE_big	= pageinspect
-OBJS		= rawpage.o heapfuncs.o btreefuncs.o fsmfuncs.o \
+OBJS = \
-		  brinfuncs.o ginfuncs.o hashfuncs.o $(WIN32RES)
+	$(WIN32RES) \
+	brinfuncs.o \
+	btreefuncs.o \
+	fsmfuncs.o \
+	ginfuncs.o \
+	hashfuncs.o \
+	heapfuncs.o \
+	rawpage.o
 
 EXTENSION = pageinspect
 DATA =  pageinspect--1.7--1.8.sql pageinspect--1.6--1.7.sql \

contrib/passwordcheck/Makefile

@@ -1,7 +1,9 @@
 # contrib/passwordcheck/Makefile
 
 MODULE_big = passwordcheck
-OBJS = passwordcheck.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	passwordcheck.o
 PGFILEDESC = "passwordcheck - strengthen user password checks"
 
 # uncomment the following two lines to enable cracklib support

contrib/pg_buffercache/Makefile

@@ -1,7 +1,9 @@
 # contrib/pg_buffercache/Makefile
 
 MODULE_big = pg_buffercache
-OBJS = pg_buffercache_pages.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	pg_buffercache_pages.o
 
 EXTENSION = pg_buffercache
 DATA = pg_buffercache--1.2.sql pg_buffercache--1.2--1.3.sql \

contrib/pg_freespacemap/Makefile

@@ -1,7 +1,9 @@
 # contrib/pg_freespacemap/Makefile
 
 MODULE_big = pg_freespacemap
-OBJS = pg_freespacemap.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	pg_freespacemap.o
 
 EXTENSION = pg_freespacemap
 DATA = pg_freespacemap--1.1.sql pg_freespacemap--1.1--1.2.sql \

contrib/pg_prewarm/Makefile

@@ -1,7 +1,10 @@
 # contrib/pg_prewarm/Makefile
 
 MODULE_big = pg_prewarm
-OBJS = pg_prewarm.o autoprewarm.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	autoprewarm.o \
+	pg_prewarm.o
 
 EXTENSION = pg_prewarm
 DATA = pg_prewarm--1.1--1.2.sql pg_prewarm--1.1.sql pg_prewarm--1.0--1.1.sql

contrib/pg_standby/Makefile

@@ -4,7 +4,9 @@ PGFILEDESC = "pg_standby - supports creation of a warm standby"
 PGAPPICON = win32
 
 PROGRAM = pg_standby
-OBJS	= pg_standby.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	pg_standby.o
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config

contrib/pg_stat_statements/Makefile

@@ -1,7 +1,9 @@
 # contrib/pg_stat_statements/Makefile
 
 MODULE_big = pg_stat_statements
-OBJS = pg_stat_statements.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	pg_stat_statements.o
 
 EXTENSION = pg_stat_statements
 DATA = pg_stat_statements--1.4.sql pg_stat_statements--1.6--1.7.sql \

contrib/pg_trgm/Makefile

@@ -1,7 +1,12 @@
 # contrib/pg_trgm/Makefile
 
 MODULE_big = pg_trgm
-OBJS = trgm_op.o trgm_gist.o trgm_gin.o trgm_regexp.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	trgm_gin.o \
+	trgm_gist.o \
+	trgm_op.o \
+	trgm_regexp.o
 
 EXTENSION = pg_trgm
 DATA = pg_trgm--1.3--1.4.sql \

contrib/pg_visibility/Makefile

@@ -1,7 +1,9 @@
 # contrib/pg_visibility/Makefile
 
 MODULE_big = pg_visibility
-OBJS = pg_visibility.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	pg_visibility.o
 
 EXTENSION = pg_visibility
 DATA = pg_visibility--1.1.sql pg_visibility--1.1--1.2.sql \

contrib/pgcrypto/Makefile

@@ -14,16 +14,35 @@ CF_SRCS = $(if $(subst no,,$(with_openssl)), $(OSSL_SRCS), $(INT_SRCS))
 CF_TESTS = $(if $(subst no,,$(with_openssl)), $(OSSL_TESTS), $(INT_TESTS))
 CF_PGP_TESTS = $(if $(subst no,,$(with_zlib)), $(ZLIB_TST), $(ZLIB_OFF_TST))
 
-SRCS		= pgcrypto.c px.c px-hmac.c px-crypt.c \
+SRCS = \
-		crypt-gensalt.c crypt-blowfish.c crypt-des.c \
+	$(CF_SRCS) \
-		crypt-md5.c $(CF_SRCS) \
+	crypt-blowfish.c \
-		mbuf.c pgp.c pgp-armor.c pgp-cfb.c pgp-compress.c \
+	crypt-des.c \
-		pgp-decrypt.c pgp-encrypt.c pgp-info.c pgp-mpi.c \
+	crypt-gensalt.c \
-		pgp-pubdec.c pgp-pubenc.c pgp-pubkey.c pgp-s2k.c \
+	crypt-md5.c \
-		pgp-pgsql.c
+	mbuf.c \
+	pgcrypto.c \
+	pgp-armor.c \
+	pgp-cfb.c \
+	pgp-compress.c \
+	pgp-decrypt.c \
+	pgp-encrypt.c \
+	pgp-info.c \
+	pgp-mpi.c \
+	pgp-pgsql.c \
+	pgp-pubdec.c \
+	pgp-pubenc.c \
+	pgp-pubkey.c \
+	pgp-s2k.c \
+	pgp.c \
+	px-crypt.c \
+	px-hmac.c \
+	px.c
 
 MODULE_big	= pgcrypto
-OBJS		= $(SRCS:.c=.o) $(WIN32RES)
+OBJS = \
+	$(SRCS:.c=.o) \
+	$(WIN32RES)
 
 EXTENSION = pgcrypto
 DATA = pgcrypto--1.3.sql pgcrypto--1.2--1.3.sql pgcrypto--1.1--1.2.sql \

contrib/pgrowlocks/Makefile

@@ -1,7 +1,9 @@
 # contrib/pgrowlocks/Makefile
 
 MODULE_big	= pgrowlocks
-OBJS		= pgrowlocks.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	pgrowlocks.o
 
 EXTENSION = pgrowlocks
 DATA = pgrowlocks--1.2.sql pgrowlocks--1.1--1.2.sql pgrowlocks--1.0--1.1.sql \

contrib/pgstattuple/Makefile

@@ -1,7 +1,11 @@
 # contrib/pgstattuple/Makefile
 
 MODULE_big	= pgstattuple
-OBJS		= pgstattuple.o pgstatindex.o pgstatapprox.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	pgstatapprox.o \
+	pgstatindex.o \
+	pgstattuple.o
 
 EXTENSION = pgstattuple
 DATA = pgstattuple--1.4.sql pgstattuple--1.4--1.5.sql \

contrib/postgres_fdw/Makefile

@@ -1,7 +1,13 @@
 # contrib/postgres_fdw/Makefile
 
 MODULE_big = postgres_fdw
-OBJS = postgres_fdw.o option.o deparse.o connection.o shippable.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	connection.o \
+	deparse.o \
+	option.o \
+	postgres_fdw.o \
+	shippable.o
 PGFILEDESC = "postgres_fdw - foreign data wrapper for PostgreSQL"
 
 PG_CPPFLAGS = -I$(libpq_srcdir)

contrib/seg/Makefile

@@ -1,7 +1,10 @@
 # contrib/seg/Makefile
 
 MODULE_big = seg
-OBJS = seg.o segparse.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	seg.o \
+	segparse.o
 
 EXTENSION = seg
 DATA = seg--1.1.sql seg--1.1--1.2.sql seg--1.2--1.3.sql \

contrib/sepgsql/Makefile

@@ -1,8 +1,17 @@
 # contrib/sepgsql/Makefile
 
 MODULE_big = sepgsql
-OBJS = hooks.o selinux.o uavc.o label.o dml.o \
+OBJS = \
-	database.o schema.o relation.o proc.o $(WIN32RES)
+	$(WIN32RES) \
+	database.o \
+	dml.o \
+	hooks.o \
+	label.o \
+	proc.o \
+	relation.o \
+	schema.o \
+	selinux.o \
+	uavc.o
 DATA_built = sepgsql.sql
 PGFILEDESC = "sepgsql - SELinux integration"
 

contrib/sslinfo/Makefile

@@ -1,7 +1,9 @@
 # contrib/sslinfo/Makefile
 
 MODULE_big = sslinfo
-OBJS = sslinfo.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	sslinfo.o
 
 EXTENSION = sslinfo
 DATA = sslinfo--1.2.sql sslinfo--1.1--1.2.sql sslinfo--1.0--1.1.sql \

contrib/tsm_system_rows/Makefile

@@ -1,7 +1,9 @@
 # contrib/tsm_system_rows/Makefile
 
 MODULE_big = tsm_system_rows
-OBJS = tsm_system_rows.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	tsm_system_rows.o
 PGFILEDESC = "tsm_system_rows - TABLESAMPLE method which accepts number of rows as a limit"
 
 EXTENSION = tsm_system_rows

contrib/tsm_system_time/Makefile

@@ -1,7 +1,9 @@
 # contrib/tsm_system_time/Makefile
 
 MODULE_big = tsm_system_time
-OBJS = tsm_system_time.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	tsm_system_time.o
 PGFILEDESC = "tsm_system_time - TABLESAMPLE method which accepts time in milliseconds as a limit"
 
 EXTENSION = tsm_system_time

contrib/unaccent/Makefile

@@ -1,7 +1,9 @@
 # contrib/unaccent/Makefile
 
 MODULE_big = unaccent
-OBJS = unaccent.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	unaccent.o
 
 EXTENSION = unaccent
 DATA = unaccent--1.1.sql unaccent--1.0--1.1.sql unaccent--unpackaged--1.0.sql

contrib/uuid-ossp/Makefile

@@ -1,7 +1,10 @@
 # contrib/uuid-ossp/Makefile
 
 MODULE_big = uuid-ossp
-OBJS = uuid-ossp.o $(UUID_EXTRA_OBJS) $(WIN32RES)
+OBJS = \
+	$(UUID_EXTRA_OBJS) \
+	$(WIN32RES) \
+	uuid-ossp.o
 
 EXTENSION = uuid-ossp
 DATA = uuid-ossp--1.1.sql uuid-ossp--1.0--1.1.sql uuid-ossp--unpackaged--1.0.sql

contrib/vacuumlo/Makefile

@@ -4,7 +4,9 @@ PGFILEDESC = "vacuumlo - removes orphaned large objects"
 PGAPPICON = win32
 
 PROGRAM = vacuumlo
-OBJS	= vacuumlo.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	vacuumlo.o
 
 TAP_TESTS = 1
 

contrib/xml2/Makefile

@@ -1,7 +1,10 @@
 # contrib/xml2/Makefile
 
 MODULE_big = pgxml
-OBJS = xpath.o xslt_proc.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	xpath.o \
+	xslt_proc.o
 
 EXTENSION = xml2
 DATA = xml2--1.1.sql xml2--1.0--1.1.sql xml2--unpackaged--1.0.sql

src/backend/Makefile

@@ -37,8 +37,11 @@ LOCALOBJS += utils/probes.o
 endif
 endif
 
-OBJS = $(SUBDIROBJS) $(LOCALOBJS) $(top_builddir)/src/port/libpgport_srv.a \
+OBJS = \
-       $(top_builddir)/src/common/libpgcommon_srv.a
+	$(LOCALOBJS) \
+	$(SUBDIROBJS) \
+	$(top_builddir)/src/common/libpgcommon_srv.a \
+	$(top_builddir)/src/port/libpgport_srv.a
 
 # We put libpgport and libpgcommon into OBJS, so remove it from LIBS; also add
 # libldap and ICU

src/backend/access/brin/Makefile

@@ -12,7 +12,14 @@ subdir = src/backend/access/brin
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = brin.o brin_pageops.o brin_revmap.o brin_tuple.o brin_xlog.o \
+OBJS = \
-       brin_minmax.o brin_inclusion.o brin_validate.o
+	brin.o \
+	brin_inclusion.o \
+	brin_minmax.o \
+	brin_pageops.o \
+	brin_revmap.o \
+	brin_tuple.o \
+	brin_validate.o \
+	brin_xlog.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/access/common/Makefile

@@ -12,8 +12,19 @@ subdir = src/backend/access/common
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = bufmask.o detoast.o heaptuple.o indextuple.o printsimple.o \
+OBJS = \
-	printtup.o relation.o reloptions.o scankey.o session.o toast_internals.o \
+	bufmask.o \
-	tupconvert.o tupdesc.o
+	detoast.o \
+	heaptuple.o \
+	indextuple.o \
+	printsimple.o \
+	printtup.o \
+	relation.o \
+	reloptions.o \
+	scankey.o \
+	session.o \
+	toast_internals.o \
+	tupconvert.o \
+	tupdesc.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/access/gin/Makefile

@@ -12,8 +12,21 @@ subdir = src/backend/access/gin
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = ginutil.o gininsert.o ginxlog.o ginentrypage.o gindatapage.o \
+OBJS = \
-	ginbtree.o ginscan.o ginget.o ginvacuum.o ginarrayproc.o \
+	ginarrayproc.o \
-	ginbulk.o ginfast.o ginpostinglist.o ginlogic.o ginvalidate.o
+	ginbtree.o \
+	ginbulk.o \
+	gindatapage.o \
+	ginentrypage.o \
+	ginfast.o \
+	ginget.o \
+	gininsert.o \
+	ginlogic.o \
+	ginpostinglist.o \
+	ginscan.o \
+	ginutil.o \
+	ginvacuum.o \
+	ginvalidate.o \
+	ginxlog.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/access/gist/Makefile

@@ -12,7 +12,17 @@ subdir = src/backend/access/gist
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = gist.o gistutil.o gistxlog.o gistvacuum.o gistget.o gistscan.o \
+OBJS = \
-       gistproc.o gistsplit.o gistbuild.o gistbuildbuffers.o gistvalidate.o
+	gist.o \
+	gistbuild.o \
+	gistbuildbuffers.o \
+	gistget.o \
+	gistproc.o \
+	gistscan.o \
+	gistsplit.o \
+	gistutil.o \
+	gistvacuum.o \
+	gistvalidate.o \
+	gistxlog.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/access/hash/Makefile

@@ -12,7 +12,16 @@ subdir = src/backend/access/hash
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = hash.o hashfunc.o hashinsert.o hashovfl.o hashpage.o hashsearch.o \
+OBJS = \
-       hashsort.o hashutil.o hashvalidate.o hash_xlog.o
+	hash.o \
+	hash_xlog.o \
+	hashfunc.o \
+	hashinsert.o \
+	hashovfl.o \
+	hashpage.o \
+	hashsearch.o \
+	hashsort.o \
+	hashutil.o \
+	hashvalidate.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/access/heap/Makefile

@@ -12,7 +12,16 @@ subdir = src/backend/access/heap
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = heapam.o heapam_handler.o heapam_visibility.o hio.o pruneheap.o rewriteheap.o \
+OBJS = \
-	syncscan.o heaptoast.o vacuumlazy.o visibilitymap.o
+	heapam.o \
+	heapam_handler.o \
+	heapam_visibility.o \
+	heaptoast.o \
+	hio.o \
+	pruneheap.o \
+	rewriteheap.o \
+	syncscan.o \
+	vacuumlazy.o \
+	visibilitymap.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/access/index/Makefile

@@ -12,6 +12,10 @@ subdir = src/backend/access/index
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = amapi.o amvalidate.o genam.o indexam.o
+OBJS = \
+	amapi.o \
+	amvalidate.o \
+	genam.o \
+	indexam.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/access/nbtree/Makefile

@@ -12,7 +12,16 @@ subdir = src/backend/access/nbtree
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = nbtcompare.o nbtinsert.o nbtpage.o nbtree.o nbtsearch.o \
+OBJS = \
-       nbtsplitloc.o nbtutils.o nbtsort.o nbtvalidate.o nbtxlog.o
+	nbtcompare.o \
+	nbtinsert.o \
+	nbtpage.o \
+	nbtree.o \
+	nbtsearch.o \
+	nbtsort.o \
+	nbtsplitloc.o \
+	nbtutils.o \
+	nbtvalidate.o \
+	nbtxlog.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/access/rmgrdesc/Makefile

@@ -8,9 +8,27 @@ subdir = src/backend/access/rmgrdesc
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = brindesc.o clogdesc.o committsdesc.o dbasedesc.o genericdesc.o \
+OBJS = \
-	   gindesc.o gistdesc.o hashdesc.o heapdesc.o logicalmsgdesc.o \
+	brindesc.o \
-	   mxactdesc.o nbtdesc.o relmapdesc.o replorigindesc.o seqdesc.o \
+	clogdesc.o \
-	   smgrdesc.o spgdesc.o standbydesc.o tblspcdesc.o xactdesc.o xlogdesc.o
+	committsdesc.o \
+	dbasedesc.o \
+	genericdesc.o \
+	gindesc.o \
+	gistdesc.o \
+	hashdesc.o \
+	heapdesc.o \
+	logicalmsgdesc.o \
+	mxactdesc.o \
+	nbtdesc.o \
+	relmapdesc.o \
+	replorigindesc.o \
+	seqdesc.o \
+	smgrdesc.o \
+	spgdesc.o \
+	standbydesc.o \
+	tblspcdesc.o \
+	xactdesc.o \
+	xlogdesc.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/access/spgist/Makefile

@@ -12,9 +12,17 @@ subdir = src/backend/access/spgist
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = spgutils.o spginsert.o spgscan.o spgvacuum.o spgvalidate.o \
+OBJS = \
-	spgdoinsert.o spgxlog.o \
+	spgdoinsert.o \
-	spgtextproc.o spgquadtreeproc.o spgkdtreeproc.o \
+	spginsert.o \
-	spgproc.o
+	spgkdtreeproc.o \
+	spgproc.o \
+	spgquadtreeproc.o \
+	spgscan.o \
+	spgtextproc.o \
+	spgutils.o \
+	spgvacuum.o \
+	spgvalidate.o \
+	spgxlog.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/access/table/Makefile

@@ -12,6 +12,10 @@ subdir = src/backend/access/table
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = table.o tableam.o tableamapi.o toast_helper.o
+OBJS = \
+	table.o \
+	tableam.o \
+	tableamapi.o \
+	toast_helper.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/access/tablesample/Makefile

@@ -12,6 +12,9 @@ subdir = src/backend/access/tablesample
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = bernoulli.o system.o tablesample.o
+OBJS = \
+	bernoulli.o \
+	system.o \
+	tablesample.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/access/transam/Makefile

@@ -12,10 +12,27 @@ subdir = src/backend/access/transam
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = clog.o commit_ts.o generic_xlog.o multixact.o parallel.o rmgr.o slru.o \
+OBJS = \
-	subtrans.o timeline.o transam.o twophase.o twophase_rmgr.o varsup.o \
+	clog.o \
-	xact.o xlog.o xlogarchive.o xlogfuncs.o \
+	commit_ts.o \
-	xloginsert.o xlogreader.o xlogutils.o
+	generic_xlog.o \
+	multixact.o \
+	parallel.o \
+	rmgr.o \
+	slru.o \
+	subtrans.o \
+	timeline.o \
+	transam.o \
+	twophase.o \
+	twophase_rmgr.o \
+	varsup.o \
+	xact.o \
+	xlog.o \
+	xlogarchive.o \
+	xlogfuncs.o \
+	xloginsert.o \
+	xlogreader.o \
+	xlogutils.o
 
 include $(top_srcdir)/src/backend/common.mk
 

src/backend/bootstrap/Makefile

@@ -12,7 +12,9 @@ include $(top_builddir)/src/Makefile.global
 
 override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
 
-OBJS= bootparse.o bootstrap.o
+OBJS = \
+	bootparse.o \
+	bootstrap.o
 
 include $(top_srcdir)/src/backend/common.mk
 

src/backend/catalog/Makefile

@@ -13,13 +13,36 @@ subdir = src/backend/catalog
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = catalog.o dependency.o heap.o index.o indexing.o namespace.o aclchk.o \
+OBJS = \
-       objectaccess.o objectaddress.o partition.o pg_aggregate.o pg_collation.o \
+	aclchk.o \
-       pg_constraint.o pg_conversion.o \
+	catalog.o \
-       pg_depend.o pg_enum.o pg_inherits.o pg_largeobject.o pg_namespace.o \
+	dependency.o \
-       pg_operator.o pg_proc.o pg_publication.o pg_range.o \
+	heap.o \
-	   pg_db_role_setting.o pg_shdepend.o pg_subscription.o pg_type.o \
+	index.o \
-	   storage.o toasting.o
+	indexing.o \
+	namespace.o \
+	objectaccess.o \
+	objectaddress.o \
+	partition.o \
+	pg_aggregate.o \
+	pg_collation.o \
+	pg_constraint.o \
+	pg_conversion.o \
+	pg_db_role_setting.o \
+	pg_depend.o \
+	pg_enum.o \
+	pg_inherits.o \
+	pg_largeobject.o \
+	pg_namespace.o \
+	pg_operator.o \
+	pg_proc.o \
+	pg_publication.o \
+	pg_range.o \
+	pg_shdepend.o \
+	pg_subscription.o \
+	pg_type.o \
+	storage.o \
+	toasting.o
 
 BKIFILES = postgres.bki postgres.description postgres.shdescription
 

src/backend/commands/Makefile

@@ -12,14 +12,51 @@ subdir = src/backend/commands
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = amcmds.o aggregatecmds.o alter.o analyze.o async.o cluster.o comment.o \
+OBJS = \
-	collationcmds.o constraint.o conversioncmds.o copy.o createas.o \
+	aggregatecmds.o \
-	dbcommands.o define.o discard.o dropcmds.o \
+	alter.o \
-	event_trigger.o explain.o extension.o foreigncmds.o functioncmds.o \
+	amcmds.o \
-	indexcmds.o lockcmds.o matview.o operatorcmds.o opclasscmds.o \
+	analyze.o \
-	policy.o portalcmds.o prepare.o proclang.o publicationcmds.o \
+	async.o \
-	schemacmds.o seclabel.o sequence.o statscmds.o subscriptioncmds.o \
+	cluster.o \
-	tablecmds.o tablespace.o trigger.o tsearchcmds.o typecmds.o user.o \
+	collationcmds.o \
-	vacuum.o variable.o view.o
+	comment.o \
+	constraint.o \
+	conversioncmds.o \
+	copy.o \
+	createas.o \
+	dbcommands.o \
+	define.o \
+	discard.o \
+	dropcmds.o \
+	event_trigger.o \
+	explain.o \
+	extension.o \
+	foreigncmds.o \
+	functioncmds.o \
+	indexcmds.o \
+	lockcmds.o \
+	matview.o \
+	opclasscmds.o \
+	operatorcmds.o \
+	policy.o \
+	portalcmds.o \
+	prepare.o \
+	proclang.o \
+	publicationcmds.o \
+	schemacmds.o \
+	seclabel.o \
+	sequence.o \
+	statscmds.o \
+	subscriptioncmds.o \
+	tablecmds.o \
+	tablespace.o \
+	trigger.o \
+	tsearchcmds.o \
+	typecmds.o \
+	user.o \
+	vacuum.o \
+	variable.o \
+	view.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/executor/Makefile

@@ -12,23 +12,67 @@ subdir = src/backend/executor
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = execAmi.o execCurrent.o execExpr.o execExprInterp.o \
+OBJS = \
-       execGrouping.o execIndexing.o execJunk.o \
+	execAmi.o \
-       execMain.o execParallel.o execPartition.o execProcnode.o \
+	execCurrent.o \
-       execReplication.o execScan.o execSRF.o execTuples.o \
+	execExpr.o \
-       execUtils.o functions.o instrument.o nodeAppend.o nodeAgg.o \
+	execExprInterp.o \
-       nodeBitmapAnd.o nodeBitmapOr.o \
+	execGrouping.o \
-       nodeBitmapHeapscan.o nodeBitmapIndexscan.o \
+	execIndexing.o \
-       nodeCustom.o nodeFunctionscan.o nodeGather.o \
+	execJunk.o \
-       nodeHash.o nodeHashjoin.o nodeIndexscan.o nodeIndexonlyscan.o \
+	execMain.o \
-       nodeLimit.o nodeLockRows.o nodeGatherMerge.o \
+	execParallel.o \
-       nodeMaterial.o nodeMergeAppend.o nodeMergejoin.o nodeModifyTable.o \
+	execPartition.o \
-       nodeNestloop.o nodeProjectSet.o nodeRecursiveunion.o nodeResult.o \
+	execProcnode.o \
-       nodeSamplescan.o nodeSeqscan.o nodeSetOp.o nodeSort.o nodeUnique.o \
+	execReplication.o \
-       nodeValuesscan.o \
+	execSRF.o \
-       nodeCtescan.o nodeNamedtuplestorescan.o nodeWorktablescan.o \
+	execScan.o \
-       nodeGroup.o nodeSubplan.o nodeSubqueryscan.o nodeTidscan.o \
+	execTuples.o \
-       nodeForeignscan.o nodeWindowAgg.o tstoreReceiver.o tqueue.o spi.o \
+	execUtils.o \
-       nodeTableFuncscan.o
+	functions.o \
+	instrument.o \
+	nodeAgg.o \
+	nodeAppend.o \
+	nodeBitmapAnd.o \
+	nodeBitmapHeapscan.o \
+	nodeBitmapIndexscan.o \
+	nodeBitmapOr.o \
+	nodeCtescan.o \
+	nodeCustom.o \
+	nodeForeignscan.o \
+	nodeFunctionscan.o \
+	nodeGather.o \
+	nodeGatherMerge.o \
+	nodeGroup.o \
+	nodeHash.o \
+	nodeHashjoin.o \
+	nodeIndexonlyscan.o \
+	nodeIndexscan.o \
+	nodeLimit.o \
+	nodeLockRows.o \
+	nodeMaterial.o \
+	nodeMergeAppend.o \
+	nodeMergejoin.o \
+	nodeModifyTable.o \
+	nodeNamedtuplestorescan.o \
+	nodeNestloop.o \
+	nodeProjectSet.o \
+	nodeRecursiveunion.o \
+	nodeResult.o \
+	nodeSamplescan.o \
+	nodeSeqscan.o \
+	nodeSetOp.o \
+	nodeSort.o \
+	nodeSubplan.o \
+	nodeSubqueryscan.o \
+	nodeTableFuncscan.o \
+	nodeTidscan.o \
+	nodeUnique.o \
+	nodeValuesscan.o \
+	nodeWindowAgg.o \
+	nodeWorktablescan.o \
+	spi.o \
+	tqueue.o \
+	tstoreReceiver.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/foreign/Makefile

@@ -12,6 +12,7 @@ subdir = src/backend/foreign
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS= foreign.o
+OBJS = \
+	foreign.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/jit/Makefile

@@ -17,6 +17,7 @@ include $(top_builddir)/src/Makefile.global
 
 override CPPFLAGS += -DDLSUFFIX=\"$(DLSUFFIX)\"
 
-OBJS = jit.o
+OBJS = \
+	jit.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/jit/llvm/Makefile

@@ -33,12 +33,20 @@ SHLIB_LINK += $(LLVM_LIBS)
 # loadable modules.
 override COMPILER = $(CXX) $(CFLAGS)
 
-OBJS=$(WIN32RES)
+OBJS = \
+	$(WIN32RES)
 
 # Infrastructure
-OBJS += llvmjit.o llvmjit_error.o llvmjit_inline.o llvmjit_wrap.o
+OBJS += \
+	llvmjit.o \
+	llvmjit_error.o \
+	llvmjit_inline.o \
+	llvmjit_wrap.o
+
 # Code generation
-OBJS += llvmjit_expr.o llvmjit_deform.o
+OBJS += \
+	llvmjit_deform.o \
+	llvmjit_expr.o
 
 all: all-shared-lib llvmjit_types.bc
 

src/backend/lib/Makefile

@@ -12,7 +12,17 @@ subdir = src/backend/lib
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = binaryheap.o bipartite_match.o bloomfilter.o dshash.o hyperloglog.o \
+OBJS = \
-       ilist.o integerset.o knapsack.o pairingheap.o rbtree.o stringinfo.o
+	binaryheap.o \
+	bipartite_match.o \
+	bloomfilter.o \
+	dshash.o \
+	hyperloglog.o \
+	ilist.o \
+	integerset.o \
+	knapsack.o \
+	pairingheap.o \
+	rbtree.o \
+	stringinfo.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/libpq/Makefile

@@ -14,8 +14,19 @@ include $(top_builddir)/src/Makefile.global
 
 # be-fsstubs is here for historical reasons, probably belongs elsewhere
 
-OBJS = be-fsstubs.o be-secure.o be-secure-common.o auth.o crypt.o hba.o ifaddr.o pqcomm.o \
+OBJS = \
-       pqformat.o pqmq.o pqsignal.o auth-scram.o
+	auth-scram.o \
+	auth.o \
+	be-fsstubs.o \
+	be-secure-common.o \
+	be-secure.o \
+	crypt.o \
+	hba.o \
+	ifaddr.o \
+	pqcomm.o \
+	pqformat.o \
+	pqmq.o \
+	pqsignal.o
 
 ifeq ($(with_openssl),yes)
 OBJS += be-secure-openssl.o

src/backend/main/Makefile

@@ -12,6 +12,7 @@ subdir = src/backend/main
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = main.o
+OBJS = \
+	main.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/nodes/Makefile

@@ -12,8 +12,21 @@ subdir = src/backend/nodes
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = nodeFuncs.o nodes.o list.o bitmapset.o tidbitmap.o \
+OBJS = \
-       copyfuncs.o equalfuncs.o extensible.o makefuncs.o \
+	bitmapset.o \
-       outfuncs.o readfuncs.o print.o read.o params.o value.o
+	copyfuncs.o \
+	equalfuncs.o \
+	extensible.o \
+	list.o \
+	makefuncs.o \
+	nodeFuncs.o \
+	nodes.o \
+	outfuncs.o \
+	params.o \
+	print.o \
+	read.o \
+	readfuncs.o \
+	tidbitmap.o \
+	value.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/optimizer/geqo/Makefile

@@ -13,9 +13,21 @@ subdir = src/backend/optimizer/geqo
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS =	geqo_copy.o geqo_eval.o geqo_main.o geqo_misc.o \
+OBJS = \
-	geqo_mutation.o geqo_pool.o geqo_random.o geqo_recombination.o \
+	geqo_copy.o \
-	geqo_selection.o \
+	geqo_cx.o \
-	geqo_erx.o geqo_pmx.o geqo_cx.o geqo_px.o geqo_ox1.o geqo_ox2.o
+	geqo_erx.o \
+	geqo_eval.o \
+	geqo_main.o \
+	geqo_misc.o \
+	geqo_mutation.o \
+	geqo_ox1.o \
+	geqo_ox2.o \
+	geqo_pmx.o \
+	geqo_pool.o \
+	geqo_px.o \
+	geqo_random.o \
+	geqo_recombination.o \
+	geqo_selection.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/optimizer/path/Makefile

@@ -12,7 +12,15 @@ subdir = src/backend/optimizer/path
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = allpaths.o clausesel.o costsize.o equivclass.o indxpath.o \
+OBJS = \
-       joinpath.o joinrels.o pathkeys.o tidpath.o
+	allpaths.o \
+	clausesel.o \
+	costsize.o \
+	equivclass.o \
+	indxpath.o \
+	joinpath.o \
+	joinrels.o \
+	pathkeys.o \
+	tidpath.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/optimizer/plan/Makefile

@@ -12,7 +12,14 @@ subdir = src/backend/optimizer/plan
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = analyzejoins.o createplan.o initsplan.o planagg.o planmain.o planner.o \
+OBJS = \
-	setrefs.o subselect.o
+	analyzejoins.o \
+	createplan.o \
+	initsplan.o \
+	planagg.o \
+	planmain.o \
+	planner.o \
+	setrefs.o \
+	subselect.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/optimizer/prep/Makefile

@@ -12,6 +12,10 @@ subdir = src/backend/optimizer/prep
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = prepjointree.o prepqual.o preptlist.o prepunion.o
+OBJS = \
+	prepjointree.o \
+	prepqual.o \
+	preptlist.o \
+	prepunion.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/optimizer/util/Makefile

@@ -12,8 +12,20 @@ subdir = src/backend/optimizer/util
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = appendinfo.o clauses.o inherit.o joininfo.o orclauses.o \
+OBJS = \
-       paramassign.o pathnode.o placeholder.o plancat.o predtest.o \
+	appendinfo.o \
-       relnode.o restrictinfo.o tlist.o var.o
+	clauses.o \
+	inherit.o \
+	joininfo.o \
+	orclauses.o \
+	paramassign.o \
+	pathnode.o \
+	placeholder.o \
+	plancat.o \
+	predtest.o \
+	relnode.o \
+	restrictinfo.o \
+	tlist.o \
+	var.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/parser/Makefile

@@ -12,11 +12,27 @@ include $(top_builddir)/src/Makefile.global
 
 override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
 
-OBJS= analyze.o gram.o scan.o parser.o \
+OBJS = \
-      parse_agg.o parse_clause.o parse_coerce.o parse_collate.o parse_cte.o \
+	analyze.o \
-      parse_enr.o parse_expr.o parse_func.o parse_node.o parse_oper.o \
+	gram.o \
-      parse_param.o parse_relation.o parse_target.o parse_type.o \
+	parse_agg.o \
-      parse_utilcmd.o scansup.o
+	parse_clause.o \
+	parse_coerce.o \
+	parse_collate.o \
+	parse_cte.o \
+	parse_enr.o \
+	parse_expr.o \
+	parse_func.o \
+	parse_node.o \
+	parse_oper.o \
+	parse_param.o \
+	parse_relation.o \
+	parse_target.o \
+	parse_type.o \
+	parse_utilcmd.o \
+	parser.o \
+	scan.o \
+	scansup.o
 
 include $(top_srcdir)/src/backend/common.mk
 

src/backend/partitioning/Makefile

@@ -12,6 +12,9 @@ subdir = src/backend/partitioning
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = partbounds.o partdesc.o partprune.o
+OBJS = \
+	partbounds.o \
+	partdesc.o \
+	partprune.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/port/Makefile

@@ -21,7 +21,11 @@ subdir = src/backend/port
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = atomics.o pg_sema.o pg_shmem.o $(TAS)
+OBJS = \
+	$(TAS) \
+	atomics.o \
+	pg_sema.o \
+	pg_shmem.o
 
 ifeq ($(PORTNAME), win32)
 SUBDIRS += win32

src/backend/port/win32/Makefile

@@ -12,7 +12,10 @@ subdir = src/backend/port/win32
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = timer.o socket.o signal.o
+OBJS = \
+	signal.o \
+	socket.o \
+	timer.o
 ifeq ($(have_win32_dbghelp), yes)
 OBJS += crashdump.o
 endif

src/backend/postmaster/Makefile

@@ -12,7 +12,17 @@ subdir = src/backend/postmaster
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = autovacuum.o bgworker.o bgwriter.o checkpointer.o fork_process.o \
+OBJS = \
-	pgarch.o pgstat.o postmaster.o startup.o syslogger.o walwriter.o
+	autovacuum.o \
+	bgworker.o \
+	bgwriter.o \
+	checkpointer.o \
+	fork_process.o \
+	pgarch.o \
+	pgstat.o \
+	postmaster.o \
+	startup.o \
+	syslogger.o \
+	walwriter.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/regex/Makefile

@@ -12,7 +12,13 @@ subdir = src/backend/regex
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = regcomp.o regerror.o regexec.o regfree.o regprefix.o regexport.o
+OBJS = \
+	regcomp.o \
+	regerror.o \
+	regexec.o \
+	regexport.o \
+	regfree.o \
+	regprefix.o
 
 include $(top_srcdir)/src/backend/common.mk
 

src/backend/replication/Makefile

@@ -14,8 +14,16 @@ include $(top_builddir)/src/Makefile.global
 
 override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
 
-OBJS = walsender.o walreceiverfuncs.o walreceiver.o basebackup.o \
+OBJS = \
-	repl_gram.o slot.o slotfuncs.o syncrep.o syncrep_gram.o
+	basebackup.o \
+	repl_gram.o \
+	slot.o \
+	slotfuncs.o \
+	syncrep.o \
+	syncrep_gram.o \
+	walreceiver.o \
+	walreceiverfuncs.o \
+	walsender.o
 
 SUBDIRS = logical
 

src/backend/replication/libpqwalreceiver/Makefile

@@ -14,7 +14,9 @@ include $(top_builddir)/src/Makefile.global
 
 override CPPFLAGS := -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
 
-OBJS = libpqwalreceiver.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	libpqwalreceiver.o
 SHLIB_LINK_INTERNAL = $(libpq)
 SHLIB_LINK = $(filter -lintl, $(LIBS))
 SHLIB_PREREQS = submake-libpq

src/backend/replication/logical/Makefile

@@ -14,7 +14,18 @@ include $(top_builddir)/src/Makefile.global
 
 override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
 
-OBJS = decode.o launcher.o logical.o logicalfuncs.o message.o origin.o \
+OBJS = \
-	   proto.o relation.o reorderbuffer.o snapbuild.o tablesync.o worker.o
+	decode.o \
+	launcher.o \
+	logical.o \
+	logicalfuncs.o \
+	message.o \
+	origin.o \
+	proto.o \
+	relation.o \
+	reorderbuffer.o \
+	snapbuild.o \
+	tablesync.o \
+	worker.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/replication/pgoutput/Makefile

@@ -12,7 +12,9 @@ subdir = src/backend/replication/pgoutput
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = pgoutput.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	pgoutput.o
 PGFILEDESC = "pgoutput - standard logical replication output plugin"
 NAME = pgoutput
 

src/backend/rewrite/Makefile

@@ -12,8 +12,12 @@ subdir = src/backend/rewrite
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = rewriteRemove.o rewriteDefine.o \
+OBJS = \
-       rewriteHandler.o rewriteManip.o rewriteSupport.o \
+	rewriteDefine.o \
-       rowsecurity.o
+	rewriteHandler.o \
+	rewriteManip.o \
+	rewriteRemove.o \
+	rewriteSupport.o \
+	rowsecurity.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/snowball/Makefile

@@ -16,7 +16,13 @@ include $(top_builddir)/src/Makefile.global
 override CPPFLAGS := -I$(top_srcdir)/src/include/snowball \
 	-I$(top_srcdir)/src/include/snowball/libstemmer $(CPPFLAGS)
 
-OBJS= $(WIN32RES) dict_snowball.o api.o utilities.o \
+OBJS = \
+	$(WIN32RES) \
+	api.o \
+	dict_snowball.o \
+	utilities.o
+
+OBJS += \
 	stem_ISO_8859_1_danish.o \
 	stem_ISO_8859_1_dutch.o \
 	stem_ISO_8859_1_english.o \

src/backend/statistics/Makefile

@@ -12,6 +12,10 @@ subdir = src/backend/statistics
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = extended_stats.o dependencies.o mcv.o mvdistinct.o
+OBJS = \
+	dependencies.o \
+	extended_stats.o \
+	mcv.o \
+	mvdistinct.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/storage/buffer/Makefile

@@ -12,6 +12,11 @@ subdir = src/backend/storage/buffer
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = buf_table.o buf_init.o bufmgr.o freelist.o localbuf.o
+OBJS = \
+	buf_init.o \
+	buf_table.o \
+	bufmgr.o \
+	freelist.o \
+	localbuf.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/storage/file/Makefile

@@ -12,6 +12,11 @@ subdir = src/backend/storage/file
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = fd.o buffile.o copydir.o reinit.o sharedfileset.o
+OBJS = \
+	buffile.o \
+	copydir.o \
+	fd.o \
+	reinit.o \
+	sharedfileset.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/storage/freespace/Makefile

@@ -12,6 +12,9 @@ subdir = src/backend/storage/freespace
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = freespace.o fsmpage.o indexfsm.o
+OBJS = \
+	freespace.o \
+	fsmpage.o \
+	indexfsm.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/storage/ipc/Makefile

@@ -8,8 +8,23 @@ subdir = src/backend/storage/ipc
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = barrier.o dsm_impl.o dsm.o ipc.o ipci.o latch.o pmsignal.o procarray.o \
+OBJS = \
-	procsignal.o shmem.o shmqueue.o shm_mq.o shm_toc.o signalfuncs.o \
+	barrier.o \
-	sinval.o sinvaladt.o standby.o
+	dsm.o \
+	dsm_impl.o \
+	ipc.o \
+	ipci.o \
+	latch.o \
+	pmsignal.o \
+	procarray.o \
+	procsignal.o \
+	shm_mq.o \
+	shm_toc.o \
+	shmem.o \
+	shmqueue.o \
+	signalfuncs.o \
+	sinval.o \
+	sinvaladt.o \
+	standby.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/storage/large_object/Makefile

@@ -12,6 +12,7 @@ subdir = src/backend/storage/large_object
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = inv_api.o
+OBJS = \
+	inv_api.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/storage/lmgr/Makefile

@@ -12,8 +12,17 @@ subdir = src/backend/storage/lmgr
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = lmgr.o lock.o proc.o deadlock.o lwlock.o lwlocknames.o spin.o \
+OBJS = \
-	s_lock.o predicate.o condition_variable.o
+	condition_variable.o \
+	deadlock.o \
+	lmgr.o \
+	lock.o \
+	lwlock.o \
+	lwlocknames.o \
+	predicate.o \
+	proc.o \
+	s_lock.o \
+	spin.o
 
 include $(top_srcdir)/src/backend/common.mk
 

src/backend/storage/page/Makefile

@@ -12,7 +12,10 @@ subdir = src/backend/storage/page
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS =  bufpage.o checksum.o itemptr.o
+OBJS =  \
+	bufpage.o \
+	checksum.o \
+	itemptr.o
 
 include $(top_srcdir)/src/backend/common.mk
 

src/backend/storage/smgr/Makefile

@@ -12,6 +12,8 @@ subdir = src/backend/storage/smgr
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = md.o smgr.o
+OBJS = \
+	md.o \
+	smgr.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/storage/sync/Makefile

@@ -12,6 +12,7 @@ subdir = src/backend/storage/sync
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = sync.o
+OBJS = \
+	sync.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/tcop/Makefile

@@ -12,6 +12,11 @@ subdir = src/backend/tcop
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS= dest.o fastpath.o postgres.o pquery.o utility.o
+OBJS = \
+	dest.o \
+	fastpath.o \
+	postgres.o \
+	pquery.o \
+	utility.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/tsearch/Makefile

@@ -23,10 +23,22 @@ DICTFILES=synonym_sample.syn thesaurus_sample.ths \
 # Local paths to dictionaries files
 DICTFILES_PATH=$(addprefix dicts/,$(DICTFILES))
 
-OBJS = ts_locale.o ts_parse.o wparser.o wparser_def.o dict.o \
+OBJS = \
-	dict_simple.o dict_synonym.o dict_thesaurus.o \
+	ts_locale.o \
-	dict_ispell.o regis.o spell.o \
+	ts_parse.o \
-	to_tsany.o ts_selfuncs.o ts_typanalyze.o ts_utils.o
+	wparser.o \
+	wparser_def.o \
+	dict.o \
+	dict_simple.o \
+	dict_synonym.o \
+	dict_thesaurus.o \
+	dict_ispell.o \
+	regis.o \
+	spell.o \
+	to_tsany.o \
+	ts_selfuncs.o \
+	ts_typanalyze.o \
+	ts_utils.o
 
 include $(top_srcdir)/src/backend/common.mk
 

src/backend/utils/adt/Makefile

@@ -9,29 +9,107 @@ top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
 # keep this list arranged alphabetically or it gets to be a mess
-OBJS = acl.o amutils.o arrayfuncs.o array_expanded.o array_selfuncs.o \
+OBJS = \
-	array_typanalyze.o array_userfuncs.o arrayutils.o ascii.o \
+	acl.o \
-	bool.o cash.o char.o cryptohashes.o \
+	amutils.o \
-	date.o datetime.o datum.o dbsize.o domains.o \
+	array_expanded.o \
-	encode.o enum.o expandeddatum.o expandedrecord.o \
+	array_selfuncs.o \
-	float.o format_type.o formatting.o genfile.o \
+	array_typanalyze.o \
-	geo_ops.o geo_selfuncs.o geo_spgist.o inet_cidr_ntop.o inet_net_pton.o \
+	array_userfuncs.o \
-	int.o int8.o json.o jsonb.o jsonb_gin.o jsonb_op.o jsonb_util.o \
+	arrayfuncs.o \
-	jsonfuncs.o jsonpath_gram.o jsonpath.o jsonpath_exec.o \
+	arrayutils.o \
-	like.o like_support.o lockfuncs.o mac.o mac8.o misc.o name.o \
+	ascii.o \
-	network.o network_gist.o network_selfuncs.o network_spgist.o \
+	bool.o \
-	numeric.o numutils.o oid.o oracle_compat.o \
+	cash.o \
-	orderedsetaggs.o partitionfuncs.o pg_locale.o pg_lsn.o \
+	char.o \
-	pg_upgrade_support.o pgstatfuncs.o \
+	cryptohashes.o \
-	pseudotypes.o quote.o rangetypes.o rangetypes_gist.o \
+	date.o \
-	rangetypes_selfuncs.o rangetypes_spgist.o rangetypes_typanalyze.o \
+	datetime.o \
-	regexp.o regproc.o ri_triggers.o rowtypes.o ruleutils.o \
+	datum.o \
-	selfuncs.o tid.o timestamp.o trigfuncs.o \
+	dbsize.o \
-	tsginidx.o tsgistidx.o tsquery.o tsquery_cleanup.o tsquery_gist.o \
+	domains.o \
-	tsquery_op.o tsquery_rewrite.o tsquery_util.o tsrank.o \
+	encode.o \
-	tsvector.o tsvector_op.o tsvector_parser.o \
+	enum.o \
-	txid.o uuid.o varbit.o varchar.o varlena.o version.o \
+	expandeddatum.o \
-	windowfuncs.o xid.o xml.o
+	expandedrecord.o \
+	float.o \
+	format_type.o \
+	formatting.o \
+	genfile.o \
+	geo_ops.o \
+	geo_selfuncs.o \
+	geo_spgist.o \
+	inet_cidr_ntop.o \
+	inet_net_pton.o \
+	int.o \
+	int8.o \
+	json.o \
+	jsonb.o \
+	jsonb_gin.o \
+	jsonb_op.o \
+	jsonb_util.o \
+	jsonfuncs.o \
+	jsonpath.o \
+	jsonpath_exec.o \
+	jsonpath_gram.o \
+	like.o \
+	like_support.o \
+	lockfuncs.o \
+	mac.o \
+	mac8.o \
+	misc.o \
+	name.o \
+	network.o \
+	network_gist.o \
+	network_selfuncs.o \
+	network_spgist.o \
+	numeric.o \
+	numutils.o \
+	oid.o \
+	oracle_compat.o \
+	orderedsetaggs.o \
+	partitionfuncs.o \
+	pg_locale.o \
+	pg_lsn.o \
+	pg_upgrade_support.o \
+	pgstatfuncs.o \
+	pseudotypes.o \
+	quote.o \
+	rangetypes.o \
+	rangetypes_gist.o \
+	rangetypes_selfuncs.o \
+	rangetypes_spgist.o \
+	rangetypes_typanalyze.o \
+	regexp.o \
+	regproc.o \
+	ri_triggers.o \
+	rowtypes.o \
+	ruleutils.o \
+	selfuncs.o \
+	tid.o \
+	timestamp.o \
+	trigfuncs.o \
+	tsginidx.o \
+	tsgistidx.o \
+	tsquery.o \
+	tsquery_cleanup.o \
+	tsquery_gist.o \
+	tsquery_op.o \
+	tsquery_rewrite.o \
+	tsquery_util.o \
+	tsrank.o \
+	tsvector.o \
+	tsvector_op.o \
+	tsvector_parser.o \
+	txid.o \
+	uuid.o \
+	varbit.o \
+	varchar.o \
+	varlena.o \
+	version.o \
+	windowfuncs.o \
+	xid.o \
+	xml.o
 
 jsonpath_scan.c: FLEXFLAGS = -CF -p -p
 jsonpath_scan.c: FLEX_NO_BACKUP=yes

src/backend/utils/cache/Makefile

@@ -12,8 +12,20 @@ subdir = src/backend/utils/cache
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = attoptcache.o catcache.o evtcache.o inval.o lsyscache.o \
+OBJS = \
-	partcache.o plancache.o relcache.o relmapper.o relfilenodemap.o \
+	attoptcache.o \
-	spccache.o syscache.o ts_cache.o typcache.o
+	catcache.o \
+	evtcache.o \
+	inval.o \
+	lsyscache.o \
+	partcache.o \
+	plancache.o \
+	relcache.o \
+	relfilenodemap.o \
+	relmapper.o \
+	spccache.o \
+	syscache.o \
+	ts_cache.o \
+	typcache.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/utils/error/Makefile

@@ -12,6 +12,8 @@ subdir = src/backend/utils/error
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = assert.o elog.o
+OBJS = \
+	assert.o \
+	elog.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/utils/fmgr/Makefile

@@ -12,7 +12,10 @@ subdir = src/backend/utils/fmgr
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = dfmgr.o fmgr.o funcapi.o
+OBJS = \
+	dfmgr.o \
+	fmgr.o \
+	funcapi.o
 
 override CPPFLAGS += -DDLSUFFIX=\"$(DLSUFFIX)\"