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

42 files changed, 224 insertions, 59 deletions

diff --git a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile
index 689aca1b38f..9a464b11bc9 100644
--- a/contrib/adminpack/Makefile
+++ b/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
diff --git a/contrib/amcheck/Makefile b/contrib/amcheck/Makefile
index dcec3b85203..a2b1b1036b3 100644
--- a/contrib/amcheck/Makefile
+++ b/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
diff --git a/contrib/auto_explain/Makefile b/contrib/auto_explain/Makefile
index fcf36c5ab09..54d6d45d400 100644
--- a/contrib/auto_explain/Makefile
+++ b/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
diff --git a/contrib/bloom/Makefile b/contrib/bloom/Makefile
index 146878870ec..6d7a612fe4b 100644
--- a/contrib/bloom/Makefile
+++ b/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
diff --git a/contrib/btree_gin/Makefile b/contrib/btree_gin/Makefile
index a9e99257be1..a9e13b32406 100644
--- a/contrib/btree_gin/Makefile
+++ b/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 \
diff --git a/contrib/btree_gist/Makefile b/contrib/btree_gist/Makefile
index af651205ec6..a5d848a6c5c 100644
--- a/contrib/btree_gist/Makefile
+++ b/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 \
-        btree_int4.o btree_int8.o btree_float4.o btree_float8.o btree_cash.o \
-        btree_oid.o btree_ts.o btree_time.o btree_date.o btree_interval.o \
-        btree_macaddr.o btree_macaddr8.o btree_inet.o btree_text.o \
-		btree_bytea.o btree_bit.o btree_numeric.o btree_uuid.o \
-		btree_enum.o $(WIN32RES)
+OBJS =  \
+	$(WIN32RES) \
+	btree_bit.o \
+	btree_bytea.o \
+	btree_cash.o \
+	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 \
diff --git a/contrib/cube/Makefile b/contrib/cube/Makefile
index 5e7b524dc22..61dddaaf4c7 100644
--- a/contrib/cube/Makefile
+++ b/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 \
diff --git a/contrib/dblink/Makefile b/contrib/dblink/Makefile
index b1a5e063837..2e745876df4 100644
--- a/contrib/dblink/Makefile
+++ b/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)
 
diff --git a/contrib/dict_int/Makefile b/contrib/dict_int/Makefile
index f6ae24aa4da..4e0f0f1675b 100644
--- a/contrib/dict_int/Makefile
+++ b/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
diff --git a/contrib/dict_xsyn/Makefile b/contrib/dict_xsyn/Makefile
index 0c401cf3c87..8d7dd99da72 100644
--- a/contrib/dict_xsyn/Makefile
+++ b/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
diff --git a/contrib/fuzzystrmatch/Makefile b/contrib/fuzzystrmatch/Makefile
index bd6f5e50d1a..60cf5947fee 100644
--- a/contrib/fuzzystrmatch/Makefile
+++ b/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 \
diff --git a/contrib/hstore/Makefile b/contrib/hstore/Makefile
index b29d02b1372..2d921b0cd05 100644
--- a/contrib/hstore/Makefile
+++ b/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 \
-	$(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	hstore_compat.o \
+	hstore_gin.o \
+	hstore_gist.o \
+	hstore_io.o \
+	hstore_op.o
 
 EXTENSION = hstore
 DATA = hstore--1.4.sql \
diff --git a/contrib/hstore_plperl/Makefile b/contrib/hstore_plperl/Makefile
index 5076e21e0ee..9065f164088 100644
--- a/contrib/hstore_plperl/Makefile
+++ b/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"
 
 
diff --git a/contrib/hstore_plpython/Makefile b/contrib/hstore_plpython/Makefile
index 6877e7a072c..6af097ae68b 100644
--- a/contrib/hstore_plpython/Makefile
+++ b/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
diff --git a/contrib/intarray/Makefile b/contrib/intarray/Makefile
index 250529432fa..64ae160ea0e 100644
--- a/contrib/intarray/Makefile
+++ b/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 \
-	_intbig_gist.o _int_gin.o _int_selfuncs.o $(WIN32RES)
+OBJS = \
+	$(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 \
diff --git a/contrib/jsonb_plperl/Makefile b/contrib/jsonb_plperl/Makefile
index b43c8ed97bd..ba9480e819b 100644
--- a/contrib/jsonb_plperl/Makefile
+++ b/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
diff --git a/contrib/jsonb_plpython/Makefile b/contrib/jsonb_plpython/Makefile
index b3c98e6db00..ca767418943 100644
--- a/contrib/jsonb_plpython/Makefile
+++ b/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)"'
diff --git a/contrib/ltree/Makefile b/contrib/ltree/Makefile
index 416c8da3127..31a1be0d3e1 100644
--- a/contrib/ltree/Makefile
+++ b/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 \
-	ltxtquery_io.o ltxtquery_op.o ltree_gist.o _ltree_gist.o $(WIN32RES)
+OBJS = \
+	$(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
diff --git a/contrib/ltree_plpython/Makefile b/contrib/ltree_plpython/Makefile
index ce2c0cd2e2f..12a01467721 100644
--- a/contrib/ltree_plpython/Makefile
+++ b/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
diff --git a/contrib/oid2name/Makefile b/contrib/oid2name/Makefile
index 361a80a7a12..6179ed594cf 100644
--- a/contrib/oid2name/Makefile
+++ b/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
 
diff --git a/contrib/pageinspect/Makefile b/contrib/pageinspect/Makefile
index cfe01297fb0..9b0167ce560 100644
--- a/contrib/pageinspect/Makefile
+++ b/contrib/pageinspect/Makefile
@@ -1,8 +1,15 @@
 # contrib/pageinspect/Makefile
 
 MODULE_big	= pageinspect
-OBJS		= rawpage.o heapfuncs.o btreefuncs.o fsmfuncs.o \
-		  brinfuncs.o ginfuncs.o hashfuncs.o $(WIN32RES)
+OBJS = \
+	$(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 \
diff --git a/contrib/passwordcheck/Makefile b/contrib/passwordcheck/Makefile
index 4da0b1417cb..006735a9690 100644
--- a/contrib/passwordcheck/Makefile
+++ b/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
diff --git a/contrib/pg_buffercache/Makefile b/contrib/pg_buffercache/Makefile
index 18f7a874524..26329e2906c 100644
--- a/contrib/pg_buffercache/Makefile
+++ b/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 \
diff --git a/contrib/pg_freespacemap/Makefile b/contrib/pg_freespacemap/Makefile
index 0a2f000ec66..fa1ae903588 100644
--- a/contrib/pg_freespacemap/Makefile
+++ b/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 \
diff --git a/contrib/pg_prewarm/Makefile b/contrib/pg_prewarm/Makefile
index 88580d11183..b13ac3c813c 100644
--- a/contrib/pg_prewarm/Makefile
+++ b/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
diff --git a/contrib/pg_standby/Makefile b/contrib/pg_standby/Makefile
index 0bca2f8e9ed..87732bedf18 100644
--- a/contrib/pg_standby/Makefile
+++ b/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
diff --git a/contrib/pg_stat_statements/Makefile b/contrib/pg_stat_statements/Makefile
index 051ce46f0c5..5bbe0543675 100644
--- a/contrib/pg_stat_statements/Makefile
+++ b/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 \
diff --git a/contrib/pg_trgm/Makefile b/contrib/pg_trgm/Makefile
index dfecc2a37fc..b7a9060c5fb 100644
--- a/contrib/pg_trgm/Makefile
+++ b/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 \
diff --git a/contrib/pg_visibility/Makefile b/contrib/pg_visibility/Makefile
index 21d787ddf78..b3b1a89e47d 100644
--- a/contrib/pg_visibility/Makefile
+++ b/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 \
diff --git a/contrib/pgcrypto/Makefile b/contrib/pgcrypto/Makefile
index 1313b664087..671502f577f 100644
--- a/contrib/pgcrypto/Makefile
+++ b/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 \
-		crypt-gensalt.c crypt-blowfish.c crypt-des.c \
-		crypt-md5.c $(CF_SRCS) \
-		mbuf.c pgp.c pgp-armor.c pgp-cfb.c pgp-compress.c \
-		pgp-decrypt.c pgp-encrypt.c pgp-info.c pgp-mpi.c \
-		pgp-pubdec.c pgp-pubenc.c pgp-pubkey.c pgp-s2k.c \
-		pgp-pgsql.c
+SRCS = \
+	$(CF_SRCS) \
+	crypt-blowfish.c \
+	crypt-des.c \
+	crypt-gensalt.c \
+	crypt-md5.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 \
diff --git a/contrib/pgrowlocks/Makefile b/contrib/pgrowlocks/Makefile
index 5d611665e90..0715b5ccad0 100644
--- a/contrib/pgrowlocks/Makefile
+++ b/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 \
diff --git a/contrib/pgstattuple/Makefile b/contrib/pgstattuple/Makefile
index 294077d4c11..d398035802d 100644
--- a/contrib/pgstattuple/Makefile
+++ b/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 \
diff --git a/contrib/postgres_fdw/Makefile b/contrib/postgres_fdw/Makefile
index 85394b4f1f0..ee8a80a3921 100644
--- a/contrib/postgres_fdw/Makefile
+++ b/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)
diff --git a/contrib/seg/Makefile b/contrib/seg/Makefile
index 62b658e7243..bce29eba4d7 100644
--- a/contrib/seg/Makefile
+++ b/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 \
diff --git a/contrib/sepgsql/Makefile b/contrib/sepgsql/Makefile
index f194b7ed8a4..afca75b693f 100644
--- a/contrib/sepgsql/Makefile
+++ b/contrib/sepgsql/Makefile
@@ -1,8 +1,17 @@
 # contrib/sepgsql/Makefile
 
 MODULE_big = sepgsql
-OBJS = hooks.o selinux.o uavc.o label.o dml.o \
-	database.o schema.o relation.o proc.o $(WIN32RES)
+OBJS = \
+	$(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"
 
diff --git a/contrib/sslinfo/Makefile b/contrib/sslinfo/Makefile
index 5a972db7030..2363c3f0e96 100644
--- a/contrib/sslinfo/Makefile
+++ b/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 \
diff --git a/contrib/tsm_system_rows/Makefile b/contrib/tsm_system_rows/Makefile
index 609af463c5c..3192ed5cb3c 100644
--- a/contrib/tsm_system_rows/Makefile
+++ b/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
diff --git a/contrib/tsm_system_time/Makefile b/contrib/tsm_system_time/Makefile
index 4c08a9935ab..69599955f2b 100644
--- a/contrib/tsm_system_time/Makefile
+++ b/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
diff --git a/contrib/unaccent/Makefile b/contrib/unaccent/Makefile
index f8e3860926b..92b7f9d78e7 100644
--- a/contrib/unaccent/Makefile
+++ b/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
diff --git a/contrib/uuid-ossp/Makefile b/contrib/uuid-ossp/Makefile
index c52c583d648..777f988a415 100644
--- a/contrib/uuid-ossp/Makefile
+++ b/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
diff --git a/contrib/vacuumlo/Makefile b/contrib/vacuumlo/Makefile
index 3efcb46735c..6bc7b34f08d 100644
--- a/contrib/vacuumlo/Makefile
+++ b/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
 
diff --git a/contrib/xml2/Makefile b/contrib/xml2/Makefile
index 68fd9c42af4..6ca2b7c8628 100644
--- a/contrib/xml2/Makefile
+++ b/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