Split all OBJS style lines in makefiles into one-line-per-entry style.
authorAndres Freund <[email protected]>
Tue, 5 Nov 2019 22:41:07 +0000 (14:41 -0800)
committerAndres Freund <[email protected]>
Tue, 5 Nov 2019 22:41:07 +0000 (14:41 -0800)
When maintaining or merging es, 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[email protected]

147 files changed:
contrib/adminpack/Makefile
contrib/amcheck/Makefile
contrib/auto_explain/Makefile
contrib/bloom/Makefile
contrib/btree_gin/Makefile
contrib/btree_gist/Makefile
contrib/cube/Makefile
contrib/dblink/Makefile
contrib/dict_int/Makefile
contrib/dict_xsyn/Makefile
contrib/fuzzystrmatch/Makefile
contrib/hstore/Makefile
contrib/hstore_plperl/Makefile
contrib/hstore_plpython/Makefile
contrib/intarray/Makefile
contrib/jsonb_plperl/Makefile
contrib/jsonb_plpython/Makefile
contrib/ltree/Makefile
contrib/ltree_plpython/Makefile
contrib/oid2name/Makefile
contrib/pageinspect/Makefile
contrib/passwordcheck/Makefile
contrib/pg_buffercache/Makefile
contrib/pg_freespacemap/Makefile
contrib/pg_prewarm/Makefile
contrib/pg_standby/Makefile
contrib/pg_stat_statements/Makefile
contrib/pg_trgm/Makefile
contrib/pg_visibility/Makefile
contrib/pgcrypto/Makefile
contrib/pgrowlocks/Makefile
contrib/pgstattuple/Makefile
contrib/postgres_fdw/Makefile
contrib/seg/Makefile
contrib/sepgsql/Makefile
contrib/sslinfo/Makefile
contrib/tsm_system_rows/Makefile
contrib/tsm_system_time/Makefile
contrib/unaccent/Makefile
contrib/uuid-ossp/Makefile
contrib/vacuumlo/Makefile
contrib/xml2/Makefile
src/backend/Makefile
src/backend/access/brin/Makefile
src/backend/access/common/Makefile
src/backend/access/gin/Makefile
src/backend/access/gist/Makefile
src/backend/access/hash/Makefile
src/backend/access/heap/Makefile
src/backend/access/index/Makefile
src/backend/access/nbtree/Makefile
src/backend/access/rmgrdesc/Makefile
src/backend/access/spgist/Makefile
src/backend/access/table/Makefile
src/backend/access/tablesample/Makefile
src/backend/access/transam/Makefile
src/backend/bootstrap/Makefile
src/backend/catalog/Makefile
src/backend/commands/Makefile
src/backend/executor/Makefile
src/backend/foreign/Makefile
src/backend/jit/Makefile
src/backend/jit/llvm/Makefile
src/backend/lib/Makefile
src/backend/libpq/Makefile
src/backend/main/Makefile
src/backend/nodes/Makefile
src/backend/optimizer/geqo/Makefile
src/backend/optimizer/path/Makefile
src/backend/optimizer/plan/Makefile
src/backend/optimizer/prep/Makefile
src/backend/optimizer/util/Makefile
src/backend/parser/Makefile
src/backend/partitioning/Makefile
src/backend/port/Makefile
src/backend/port/win32/Makefile
src/backend/postmaster/Makefile
src/backend/regex/Makefile
src/backend/replication/Makefile
src/backend/replication/libpqwalreceiver/Makefile
src/backend/replication/logical/Makefile
src/backend/replication/pgoutput/Makefile
src/backend/rewrite/Makefile
src/backend/snowball/Makefile
src/backend/statistics/Makefile
src/backend/storage/buffer/Makefile
src/backend/storage/file/Makefile
src/backend/storage/freespace/Makefile
src/backend/storage/ipc/Makefile
src/backend/storage/large_object/Makefile
src/backend/storage/lmgr/Makefile
src/backend/storage/page/Makefile
src/backend/storage/smgr/Makefile
src/backend/storage/sync/Makefile
src/backend/tcop/Makefile
src/backend/tsearch/Makefile
src/backend/utils/adt/Makefile
src/backend/utils/cache/Makefile
src/backend/utils/error/Makefile
src/backend/utils/fmgr/Makefile
src/backend/utils/hash/Makefile
src/backend/utils/init/Makefile
src/backend/utils/mb/Makefile
src/backend/utils/misc/Makefile
src/backend/utils/mmgr/Makefile
src/backend/utils/resowner/Makefile
src/backend/utils/sort/Makefile
src/backend/utils/time/Makefile
src/bin/initdb/Makefile
src/bin/pg_archivecleanup/Makefile
src/bin/pg_basebackup/Makefile
src/bin/pg_checksums/Makefile
src/bin/pg_config/Makefile
src/bin/pg_controldata/Makefile
src/bin/pg_ctl/Makefile
src/bin/pg_dump/Makefile
src/bin/pg_resetwal/Makefile
src/bin/pg_rewind/Makefile
src/bin/pg_test_fsync/Makefile
src/bin/pg_test_timing/Makefile
src/bin/pg_upgrade/Makefile
src/bin/pg_waldump/Makefile
src/bin/pgbench/Makefile
src/bin/pgevent/Makefile
src/bin/psql/Makefile
src/common/Makefile
src/fe_utils/Makefile
src/interfaces/ecpg/compatlib/Makefile
src/interfaces/ecpg/ecpglib/Makefile
src/interfaces/ecpg/pgtypeslib/Makefile
src/interfaces/ecpg/preproc/Makefile
src/interfaces/libpq/Makefile
src/pl/plpgsql/src/Makefile
src/pl/tcl/Makefile
src/port/Makefile
src/test/isolation/Makefile
src/test/modules/test_bloomfilter/Makefile
src/test/modules/test_ginpostinglist/Makefile
src/test/modules/test_integerset/Makefile
src/test/modules/test_parser/Makefile
src/test/modules/test_predtest/Makefile
src/test/modules/test_rbtree/Makefile
src/test/modules/test_rls_hooks/Makefile
src/test/modules/test_shm_mq/Makefile
src/timezone/Makefile
src/tools/findoidjoins/Makefile
src/tools/ifaddrs/Makefile

index 689aca1b38f92f40a76e99480bbf9ad4e2da41b3..9a464b11bc96ad1facc9bf5d9e270021a2ede5b8 100644 (file)
@@ -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
index dcec3b85203acb9f45e0e12a3340750b73a9b120..a2b1b1036b3e310b4329e5c746ce568f2501519b 100644 (file)
@@ -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
index fcf36c5ab09ba0c47bb9a20d756c095830245ee5..54d6d45d4004b6f9f4a374f4e0a37b7532f6e667 100644 (file)
@@ -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
index 146878870ec8fa9be9da2c78bd66f185ae597f9e..6d7a612fe4be196d593642fe2447e88234a4f2b4 100644 (file)
@@ -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
index a9e99257be1876945137688eae9a477e4a613294..a9e13b324062d31efc10de181a8e12ade5850fc0 100644 (file)
@@ -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 \
index af651205ec6351762be53d64b100ba94c284b35c..a5d848a6c5ce7630340dea12d751328bc7beefe2 100644 (file)
@@ -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 \
index 5e7b524dc22eafb5010d1a3388a31d99857941bd..61dddaaf4c7b484ca06002e32ffc59baf8cd2251 100644 (file)
@@ -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 \
index b1a5e063837ed5ea9e52865ca87cdc53af795c41..2e745876df48e7a40cf40ed1d5ad0566dceba885 100644 (file)
@@ -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)
 
index f6ae24aa4dad7d2bb305abb9d7dfb54ff216e3cf..4e0f0f1675b087ea26bc428f6f5fda976f502484 100644 (file)
@@ -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
index 0c401cf3c87f0fa00c44509aa59564de7f1f40cd..8d7dd99da72ab76325561a5115ce552df3f381b1 100644 (file)
@@ -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
index bd6f5e50d1a9dac46acfc897f7c3d81454066c67..60cf5947feea9d63dff28e292a903a4bcb8cad7e 100644 (file)
@@ -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 \
index b29d02b13722f7db3f8aa649805a7a4bae16869e..2d921b0cd0562d33d09fa05ca3ef76c19251c8b1 100644 (file)
@@ -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 \
index 5076e21e0eec36adde8d62688b90756057d11aee..9065f1640882e8ed9cdccde3c71624a2f003a2bb 100644 (file)
@@ -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"
 
 
index 6877e7a072c9b990e93841858c992dead9a9ecfc..6af097ae68bddee73adda0a1d28b90955569625d 100644 (file)
@@ -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
index 250529432fa311bf5864627ef5032630211bc500..64ae160ea0e2b27d1bcb0f6e8f6314fa1424b1d4 100644 (file)
@@ -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 \
index b43c8ed97bdbbab3725234aec6762871bbe0c442..ba9480e819b0d926171d349cae96a49a10163f52 100644 (file)
@@ -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
index b3c98e6db00b52c702e02e185bd065c4ae28f453..ca7674189433e03eef3dc41b63d46d73641ffaf4 100644 (file)
@@ -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)"'
index 416c8da3127b1f937ad7da5bc1bc2ddadccaf06c..31a1be0d3e15fcad5d6dfe7e0bdaae9d50a3de77 100644 (file)
@@ -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
index ce2c0cd2e2fd9953925f5a07da2a224de522a9f7..12a0146772195abeab1925cad5f69a4d4189311e 100644 (file)
@@ -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
index 361a80a7a12272f7ef9fd49df846912230b90de7..6179ed594cf92425a37242198d7f2a839ca41c6f 100644 (file)
@@ -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
 
index cfe01297fb06739e5553d595ccb908d52637b558..9b0167ce5605be61afbba83ea24b2f9c716d9b87 100644 (file)
@@ -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 \
index 4da0b1417cbb23a4312e1cf7d8029ee8fe0767f9..006735a9690ffe384c0e1895db18bc7a5145ac29 100644 (file)
@@ -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 lib support
index 18f7a8745247837d2d20727d9614526497e494e8..26329e2906cf13835827f042e4f7cc9362c32a84 100644 (file)
@@ -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 \
index 0a2f000ec666eac2cafe417ca35d8a374eb7980b..fa1ae9035884a5103534a079e3a2f766a2ed0de4 100644 (file)
@@ -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 \
index 88580d1118327d4362acca2941a52285a967810d..b13ac3c813ce4e0ef41a6cfc5cbefa6c0cd40f7d 100644 (file)
@@ -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
index 0bca2f8e9ed4ed76ad237997fca32c8b7c24fd6d..87732bedf185fccec0c6888185c7c8dfe0fcb210 100644 (file)
@@ -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
index 051ce46f0c55ca3a5e5e198b7739f2fbe5a8f32f..5bbe05436757c003ae2cf701a97d8d5b5887f48e 100644 (file)
@@ -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 \
index dfecc2a37fc0aad8aaa2a487d7dc6179fba00f92..b7a9060c5fb21583a27006ad666be370fdfb00b6 100644 (file)
@@ -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 \
index 21d787ddf78650788dd275430b626bb3a7f5f92b..b3b1a89e47d62119bd85481791132af7e4b5ebfe 100644 (file)
@@ -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 \
index 1313b6640873c5724f761ec0ece2f86f378216c8..671502f577fe2802e4a06abe017d6b8f55cec1fc 100644 (file)
@@ -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 \
index 5d611665e9039ce229cdee7fdb4c4f6e4324814a..0715b5ccad099a0d0011ef09bb9688bd95918bdd 100644 (file)
@@ -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 \
index 294077d4c11e56fc6d097dd20be2c55a0a01a5e5..d398035802ddcf7a95f8c57d09e749f9acb06177 100644 (file)
@@ -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 \
index 85394b4f1f0f6c201fc76cb2b5bdac004cb7736d..ee8a80a3921e5ec399d4f41e8ea0bb257a639ad8 100644 (file)
@@ -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)
index 62b658e724353d97e7d45773c634d885c7bc5c73..bce29eba4d7676206a498bd3f96491f01f42c48d 100644 (file)
@@ -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 \
index f194b7ed8a4f53e5229bbbc3713ee3f201c5a353..afca75b693ffa0e4f5c96672ad761dbb785dabbc 100644 (file)
@@ -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"
 
index 5a972db70305c0199e9e571d8fdd5f053cbb5754..2363c3f0e96cbeeb3b3efe243435d7b0ee408a55 100644 (file)
@@ -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 \
index 609af463c5c2438b340c8ec6c32fdcddb7d627a1..3192ed5cb3c5d7ef909f5a867e1227c1d357405d 100644 (file)
@@ -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
index 4c08a9935ab68ea80bd28f8b99059689aae9112d..69599955f2bd8c6f7817d4007496e38ba0d8600a 100644 (file)
@@ -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
index f8e3860926b776993f1d86af8535b067bf91f4e0..92b7f9d78e7d8bb9d4d7564ed09edc53003bcdaf 100644 (file)
@@ -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
index c52c583d648e181f4b131c0c5c626a6a0adbf7a8..777f988a4157845f39a56d603235dc5a21b28d0b 100644 (file)
@@ -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
index 3efcb46735ce6f78bbd36407ed77e22205246f9d..6bc7b34f08ddc254df194192841d57db702fd9ae 100644 (file)
@@ -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
 
index 68fd9c42af497999070367d9aa1e4d77512da4e8..6ca2b7c86282c1523e1ed536cd8026d08dfa9d11 100644 (file)
@@ -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
index b03d5e510f64a683098546baa185f6a5462393fe..b0d2be7ee02877b9102bb4964ef1543175d3657b 100644 (file)
@@ -37,8 +37,11 @@ LOCALOBJS += utils/probes.o
 endif
 endif
 
-OBJS = $(SUBDIROBJS) $(LOCALOBJS) $(top_builddir)/src/port/libpgport_srv.a \
-       $(top_builddir)/src/common/libpgcommon_srv.a
+OBJS = \
+       $(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
index 5aef925ed42db33453edc05f6f28a718cedf08dc..468e1e289a152e13955d9de58e7997ca5458cc50 100644 (file)
@@ -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 \
-       brin_minmax.o brin_inclusion.o brin_validate.o
+OBJS = \
+       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
index 9ac19d9f9e5d370b9107ee15a93ce9c002b9f8a8..6c9c6f3256540283b05bdf1d1627786326b7b46d 100644 (file)
@@ -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 \
-       printtup.o relation.o reloptions.o scankey.o session.o toast_internals.o \
-       tupconvert.o tupdesc.o
+OBJS = \
+       bufmask.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
index 0895003cd1a91c39367ab7d006550c6e860269d3..3fceaeed60ebec95d8035bad5cfa8d1e8117cbb5 100644 (file)
@@ -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 \
-       ginbtree.o ginscan.o ginget.o ginvacuum.o ginarrayproc.o \
-       ginbulk.o ginfast.o ginpostinglist.o ginlogic.o ginvalidate.o
+OBJS = \
+       ginarrayproc.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
index 21875bf7aee8f8f7f097079044c77a066de3f705..1aca8bc742250ade0a65f4e136f02b848b6ce795 100644 (file)
@@ -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 \
-       gistproc.o gistsplit.o gistbuild.o gistbuildbuffers.o gistvalidate.o
+OBJS = \
+       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
index b154569b46504ae28d3096f10c8aad0cbe973568..75bf36598246be4ad1ab8435e0ffecd5ea9cd115 100644 (file)
@@ -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 \
-       hashsort.o hashutil.o hashvalidate.o hash_xlog.o
+OBJS = \
+       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
index 38497b09c07f7fcc8920084ebd15a0ee68d0edff..51a7f5e0d01e915e08f4b39e1e2e595c7566c2e1 100644 (file)
@@ -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 \
-       syncscan.o heaptoast.o vacuumlazy.o visibilitymap.o
+OBJS = \
+       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
index cb38be8f557cd0552b355ef23b2a6029c0a02aea..6f2e3061a84aebd77045125e9b29f23876fd536c 100644 (file)
@@ -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
index 9aab9cf64ac819cf5f62349e16465dc77d699f34..bf245f5dab1874d0ac39c629b98cdb0b090f54ee 100644 (file)
@@ -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 \
-       nbtsplitloc.o nbtutils.o nbtsort.o nbtvalidate.o nbtxlog.o
+OBJS = \
+       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
index 5514db1dda6ceaf95d3ef0ef37e66bddc82af420..f88d72fd862aa0f041bfb4159dfa985cad5c6d7b 100644 (file)
@@ -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 \
-          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
+OBJS = \
+       brindesc.o \
+       clogdesc.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
index 5be3df5992607d252ebc7a14f1c5a4f23d6bb832..8ed3b4ad6c7a76e0af60fee036553d2c22078e77 100644 (file)
@@ -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 \
-       spgdoinsert.o spgxlog.o \
-       spgtextproc.o spgquadtreeproc.o spgkdtreeproc.o \
-       spgproc.o
+OBJS = \
+       spgdoinsert.o \
+       spginsert.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
index b29df3f333573eabf10c67319ece70b95c4a5ace..9aba3ff489ea2cf71e2148c332eebb97276e45fc 100644 (file)
@@ -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
index 68d9ab281472d976e41aea3350fa768b5c296160..01641e52d558533e1d8437de5df2449da1a234a9 100644 (file)
@@ -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
index 16fbe47269a9be93ac6a283b93da54aa4b82454e..595e02de722cf5382d92558dfc7c68f52018e20a 100644 (file)
@@ -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 \
-       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
+OBJS = \
+       clog.o \
+       commit_ts.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
 
index 672bc8b6d7b16a3f2362aa6fbf592e90842588e0..6421efb2270bd1b3c1932f3479dafca52fc63031 100644 (file)
@@ -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
 
index 8bece078dd19b2ca62c45bd4300c22618731e0fb..a51153236a032b75b08cb8adb93c0d910dde221b 100644 (file)
@@ -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 \
-       objectaccess.o objectaddress.o partition.o pg_aggregate.o pg_collation.o \
-       pg_constraint.o pg_conversion.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_db_role_setting.o pg_shdepend.o pg_subscription.o pg_type.o \
-          storage.o toasting.o
+OBJS = \
+       aclchk.o \
+       catalog.o \
+       dependency.o \
+       heap.o \
+       index.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
 
index d64628566d361af728b629c5ca4492e53cec0321..d4815d3ce659a2984f033043a7e13b0f6001a9dd 100644 (file)
@@ -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 \
-       collationcmds.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 operatorcmds.o opclasscmds.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
+OBJS = \
+       aggregatecmds.o \
+       alter.o \
+       amcmds.o \
+       analyze.o \
+       async.o \
+       cluster.o \
+       collationcmds.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
index cc09895fa5c469c4ae6535f941f65ef3ccb5bfa2..a983800e4b5f753ec2a08bae83cef8ddeb7dff8b 100644 (file)
@@ -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 \
-       execGrouping.o execIndexing.o execJunk.o \
-       execMain.o execParallel.o execPartition.o execProcnode.o \
-       execReplication.o execScan.o execSRF.o execTuples.o \
-       execUtils.o functions.o instrument.o nodeAppend.o nodeAgg.o \
-       nodeBitmapAnd.o nodeBitmapOr.o \
-       nodeBitmapHeapscan.o nodeBitmapIndexscan.o \
-       nodeCustom.o nodeFunctionscan.o nodeGather.o \
-       nodeHash.o nodeHashjoin.o nodeIndexscan.o nodeIndexonlyscan.o \
-       nodeLimit.o nodeLockRows.o nodeGatherMerge.o \
-       nodeMaterial.o nodeMergeAppend.o nodeMergejoin.o nodeModifyTable.o \
-       nodeNestloop.o nodeProjectSet.o nodeRecursiveunion.o nodeResult.o \
-       nodeSamplescan.o nodeSeqscan.o nodeSetOp.o nodeSort.o nodeUnique.o \
-       nodeValuesscan.o \
-       nodeCtescan.o nodeNamedtuplestorescan.o nodeWorktablescan.o \
-       nodeGroup.o nodeSubplan.o nodeSubqueryscan.o nodeTidscan.o \
-       nodeForeignscan.o nodeWindowAgg.o tstoreReceiver.o tqueue.o spi.o \
-       nodeTableFuncscan.o
+OBJS = \
+       execAmi.o \
+       execCurrent.o \
+       execExpr.o \
+       execExprInterp.o \
+       execGrouping.o \
+       execIndexing.o \
+       execJunk.o \
+       execMain.o \
+       execParallel.o \
+       execPartition.o \
+       execProcnode.o \
+       execReplication.o \
+       execSRF.o \
+       execScan.o \
+       execTuples.o \
+       execUtils.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
index 85aa857d3a7e0f872562abfef511cb34a5e31c1e..dfea028403b9df27fd46d4e65227921a3d63e93e 100644 (file)
@@ -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
index cdb9009ec1ba6d5c7f881f0d6c03017008d6846c..a895ebac5fb58761ac9b58f1663347c7e0a060cb 100644 (file)
@@ -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
index 17ff0691f376dedb19a4a9e3c9152d86077b80a8..0268bd46d5c00068d6645dc9c502dcf8e29764c3 100644 (file)
@@ -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
 
index 3c1ee1df83abccc3619f69d0023655a3f336f1fb..dbea67bc379d20366b31f997bade4a7bcbc61e0f 100644 (file)
@@ -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 \
-       ilist.o integerset.o knapsack.o pairingheap.o rbtree.o stringinfo.o
+OBJS = \
+       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
index 47efef0682de5aef9aaa0ac35f74018b0020bb4e..efc5ef760aa9313c2711a9cb131240567baf7c29 100644 (file)
@@ -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 \
-       pqformat.o pqmq.o pqsignal.o auth-scram.o
+OBJS = \
+       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
index 198098e9cbb27a41fef02725c994943f234a2e26..6d34072624b731980795cb3b02b40db4bfa743d8 100644 (file)
@@ -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
index 0b1e98c019015fa49f3db9a781911bcdb12eb4b5..5d2b12a993c6d9a8199efbfb44c3b91a16b8ab11 100644 (file)
@@ -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 \
-       copyfuncs.o equalfuncs.o extensible.o makefuncs.o \
-       outfuncs.o readfuncs.o print.o read.o params.o value.o
+OBJS = \
+       bitmapset.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
index 3be7d7d450a7eda18379a454c840bac70b389505..1978c14a0af93c4cbba507c917ec56f5d5060cad 100644 (file)
@@ -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 \
-       geqo_mutation.o geqo_pool.o geqo_random.o geqo_recombination.o \
-       geqo_selection.o \
-       geqo_erx.o geqo_pmx.o geqo_cx.o geqo_px.o geqo_ox1.o geqo_ox2.o
+OBJS = \
+       geqo_copy.o \
+       geqo_cx.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
index 6864a621327ffe9711c7a6a09b3140b0e15cb8c4..1e199ff66f729df8180e3dbd31bbc46b66dbe547 100644 (file)
@@ -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 \
-       joinpath.o joinrels.o pathkeys.o tidpath.o
+OBJS = \
+       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
index 88a9f7ff8c0177b920b60900276335022ae0e813..80ef162e484184a027c4024f9d0d5409e79e7ca9 100644 (file)
@@ -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 \
-       setrefs.o subselect.o
+OBJS = \
+       analyzejoins.o \
+       createplan.o \
+       initsplan.o \
+       planagg.o \
+       planmain.o \
+       planner.o \
+       setrefs.o \
+       subselect.o
 
 include $(top_srcdir)/src/backend/common.mk
index 86301bfbd32a706788815477eaa8e710d045361b..5733df45737addef79aaf28b65d6d6d8537d3077 100644 (file)
@@ -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
index bb33e2cc7c498803aa590215bbbf34131f5c7bf4..4fb115cb118f58a403abb86c309fb81ebb485be4 100644 (file)
@@ -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 \
-       paramassign.o pathnode.o placeholder.o plancat.o predtest.o \
-       relnode.o restrictinfo.o tlist.o var.o
+OBJS = \
+       appendinfo.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
index f14febdbda02f32a0496f2fef02e597150775702..5ddb9a92f05bb1206aec513ffeb5b0eca5590bd2 100644 (file)
@@ -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 \
-      parse_agg.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 scansup.o
+OBJS = \
+       analyze.o \
+       gram.o \
+       parse_agg.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
 
index 82093c615f3eedc59718e3215a58c4e4f8191ecf..a73fd148312e1766d0780efcc50b140f080bc181 100644 (file)
@@ -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
index f4120bec55f8240c899fbcd1341b0bd629c3c051..2d00b4f05a7fd994a8b337163ff519c5ed7046a3 100644 (file)
@@ -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
index 833c9e06dc69f812a20c8d4b17a254d94178a900..90126f634ac6a1822858d3fbaab95d0752402cdd 100644 (file)
@@ -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
index 71c23211b2a11973dc2b4b705149cb6875147b38..03e3d3650aeacb8e6572e9e89108ad7dd1ef2141 100644 (file)
@@ -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 \
-       pgarch.o pgstat.o postmaster.o startup.o syslogger.o walwriter.o
+OBJS = \
+       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
index a6100ad35dbf2ba55e3c4b750208dd387ba2a538..5210c16ec4d1cd16786237ea4e06ff93a70bde3c 100644 (file)
@@ -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
 
index 562b55fbaaae748a276f7d080613a165907465c4..fd08f093e1db5b94f028258c886967abe51a7e16 100644 (file)
@@ -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 \
-       repl_gram.o slot.o slotfuncs.o syncrep.o syncrep_gram.o
+OBJS = \
+       basebackup.o \
+       repl_gram.o \
+       slot.o \
+       slotfuncs.o \
+       syncrep.o \
+       syncrep_gram.o \
+       walreceiver.o \
+       walreceiverfuncs.o \
+       walsender.o
 
 SUBDIRS = logical
 
index 75b0e2b49fd4426d7d7fd5caf1d5535f2ae5b9a9..f26daa135f3dbef959fd4f908533df2df1b3d5bd 100644 (file)
@@ -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
index bb417b042ee52ddec726712cec94951e5d9b7db2..c4e2fdeb719d76c1d5154a03292f766439d73add 100644 (file)
@@ -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 \
-          proto.o relation.o reorderbuffer.o snapbuild.o tablesync.o worker.o
+OBJS = \
+       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
index cbe444bae30b28dd3de0bd732e39460d5ccb2517..3b41fbcfac244f5e9e85a5bd2edfb9602f994e3c 100644 (file)
@@ -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
 
index 25423d39e6d50b4dc10d6221484f9c8f4b5d5e04..b435b3e985c00d88636f4ea93ee3fdc243fd378f 100644 (file)
@@ -12,8 +12,12 @@ subdir = src/backend/rewrite
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = rewriteRemove.o rewriteDefine.o \
-       rewriteHandler.o rewriteManip.o rewriteSupport.o \
-       rowsecurity.o
+OBJS = \
+       rewriteDefine.o \
+       rewriteHandler.o \
+       rewriteManip.o \
+       rewriteRemove.o \
+       rewriteSupport.o \
+       rowsecurity.o
 
 include $(top_srcdir)/src/backend/common.mk
index bf55b192347079e1334006a35f44fe344f0ba390..539f572d81a23fd25eb1dc591936f7c6ad9839ac 100644 (file)
@@ -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 \
index d2815265fbf843c77288072e2e2dbc18012f4b0d..89cf8c27973db21eb0a8f1dda8d28b6b5be333d7 100644 (file)
@@ -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
index 2c10fba9cd1b8c24e320b4cf7c0697951c775684..fd7c40dcb089de06025792783d8ba7fb990a2ba6 100644 (file)
@@ -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
index ca6a0e4f7d5b48bba61a73a3b42245dd718616ba..5e1291bf2d58be46796f7976986bc11fe4ec8fe4 100644 (file)
@@ -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
index fca18169901501964ea495e68366bf4d687a8eb4..ac0fa8b40b6d693c240d75faefdb29b2704bd078 100644 (file)
@@ -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
index 49e7c9f15e8fc21912de0603c426d92383366c22..df90c6b093fd7b826d34108946bf75e1640db2ae 100644 (file)
@@ -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 \
-       procsignal.o shmem.o shmqueue.o shm_mq.o shm_toc.o signalfuncs.o \
-       sinval.o sinvaladt.o standby.o
+OBJS = \
+       barrier.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
index e1fd01c862f7e37b5f9993e104d71c00f315d034..8a6bc36d319c05e02db1e04ce081acdfcd428159 100644 (file)
@@ -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
index 8179f6dceb59c2608c73441459b0f91f03828999..829b792fcb1cd5fc85b14a7459c902b34631c6ac 100644 (file)
@@ -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 \
-       s_lock.o predicate.o condition_variable.o
+OBJS = \
+       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
 
index 49ab40740ae06afdd09334afee5f934d4bc48b9b..10021e2bb31e01ae5dcee325f8aa929a6a28b76a 100644 (file)
@@ -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
 
index e486b7c0d1c2c97ecda21c02f96533397d4f2c97..596b564656fa27a27184a2c313847662ce5d7525 100644 (file)
@@ -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
index cfc60cadb4c5e6c2e5b677e25008789c6fc1d4c0..be88b445ebc4fa68dce214f5bcbe743d5bf978e2 100644 (file)
@@ -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
index 2320319c4ef6f5e0dd9a29c1ff3269730bc3cc4b..c78f1e0a05e5abfd0cb104f8221053f0bed66c8d 100644 (file)
@@ -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
index 62d8bb3254831690663ca200b76512e99c94aed3..24fbcf7f18bc23a45ae202fcdddde489ed092951 100644 (file)
@@ -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 \
-       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
+OBJS = \
+       ts_locale.o \
+       ts_parse.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
 
index 580043233b3cbf7233344efdadb62b577e79bada..13efa9338c165f32e90621d2636c04388df01fc3 100644 (file)
@@ -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 \
-       array_typanalyze.o array_userfuncs.o arrayutils.o ascii.o \
-       bool.o cash.o char.o cryptohashes.o \
-       date.o datetime.o datum.o dbsize.o domains.o \
-       encode.o enum.o expandeddatum.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_gram.o jsonpath.o jsonpath_exec.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
+OBJS = \
+       acl.o \
+       amutils.o \
+       array_expanded.o \
+       array_selfuncs.o \
+       array_typanalyze.o \
+       array_userfuncs.o \
+       arrayfuncs.o \
+       arrayutils.o \
+       ascii.o \
+       bool.o \
+       cash.o \
+       char.o \
+       cryptohashes.o \
+       date.o \
+       datetime.o \
+       datum.o \
+       dbsize.o \
+       domains.o \
+       encode.o \
+       enum.o \
+       expandeddatum.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
index e6a6b9f395f58abf9966b30f55bb19cef1b5bf82..38e46d274b28a2c55edff95c5500ce6d356cf813 100644 (file)
@@ -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 \
-       partcache.o plancache.o relcache.o relmapper.o relfilenodemap.o \
-       spccache.o syscache.o ts_cache.o typcache.o
+OBJS = \
+       attoptcache.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
index 4c313b7f92b30f424a2f56b6195878a7433fde97..612da215d042072bd452a521ee2a90869dfbd40f 100644 (file)
@@ -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
index 094767a0290f2d588d951188ce9c9d26240f96cd..f552b95ca99be14b84521a1838785745e70bd6cb 100644 (file)
@@ -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)\"
 
index 64eebd1d996c42ede260726021303b7c029901ac..fc7b165f7fc55b5b6b6544d22c633001dc6b09f1 100644 (file)
@@ -12,6 +12,9 @@ subdir = src/backend/utils/hash
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = dynahash.o hashfn.o pg_crc.o
+OBJS = \
+       dynahash.o \
+       hashfn.o \
+       pg_crc.o
 
 include $(top_srcdir)/src/backend/common.mk
index a2928c7f35772eaa5f20c76147d054a926cc15b0..362569393b5a813ec0b7665547e2253ef40a6d5f 100644 (file)
@@ -12,6 +12,9 @@ subdir = src/backend/utils/init
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = globals.o miscinit.o postinit.o
+OBJS = \
+       globals.o \
+       miscinit.o \
+       postinit.o
 
 include $(top_srcdir)/src/backend/common.mk
index 89bec21bd03033fb463a30d9094d061a2c2473d3..18dd758cfe848796b365a961a32c2f6b0f59aca2 100644 (file)
@@ -12,7 +12,13 @@ subdir = src/backend/utils/mb
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = encnames.o conv.o mbutils.o wchar.o wstrcmp.o wstrncmp.o
+OBJS = \
+       conv.o \
+       encnames.o \
+       mbutils.o \
+       wchar.o \
+       wstrcmp.o \
+       wstrncmp.o
 
 include $(top_srcdir)/src/backend/common.mk
 
index ec7ec131e5a598e75a4d37aa0a8352fce6174868..2397fc2453ef5b5a5912962df9c3622cdf6f8649 100644 (file)
@@ -14,9 +14,19 @@ include $(top_builddir)/src/Makefile.global
 
 override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
 
-OBJS = guc.o help_config.o pg_config.o pg_controldata.o pg_rusage.o \
-       ps_status.o queryenvironment.o rls.o sampling.o superuser.o \
-       timeout.o tzparser.o
+OBJS = \
+       guc.o \
+       help_config.o \
+       pg_config.o \
+       pg_controldata.o \
+       pg_rusage.o \
+       ps_status.o \
+       queryenvironment.o \
+       rls.o \
+       sampling.o \
+       superuser.o \
+       timeout.o \
+       tzparser.o
 
 # This location might depend on the installation directories. Therefore
 # we can't substitute it into pg_config.h.
index f644c40c46757c4d466c34fe9bc2b8de31afc9b2..3b4cfdbd520403dbc4574a7eab9f4bf582aaf778 100644 (file)
@@ -12,6 +12,14 @@ subdir = src/backend/utils/mmgr
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = aset.o dsa.o freepage.o generation.o mcxt.o memdebug.o portalmem.o slab.o
+OBJS = \
+       aset.o \
+       dsa.o \
+       freepage.o \
+       generation.o \
+       mcxt.o \
+       memdebug.o \
+       portalmem.o \
+       slab.o
 
 include $(top_srcdir)/src/backend/common.mk
index 512fca1046f4934eb66058347af0896442cc186b..6e1d3f24b4ee5b08bd9221a46630dcaff787291c 100644 (file)
@@ -12,6 +12,7 @@ subdir = src/backend/utils/resowner
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = resowner.o
+OBJS = \
+       resowner.o
 
 include $(top_srcdir)/src/backend/common.mk
index d8c08ac25e360530eaf5ac1c570fc64074240598..7ac3659261e33f2f80086676ff65c1f3b1779b07 100644 (file)
@@ -14,7 +14,12 @@ include $(top_builddir)/src/Makefile.global
 
 override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
 
-OBJS = logtape.o sharedtuplestore.o sortsupport.o tuplesort.o tuplestore.o
+OBJS = \
+       logtape.o \
+       sharedtuplestore.o \
+       sortsupport.o \
+       tuplesort.o \
+       tuplestore.o
 
 tuplesort.o: qsort_tuple.c
 
index f17b1c5324968cbb5f58082048f51b32c3397669..380dd2fcd5b4df483d95abcbff3cf98eadeb45b7 100644 (file)
@@ -12,6 +12,8 @@ subdir = src/backend/utils/time
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = combocid.o snapmgr.o
+OBJS = \
+       combocid.o \
+       snapmgr.o
 
 include $(top_srcdir)/src/backend/common.mk
index 7c404430a94bf08ea2e5001ee0757e44dbf8c825..aea3415e5b347557d67f1c360e32892ebd49e779 100644 (file)
@@ -26,7 +26,12 @@ ifneq (,$(with_system_tzdata))
 override CPPFLAGS += '-DSYSTEMTZDIR="$(with_system_tzdata)"'
 endif
 
-OBJS=  initdb.o findtimezone.o localtime.o encnames.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       encnames.o \
+       findtimezone.o \
+       initdb.o \
+       localtime.o
 
 all: initdb
 
index c5bf99db0f43159b232c2dfa6f155a90e170f8a5..49935d6dce3b70582f2f6db133f4afabaded95b8 100644 (file)
@@ -7,7 +7,9 @@ subdir = src/bin/pg_archivecleanup
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS   = pg_archivecleanup.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       pg_archivecleanup.o
 
 all: pg_archivecleanup
 
index d7a081b9bb685ea62462614dc928db075e424d89..4f274925321c3f1ed5607b5ac4377fcb23044b32 100644 (file)
@@ -21,7 +21,11 @@ include $(top_builddir)/src/Makefile.global
 override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
 LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport)
 
-OBJS=receivelog.o streamutil.o walmethods.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       receivelog.o \
+       streamutil.o \
+       walmethods.o
 
 all: pg_basebackup pg_receivewal pg_recvlogical
 
index 278b7a0f2ec04ff128063ea066216201a58106a5..d0791d82cd462dc97d73278b5644671e2ee718e7 100644 (file)
@@ -15,7 +15,9 @@ subdir = src/bin/pg_checksums
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS= pg_checksums.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       pg_checksums.o
 
 all: pg_checksums
 
index b915c2388a838112ce9c46ad59e32c1581253272..9b1b0abd2a51c6e6a0d637ca52e3b53ee79897bd 100644 (file)
@@ -15,7 +15,9 @@ subdir = src/bin/pg_config
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS=   pg_config.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       pg_config.o
 
 all: pg_config
 
index 2d5c56213182b323066b3add0036b5ced78ac078..abeb21780aab766f877875f5363f83fbebcedee2 100644 (file)
@@ -15,7 +15,9 @@ subdir = src/bin/pg_controldata
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS= pg_controldata.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       pg_controldata.o
 
 all: pg_controldata
 
index 83cbf97ed8815450ee971d8726eaaa73e4cdcc58..0e70f73775cf7204309714d32f3041aaae15fee0 100644 (file)
@@ -24,7 +24,9 @@ LDFLAGS_INTERNAL += $(libpq_pgport)
 SUBMAKE_LIBPQ := submake-libpq
 endif
 
-OBJS=  pg_ctl.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       pg_ctl.o
 
 all: pg_ctl
 
index d3c1dce178e8810499e329bce158f862b2abd0ea..3398d35c98b1f4d4a82db466265166ab6dc91a56 100644 (file)
@@ -19,9 +19,18 @@ include $(top_builddir)/src/Makefile.global
 override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
 LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport)
 
-OBJS=  pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \
-       pg_backup_null.o pg_backup_tar.o pg_backup_directory.o \
-       pg_backup_utils.o parallel.o compress_io.o dumputils.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       compress_io.o \
+       dumputils.o \
+       parallel.o \
+       pg_backup_archiver.o \
+       pg_backup_custom.o \
+       pg_backup_db.o \
+       pg_backup_directory.o \
+       pg_backup_null.o \
+       pg_backup_tar.o \
+       pg_backup_utils.o
 
 all: pg_dump pg_restore pg_dumpall
 
index 2a3835691fdd436ed6fb77e200c183f7a5e3600e..43ed3a7bd3fab6c75a4ebe67d20a109eb4009dab 100644 (file)
@@ -15,7 +15,9 @@ subdir = src/bin/pg_resetwal
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS= pg_resetwal.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       pg_resetwal.o
 
 all: pg_resetwal
 
index 7a97df660b5c1b3bda8f7214f41fb33bc32284d9..d72d7004ce9df9a6d2d36a0f6db7e1f40f8b7b5c 100644 (file)
@@ -18,9 +18,18 @@ include $(top_builddir)/src/Makefile.global
 override CPPFLAGS := -I$(libpq_srcdir) -DFRONTEND $(CPPFLAGS)
 LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport)
 
-OBJS   = pg_rewind.o parsexlog.o xlogreader.o datapagemap.o timeline.o \
-       fetch.o file_ops.o copy_fetch.o libpq_fetch.o filemap.o \
-       $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       copy_fetch.o \
+       datapagemap.o \
+       fetch.o \
+       file_ops.o \
+       filemap.o \
+       libpq_fetch.o \
+       parsexlog.o \
+       pg_rewind.o \
+       timeline.o \
+       xlogreader.o
 
 EXTRA_CLEAN = xlogreader.c
 
index 90496df566d17cfcca0098c8e6f78fbd6b26e346..7632c94eb7f626bd6b4d7dd354ee35e07fbc330f 100644 (file)
@@ -7,7 +7,9 @@ subdir = src/bin/pg_test_fsync
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = pg_test_fsync.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       pg_test_fsync.o
 
 all: pg_test_fsync
 
index d1f35954f0f60eba912e15c132dd8e67d3653e48..334d6ff5c00db4b46ea67140b0688103e20c897a 100644 (file)
@@ -7,7 +7,9 @@ subdir = src/bin/pg_test_timing
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = pg_test_timing.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       pg_test_timing.o
 
 all: pg_test_timing
 
index 2cb829acd59309d225ea00f010dec20555f3ea0c..0360c37bf904ec52ed775630c4187953777c8e95 100644 (file)
@@ -7,9 +7,23 @@ subdir = src/bin/pg_upgrade
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = check.o controldata.o dump.o exec.o file.o function.o info.o \
-       option.o parallel.o pg_upgrade.o relfilenode.o server.o \
-       tablespace.o util.o version.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       check.o \
+       controldata.o \
+       dump.o \
+       exec.o \
+       file.o \
+       function.o \
+       info.o \
+       option.o \
+       parallel.o \
+       pg_upgrade.o \
+       relfilenode.o \
+       server.o \
+       tablespace.o \
+       util.o \
+       version.o
 
 override CPPFLAGS := -DDLSUFFIX=\"$(DLSUFFIX)\" -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
 LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport)
index 135979cef385ee84f3ed3b391ebb8cf72b7d8d86..9f333d0c8ab10569d4264e99086267898d8e6f0a 100644 (file)
@@ -7,8 +7,13 @@ subdir = src/bin/pg_waldump
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = pg_waldump.o compat.o xlogreader.o rmgrdesc.o \
-       $(RMGRDESCOBJS) $(WIN32RES)
+OBJS = \
+       $(RMGRDESCOBJS) \
+       $(WIN32RES) \
+       compat.o \
+       pg_waldump.o \
+       rmgrdesc.o \
+       xlogreader.o
 
 override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
 
index 25abd0a875c8668e124f03eefe6c4a96daca3179..f402fe7b9127b201f14d5bf5d120ca70d53f2324 100644 (file)
@@ -7,7 +7,10 @@ subdir = src/bin/pgbench
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = pgbench.o exprparse.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       exprparse.o \
+       pgbench.o
 
 override CPPFLAGS := -I. -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
 LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport)
index 171d0d81a0ef6971c1449790695edb96338fb887..32b7d76589839c921706cc2bcda71bee24371a12 100644 (file)
@@ -16,7 +16,9 @@ include $(top_builddir)/src/Makefile.global
 
 ifeq ($(PORTNAME), win32)
 
-OBJS=pgevent.o pgmsgevent.o
+OBJS = \
+       pgevent.o \
+       pgmsgevent.o
 NAME=pgevent
 
 SHLIB_LINK =
index 69bb297fe7c4523d24375225d59ea3216dedd42c..42771bcca89fa84cfc6a0d4c4e4530c7b4cdd738 100644 (file)
@@ -21,11 +21,24 @@ REFDOCDIR= $(top_srcdir)/doc/src/sgml/ref
 override CPPFLAGS := -I. -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
 LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport)
 
-OBJS=  command.o common.o copy.o crosstabview.o \
-       describe.o help.o input.o large_obj.o mainloop.o \
-       prompt.o psqlscanslash.o sql_help.o startup.o stringutils.o \
-       tab-complete.o variables.o \
-       $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       command.o \
+       common.o \
+       copy.o \
+       crosstabview.o \
+       describe.o \
+       help.o \
+       input.o \
+       large_obj.o \
+       mainloop.o \
+       prompt.o \
+       psqlscanslash.o \
+       sql_help.o \
+       startup.o \
+       stringutils.o \
+       tab-complete.o \
+       variables.o
 
 
 all: psql
index 2f22b9b101d6097c163f1393bcafc6b896fe8339..4fd487a4ec4f25e42948547cc13fbfa467ef2e73 100644 (file)
@@ -46,11 +46,30 @@ LIBS += $(PTHREAD_LIBS)
 
 # If you add objects here, see also src/tools/msvc/Mkvcbuild.pm
 
-OBJS_COMMON = base64.o config_info.o controldata_utils.o d2s.o exec.o f2s.o \
-       file_perm.o ip.o keywords.o kwlookup.o link-canary.o md5.o \
-       pg_lzcompress.o pgfnames.o psprintf.o relpath.o \
-       rmtree.o saslprep.o scram-common.o string.o unicode_norm.o \
-       username.o wait_error.o
+OBJS_COMMON = \
+       base64.o \
+       config_info.o \
+       controldata_utils.o \
+       d2s.o \
+       exec.o \
+       f2s.o \
+       file_perm.o \
+       ip.o \
+       keywords.o \
+       kwlookup.o \
+       link-canary.o \
+       md5.o \
+       pg_lzcompress.o \
+       pgfnames.o \
+       psprintf.o \
+       relpath.o \
+       rmtree.o \
+       saslprep.o \
+       scram-common.o \
+       string.o \
+       unicode_norm.o \
+       username.o \
+       wait_error.o
 
 ifeq ($(with_openssl),yes)
 OBJS_COMMON += sha2_openssl.o
@@ -60,8 +79,12 @@ endif
 
 # A few files are currently only built for frontend, not server
 # (Mkvcbuild.pm has a copy of this list, too)
-OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o file_utils.o \
-       logging.o restricted_token.o
+OBJS_FRONTEND = \
+       $(OBJS_COMMON) \
+       fe_memutils.o \
+       file_utils.o \
+       logging.o \
+       restricted_token.o
 
 # foo.o, foo_shlib.o, and foo_srv.o are all built from foo.c
 OBJS_SHLIB = $(OBJS_FRONTEND:%.o=%_shlib.o)
index f2e516a2aa32c3b0ed9482927c0f3dd651eec783..beea50653650d5d272649c6b4805806b0ab21ea3 100644 (file)
@@ -19,8 +19,14 @@ include $(top_builddir)/src/Makefile.global
 
 override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
 
-OBJS = conditional.o mbprint.o print.o psqlscan.o recovery_gen.o \
-       simple_list.o string_utils.o
+OBJS = \
+       conditional.o \
+       mbprint.o \
+       print.o \
+       psqlscan.o \
+       recovery_gen.o \
+       simple_list.o \
+       string_utils.o
 
 all: libpgfeutils.a
 
index b9a4fbe9c012232c05a1eecba4f59b291d28874b..c2011043ed191d7cdcfd0b85a47638d5b9436da7 100644 (file)
@@ -28,7 +28,9 @@ SHLIB_PREREQS = submake-ecpglib submake-pgtypeslib
 
 SHLIB_EXPORTS = exports.txt
 
-OBJS= informix.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       informix.o
 
 PKG_CONFIG_REQUIRES_PRIVATE = libecpg libpgtypes
 
index e888205dee5b6be813473f1ab4b3e09895407199..b368976fb0508b2af0c9662a28808bdbb4fe9953 100644 (file)
@@ -22,8 +22,18 @@ override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \
        -I$(libpq_srcdir) -I$(top_builddir)/src/port -DFRONTEND $(CPPFLAGS)
 override CFLAGS += $(PTHREAD_CFLAGS)
 
-OBJS= execute.o typename.o descriptor.o sqlda.o data.o error.o prepare.o \
-       memory.o connect.o misc.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       connect.o \
+       data.o \
+       descriptor.o \
+       error.o \
+       execute.o \
+       memory.o \
+       misc.o \
+       prepare.o \
+       sqlda.o \
+       typename.o
 
 SHLIB_LINK_INTERNAL = -L../pgtypeslib -lpgtypes $(libpq_pgport_shlib)
 SHLIB_LINK = $(filter -lintl -lm, $(LIBS)) $(PTHREAD_LIBS)
index 899ff40cf696f38dca381fc404247287c35b8a00..cc73c9624d9be3918f59d26b3b8e73464d07c2d8 100644 (file)
@@ -27,8 +27,14 @@ SHLIB_LINK += $(filter -lintl -lm, $(LIBS))
 
 SHLIB_EXPORTS = exports.txt
 
-OBJS= numeric.o datetime.o common.o dt_common.o timestamp.o interval.o \
-       $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       common.o \
+       datetime.o \
+       dt_common.o \
+       interval.o \
+       numeric.o \
+       timestamp.o
 
 all: all-lib
 
index 2ec1023626341f109c5b5b14440d1ab35a1d6048..c30642317a9e27087af8864d226937f775ab35ee 100644 (file)
@@ -23,9 +23,20 @@ override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \
 
 override CFLAGS += $(PTHREAD_CFLAGS)
 
-OBJS=  preproc.o pgc.o type.o ecpg.o output.o parser.o \
-       keywords.o c_keywords.o ecpg_keywords.o typename.o descriptor.o variable.o \
-       $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       c_keywords.o \
+       descriptor.o \
+       ecpg.o \
+       ecpg_keywords.o \
+       keywords.o \
+       output.o \
+       parser.o \
+       pgc.o \
+       preproc.o \
+       type.o \
+       typename.o \
+       variable.o
 
 # where to find gen_keywordlist.pl and subsidiary files
 TOOLSDIR = $(top_srcdir)/src/tools
index 2fad1bc44c365cf6c61df1393bc668df7f658571..3d56774fe642943195aa542442c42d7a20cdc8cd 100644 (file)
@@ -27,19 +27,36 @@ endif
 # The MSVC build system scrapes OBJS from this file.  If you change any of
 # the conditional additions of files to OBJS, update Mkvcbuild.pm to match.
 
-OBJS=  fe-auth.o fe-auth-scram.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
-       fe-protocol2.o fe-protocol3.o pqexpbuffer.o fe-secure.o \
-       legacy-pqsignal.o libpq-events.o
+OBJS = \
+       fe-auth-scram.o \
+       fe-connect.o \
+       fe-exec.o \
+       fe-lobj.o \
+       fe-misc.o \
+       fe-print.o \
+       fe-protocol2.o \
+       fe-protocol3.o \
+       fe-secure.o \
+       legacy-pqsignal.o \
+       libpq-events.o \
+       pqexpbuffer.o \
+       fe-auth.o
 
 # src/backend/utils/mb
-OBJS += encnames.o wchar.o
+OBJS += \
+       encnames.o \
+       wchar.o
 
 ifeq ($(with_openssl),yes)
-OBJS += fe-secure-openssl.o fe-secure-common.o
+OBJS += \
+       fe-secure-common.o \
+       fe-secure-openssl.o
 endif
 
 ifeq ($(with_gssapi),yes)
-OBJS += fe-gssapi-common.o fe-secure-gssapi.o
+OBJS += \
+       fe-gssapi-common.o \
+       fe-secure-gssapi.o
 endif
 
 ifeq ($(PORTNAME), cygwin)
@@ -47,7 +64,9 @@ override shlib = cyg$(NAME)$(DLSUFFIX)
 endif
 
 ifeq ($(PORTNAME), win32)
-OBJS += win32.o libpqrc.o
+OBJS += \
+       libpqrc.o \
+       win32.o
 
 libpqrc.o: libpq.rc
        $(WINDRES) -i $< -o $@
index af9f6fb209b3828afa4287791f672e2ec2f7c4f8..4d57bf5f1e5550c37a56918662613be317e34649 100644 (file)
@@ -19,8 +19,14 @@ override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
 SHLIB_LINK = $(filter -lintl, $(LIBS))
 rpath =
 
-OBJS = pl_gram.o pl_handler.o pl_comp.o pl_exec.o \
-       pl_funcs.o pl_scanner.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       pl_comp.o \
+       pl_exec.o \
+       pl_funcs.o \
+       pl_gram.o \
+       pl_handler.o \
+       pl_scanner.o
 
 DATA = plpgsql.control plpgsql--1.0.sql plpgsql--unpackaged--1.0.sql
 
index 8ee4c3ff156a92635faa04458b1a10240f7a5149..9e315dee6a72d8b58207df329c0a7878b0eb9771 100644 (file)
@@ -22,7 +22,9 @@ PGFILEDESC = "PL/Tcl - procedural language"
 
 NAME = pltcl
 
-OBJS = pltcl.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       pltcl.o
 
 DATA = pltcl.control pltcl--1.0.sql pltcl--unpackaged--1.0.sql \
        pltclu.control pltclu--1.0.sql pltclu--unpackaged--1.0.sql
index b9492b741f48230281a23afded30e68531f25ff8..8defa1257bb8a8ea106fea1975e1e2493dfad7e0 100644 (file)
@@ -35,11 +35,30 @@ include $(top_builddir)/src/Makefile.global
 override CPPFLAGS := -I$(top_builddir)/src/port -DFRONTEND $(CPPFLAGS)
 LIBS += $(PTHREAD_LIBS)
 
-OBJS = $(LIBOBJS) $(PG_CRC32C_OBJS) chklocale.o erand48.o inet_net_ntop.o \
-       noblock.o path.o pg_bitutils.o pgcheckdir.o pgmkdirp.o pgsleep.o \
-       pg_strong_random.o pgstrcasecmp.o pgstrsignal.o pqsignal.o \
-       qsort.o qsort_arg.o quotes.o snprintf.o sprompt.o strerror.o \
-       tar.o thread.o
+OBJS = \
+       $(LIBOBJS) \
+       $(PG_CRC32C_OBJS) \
+       chklocale.o \
+       erand48.o \
+       inet_net_ntop.o \
+       noblock.o \
+       path.o \
+       pg_bitutils.o \
+       pg_strong_random.o \
+       pgcheckdir.o \
+       pgmkdirp.o \
+       pgsleep.o \
+       pgstrcasecmp.o \
+       pgstrsignal.o \
+       pqsignal.o \
+       qsort.o \
+       qsort_arg.o \
+       quotes.o \
+       snprintf.o \
+       sprompt.o \
+       strerror.o \
+       tar.o \
+       thread.o
 
 # libpgport.a, libpgport_shlib.a, and libpgport_srv.a contain the same files
 # foo.o, foo_shlib.o, and foo_srv.o are all built from foo.c
index dc22e5ca9d4e937b95b845d9bd18f2f14b54eaa6..da5e088bdde73bf4e6959551bbad3b908497015c 100644 (file)
@@ -11,7 +11,10 @@ include $(top_builddir)/src/Makefile.global
 
 override CPPFLAGS := -I$(srcdir) -I$(libpq_srcdir) -I$(srcdir)/../regress $(CPPFLAGS)
 
-OBJS =  specparse.o isolationtester.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       isolationtester.o \
+       specparse.o
 
 all: isolationtester$(X) pg_isolation_regress$(X)
 
index 808c9314d4ce2adbee3f57bf3986edfc39524e22..c8b7890d2019174f5c52eabfafc4717fd58bbaf6 100644 (file)
@@ -1,7 +1,9 @@
 # src/test/modules/test_bloomfilter/Makefile
 
 MODULE_big = test_bloomfilter
-OBJS = test_bloomfilter.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       test_bloomfilter.o
 PGFILEDESC = "test_bloomfilter - test code for Bloom filter library"
 
 EXTENSION = test_bloomfilter
index 4d45ac999af553d0053590cef0f1039dd0d7ad60..51b941b6a7719cb99422b1412f0b813e03f043e3 100644 (file)
@@ -1,7 +1,9 @@
 # src/test/modules/test_ginpostinglist/Makefile
 
 MODULE_big = test_ginpostinglist
-OBJS = test_ginpostinglist.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       test_ginpostinglist.o
 PGFILEDESC = "test_ginpostinglist - test code for src/backend/access/gin//ginpostinglist.c"
 
 EXTENSION = test_ginpostinglist
index 3b7c4999d6fb45950a899f885677bb6dee64ff9a..799c17cd1bd5b778779e23ecdc08a42f01ea2e6d 100644 (file)
@@ -1,7 +1,9 @@
 # src/test/modules/test_integerset/Makefile
 
 MODULE_big = test_integerset
-OBJS = test_integerset.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       test_integerset.o
 PGFILEDESC = "test_integerset - test code for src/backend/lib/integerset.c"
 
 EXTENSION = test_integerset
index 0c755aac73ba2f6b1cc2db7bf5ac9c26a6c81755..71eb38de6dbebbd8293536f6cf2bf2e89d5bdf8e 100644 (file)
@@ -1,7 +1,9 @@
 # src/test/modules/test_parser/Makefile
 
 MODULE_big = test_parser
-OBJS = test_parser.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       test_parser.o
 PGFILEDESC = "test_parser - example of a custom parser for full-text search"
 
 EXTENSION = test_parser
index 1b50fa31a4e59f2546a4f9a05e618637cb4d68cd..a235e2aac9c539e102ea43ac8a368a33e284aee8 100644 (file)
@@ -1,7 +1,9 @@
 # src/test/modules/test_predtest/Makefile
 
 MODULE_big = test_predtest
-OBJS = test_predtest.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       test_predtest.o
 PGFILEDESC = "test_predtest - test code for optimizer/util/predtest.c"
 
 EXTENSION = test_predtest
index a4184b4d2e50e8e34599a70b7981595c98b28463..faf376ae2513faacb0e6ef03b1acc2c8b4857211 100644 (file)
@@ -1,7 +1,9 @@
 # src/test/modules/test_rbtree/Makefile
 
 MODULE_big = test_rbtree
-OBJS = test_rbtree.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       test_rbtree.o
 PGFILEDESC = "test_rbtree - test code for red-black tree library"
 
 EXTENSION = test_rbtree
index 284fdaf0958229d033b59fd3e0dff5bc98b0fd7d..a4f7d855c0c4a5fb65ef0655e624d6e1a418db38 100644 (file)
@@ -1,7 +1,9 @@
 # src/test/modules/test_rls_hooks/Makefile
 
 MODULE_big = test_rls_hooks
-OBJS = test_rls_hooks.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       test_rls_hooks.o
 PGFILEDESC = "test_rls_hooks - example use of RLS hooks"
 
 EXTENSION = test_rls_hooks
index 11c4e3572022b65fa19c5614228fd34372b50fee..1171ced3e4dd63bd7e6f8536986cee6cfe77b5cb 100644 (file)
@@ -1,7 +1,11 @@
 # src/test/modules/test_shm_mq/Makefile
 
 MODULE_big = test_shm_mq
-OBJS = test.o setup.o worker.o $(WIN32RES)
+OBJS = \
+       $(WIN32RES) \
+       setup.o \
+       test.o \
+       worker.o
 PGFILEDESC = "test_shm_mq - example use of shared memory message queue"
 
 EXTENSION = test_shm_mq
index 78aeab43922d9df485659a4f452e0fe78236417a..bf23ac9da9741d0a0bb73a1e3c9de40974ef1c77 100644 (file)
@@ -16,10 +16,15 @@ top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
 # files to build into backend
-OBJS= localtime.o strftime.o pgtz.o
+OBJS = \
+       localtime.o \
+       pgtz.o \
+       strftime.o
 
 # files needed to build zic utility program
-ZICOBJS= zic.o $(WIN32RES)
+ZICOBJS = \
+       $(WIN32RES) \
+       zic.o
 
 # we now distribute the timezone data as a single file
 TZDATAFILES = $(srcdir)/data/tzdata.zi
index b4238e497261b86338b1d156d18a345b9437b4d2..2682ad1e9b7dbc8262fdc5d3286811f6f27fca82 100644 (file)
@@ -15,7 +15,8 @@ include $(top_builddir)/src/Makefile.global
 override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
 LDFLAGS_INTERNAL += $(libpq_pgport)
 
-OBJS= findoidjoins.o
+OBJS = \
+       findoidjoins.o
 
 all: findoidjoins
 
index 763f913f2fe85724a7fb377b3719cee4fd7c0932..461de416919dd21ffab5073daebd3d0c0715d19e 100644 (file)
@@ -16,7 +16,8 @@ libpq_backend_dir = $(top_builddir)/src/backend/libpq
 
 override CPPFLAGS := -I$(libpq_backend_dir) $(CPPFLAGS)
 
-OBJS = test_ifaddrs.o
+OBJS = \
+       test_ifaddrs.o
 
 all: test_ifaddrs