diff options
147 files changed, 1271 insertions, 302 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 diff --git a/src/backend/Makefile b/src/backend/Makefile index b03d5e510f6..b0d2be7ee02 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -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 diff --git a/src/backend/access/brin/Makefile b/src/backend/access/brin/Makefile index 5aef925ed42..468e1e289a1 100644 --- a/src/backend/access/brin/Makefile +++ b/src/backend/access/brin/Makefile @@ -12,7 +12,14 @@ subdir = src/backend/access/brin top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = brin.o brin_pageops.o brin_revmap.o brin_tuple.o brin_xlog.o \ - 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 diff --git a/src/backend/access/common/Makefile b/src/backend/access/common/Makefile index 9ac19d9f9e5..6c9c6f32565 100644 --- a/src/backend/access/common/Makefile +++ b/src/backend/access/common/Makefile @@ -12,8 +12,19 @@ subdir = src/backend/access/common top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = bufmask.o detoast.o heaptuple.o indextuple.o printsimple.o \ - 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 diff --git a/src/backend/access/gin/Makefile b/src/backend/access/gin/Makefile index 0895003cd1a..3fceaeed60e 100644 --- a/src/backend/access/gin/Makefile +++ b/src/backend/access/gin/Makefile @@ -12,8 +12,21 @@ subdir = src/backend/access/gin top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = ginutil.o gininsert.o ginxlog.o ginentrypage.o gindatapage.o \ - 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 diff --git a/src/backend/access/gist/Makefile b/src/backend/access/gist/Makefile index 21875bf7aee..1aca8bc7422 100644 --- a/src/backend/access/gist/Makefile +++ b/src/backend/access/gist/Makefile @@ -12,7 +12,17 @@ subdir = src/backend/access/gist top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = gist.o gistutil.o gistxlog.o gistvacuum.o gistget.o gistscan.o \ - 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 diff --git a/src/backend/access/hash/Makefile b/src/backend/access/hash/Makefile index b154569b465..75bf3659824 100644 --- a/src/backend/access/hash/Makefile +++ b/src/backend/access/hash/Makefile @@ -12,7 +12,16 @@ subdir = src/backend/access/hash top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = hash.o hashfunc.o hashinsert.o hashovfl.o hashpage.o hashsearch.o \ - 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 diff --git a/src/backend/access/heap/Makefile b/src/backend/access/heap/Makefile index 38497b09c07..51a7f5e0d01 100644 --- a/src/backend/access/heap/Makefile +++ b/src/backend/access/heap/Makefile @@ -12,7 +12,16 @@ subdir = src/backend/access/heap top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = heapam.o heapam_handler.o heapam_visibility.o hio.o pruneheap.o rewriteheap.o \ - 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 diff --git a/src/backend/access/index/Makefile b/src/backend/access/index/Makefile index cb38be8f557..6f2e3061a84 100644 --- a/src/backend/access/index/Makefile +++ b/src/backend/access/index/Makefile @@ -12,6 +12,10 @@ subdir = src/backend/access/index top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = amapi.o amvalidate.o genam.o indexam.o +OBJS = \ + amapi.o \ + amvalidate.o \ + genam.o \ + indexam.o include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/access/nbtree/Makefile b/src/backend/access/nbtree/Makefile index 9aab9cf64ac..bf245f5dab1 100644 --- a/src/backend/access/nbtree/Makefile +++ b/src/backend/access/nbtree/Makefile @@ -12,7 +12,16 @@ subdir = src/backend/access/nbtree top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = nbtcompare.o nbtinsert.o nbtpage.o nbtree.o nbtsearch.o \ - 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 diff --git a/src/backend/access/rmgrdesc/Makefile b/src/backend/access/rmgrdesc/Makefile index 5514db1dda6..f88d72fd862 100644 --- a/src/backend/access/rmgrdesc/Makefile +++ b/src/backend/access/rmgrdesc/Makefile @@ -8,9 +8,27 @@ subdir = src/backend/access/rmgrdesc top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = brindesc.o clogdesc.o committsdesc.o dbasedesc.o genericdesc.o \ - 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 diff --git a/src/backend/access/spgist/Makefile b/src/backend/access/spgist/Makefile index 5be3df59926..8ed3b4ad6c7 100644 --- a/src/backend/access/spgist/Makefile +++ b/src/backend/access/spgist/Makefile @@ -12,9 +12,17 @@ subdir = src/backend/access/spgist top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = spgutils.o spginsert.o spgscan.o spgvacuum.o spgvalidate.o \ - 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 diff --git a/src/backend/access/table/Makefile b/src/backend/access/table/Makefile index b29df3f3335..9aba3ff489e 100644 --- a/src/backend/access/table/Makefile +++ b/src/backend/access/table/Makefile @@ -12,6 +12,10 @@ subdir = src/backend/access/table top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = table.o tableam.o tableamapi.o toast_helper.o +OBJS = \ + table.o \ + tableam.o \ + tableamapi.o \ + toast_helper.o include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/access/tablesample/Makefile b/src/backend/access/tablesample/Makefile index 68d9ab28147..01641e52d55 100644 --- a/src/backend/access/tablesample/Makefile +++ b/src/backend/access/tablesample/Makefile @@ -12,6 +12,9 @@ subdir = src/backend/access/tablesample top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = bernoulli.o system.o tablesample.o +OBJS = \ + bernoulli.o \ + system.o \ + tablesample.o include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/access/transam/Makefile b/src/backend/access/transam/Makefile index 16fbe47269a..595e02de722 100644 --- a/src/backend/access/transam/Makefile +++ b/src/backend/access/transam/Makefile @@ -12,10 +12,27 @@ subdir = src/backend/access/transam top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = clog.o commit_ts.o generic_xlog.o multixact.o parallel.o rmgr.o slru.o \ - 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 diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile index 672bc8b6d7b..6421efb2270 100644 --- a/src/backend/bootstrap/Makefile +++ b/src/backend/bootstrap/Makefile @@ -12,7 +12,9 @@ include $(top_builddir)/src/Makefile.global override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) -OBJS= bootparse.o bootstrap.o +OBJS = \ + bootparse.o \ + bootstrap.o include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile index 8bece078dd1..a51153236a0 100644 --- a/src/backend/catalog/Makefile +++ b/src/backend/catalog/Makefile @@ -13,13 +13,36 @@ subdir = src/backend/catalog top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -OBJS = catalog.o dependency.o heap.o index.o indexing.o namespace.o aclchk.o \ - 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 diff --git a/src/backend/commands/Makefile b/src/backend/commands/Makefile index d64628566d3..d4815d3ce65 100644 --- a/src/backend/commands/Makefile +++ b/src/backend/commands/Makefile @@ -12,14 +12,51 @@ subdir = src/backend/commands top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -OBJS = amcmds.o aggregatecmds.o alter.o analyze.o async.o cluster.o comment.o \ - 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 diff --git a/src/backend/executor/Makefile b/src/backend/executor/Makefile index cc09895fa5c..a983800e4b5 100644 --- a/src/backend/executor/Makefile +++ b/src/backend/executor/Makefile @@ -12,23 +12,67 @@ subdir = src/backend/executor top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -OBJS = execAmi.o execCurrent.o execExpr.o execExprInterp.o \ - 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 diff --git a/src/backend/foreign/Makefile b/src/backend/foreign/Makefile index 85aa857d3a7..dfea028403b 100644 --- a/src/backend/foreign/Makefile +++ b/src/backend/foreign/Makefile @@ -12,6 +12,7 @@ subdir = src/backend/foreign top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -OBJS= foreign.o +OBJS = \ + foreign.o include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/jit/Makefile b/src/backend/jit/Makefile index cdb9009ec1b..a895ebac5fb 100644 --- a/src/backend/jit/Makefile +++ b/src/backend/jit/Makefile @@ -17,6 +17,7 @@ include $(top_builddir)/src/Makefile.global override CPPFLAGS += -DDLSUFFIX=\"$(DLSUFFIX)\" -OBJS = jit.o +OBJS = \ + jit.o include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/jit/llvm/Makefile b/src/backend/jit/llvm/Makefile index 17ff0691f37..0268bd46d5c 100644 --- a/src/backend/jit/llvm/Makefile +++ b/src/backend/jit/llvm/Makefile @@ -33,12 +33,20 @@ SHLIB_LINK += $(LLVM_LIBS) # loadable modules. override COMPILER = $(CXX) $(CFLAGS) -OBJS=$(WIN32RES) +OBJS = \ + $(WIN32RES) # Infrastructure -OBJS += llvmjit.o llvmjit_error.o llvmjit_inline.o llvmjit_wrap.o +OBJS += \ + llvmjit.o \ + llvmjit_error.o \ + llvmjit_inline.o \ + llvmjit_wrap.o + # Code generation -OBJS += llvmjit_expr.o llvmjit_deform.o +OBJS += \ + llvmjit_deform.o \ + llvmjit_expr.o all: all-shared-lib llvmjit_types.bc diff --git a/src/backend/lib/Makefile b/src/backend/lib/Makefile index 3c1ee1df83a..dbea67bc379 100644 --- a/src/backend/lib/Makefile +++ b/src/backend/lib/Makefile @@ -12,7 +12,17 @@ subdir = src/backend/lib top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -OBJS = binaryheap.o bipartite_match.o bloomfilter.o dshash.o hyperloglog.o \ - 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 diff --git a/src/backend/libpq/Makefile b/src/backend/libpq/Makefile index 47efef0682d..efc5ef760aa 100644 --- a/src/backend/libpq/Makefile +++ b/src/backend/libpq/Makefile @@ -14,8 +14,19 @@ include $(top_builddir)/src/Makefile.global # be-fsstubs is here for historical reasons, probably belongs elsewhere -OBJS = be-fsstubs.o be-secure.o be-secure-common.o auth.o crypt.o hba.o ifaddr.o pqcomm.o \ - 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 diff --git a/src/backend/main/Makefile b/src/backend/main/Makefile index 198098e9cbb..6d34072624b 100644 --- a/src/backend/main/Makefile +++ b/src/backend/main/Makefile @@ -12,6 +12,7 @@ subdir = src/backend/main top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -OBJS = main.o +OBJS = \ + main.o include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/nodes/Makefile b/src/backend/nodes/Makefile index 0b1e98c0190..5d2b12a993c 100644 --- a/src/backend/nodes/Makefile +++ b/src/backend/nodes/Makefile @@ -12,8 +12,21 @@ subdir = src/backend/nodes top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -OBJS = nodeFuncs.o nodes.o list.o bitmapset.o tidbitmap.o \ - 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 diff --git a/src/backend/optimizer/geqo/Makefile b/src/backend/optimizer/geqo/Makefile index 3be7d7d450a..1978c14a0af 100644 --- a/src/backend/optimizer/geqo/Makefile +++ b/src/backend/optimizer/geqo/Makefile @@ -13,9 +13,21 @@ subdir = src/backend/optimizer/geqo top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = geqo_copy.o geqo_eval.o geqo_main.o geqo_misc.o \ - 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 diff --git a/src/backend/optimizer/path/Makefile b/src/backend/optimizer/path/Makefile index 6864a621327..1e199ff66f7 100644 --- a/src/backend/optimizer/path/Makefile +++ b/src/backend/optimizer/path/Makefile @@ -12,7 +12,15 @@ subdir = src/backend/optimizer/path top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = allpaths.o clausesel.o costsize.o equivclass.o indxpath.o \ - 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 diff --git a/src/backend/optimizer/plan/Makefile b/src/backend/optimizer/plan/Makefile index 88a9f7ff8c0..80ef162e484 100644 --- a/src/backend/optimizer/plan/Makefile +++ b/src/backend/optimizer/plan/Makefile @@ -12,7 +12,14 @@ subdir = src/backend/optimizer/plan top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = analyzejoins.o createplan.o initsplan.o planagg.o planmain.o planner.o \ - 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 diff --git a/src/backend/optimizer/prep/Makefile b/src/backend/optimizer/prep/Makefile index 86301bfbd32..5733df45737 100644 --- a/src/backend/optimizer/prep/Makefile +++ b/src/backend/optimizer/prep/Makefile @@ -12,6 +12,10 @@ subdir = src/backend/optimizer/prep top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = prepjointree.o prepqual.o preptlist.o prepunion.o +OBJS = \ + prepjointree.o \ + prepqual.o \ + preptlist.o \ + prepunion.o include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/optimizer/util/Makefile b/src/backend/optimizer/util/Makefile index bb33e2cc7c4..4fb115cb118 100644 --- a/src/backend/optimizer/util/Makefile +++ b/src/backend/optimizer/util/Makefile @@ -12,8 +12,20 @@ subdir = src/backend/optimizer/util top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = appendinfo.o clauses.o inherit.o joininfo.o orclauses.o \ - 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 diff --git a/src/backend/parser/Makefile b/src/backend/parser/Makefile index f14febdbda0..5ddb9a92f05 100644 --- a/src/backend/parser/Makefile +++ b/src/backend/parser/Makefile @@ -12,11 +12,27 @@ include $(top_builddir)/src/Makefile.global override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) -OBJS= analyze.o gram.o scan.o parser.o \ - 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 diff --git a/src/backend/partitioning/Makefile b/src/backend/partitioning/Makefile index 82093c615f3..a73fd148312 100644 --- a/src/backend/partitioning/Makefile +++ b/src/backend/partitioning/Makefile @@ -12,6 +12,9 @@ subdir = src/backend/partitioning top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -OBJS = partbounds.o partdesc.o partprune.o +OBJS = \ + partbounds.o \ + partdesc.o \ + partprune.o include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/port/Makefile b/src/backend/port/Makefile index f4120bec55f..2d00b4f05a7 100644 --- a/src/backend/port/Makefile +++ b/src/backend/port/Makefile @@ -21,7 +21,11 @@ subdir = src/backend/port top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -OBJS = atomics.o pg_sema.o pg_shmem.o $(TAS) +OBJS = \ + $(TAS) \ + atomics.o \ + pg_sema.o \ + pg_shmem.o ifeq ($(PORTNAME), win32) SUBDIRS += win32 diff --git a/src/backend/port/win32/Makefile b/src/backend/port/win32/Makefile index 833c9e06dc6..90126f634ac 100644 --- a/src/backend/port/win32/Makefile +++ b/src/backend/port/win32/Makefile @@ -12,7 +12,10 @@ subdir = src/backend/port/win32 top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = timer.o socket.o signal.o +OBJS = \ + signal.o \ + socket.o \ + timer.o ifeq ($(have_win32_dbghelp), yes) OBJS += crashdump.o endif diff --git a/src/backend/postmaster/Makefile b/src/backend/postmaster/Makefile index 71c23211b2a..03e3d3650ae 100644 --- a/src/backend/postmaster/Makefile +++ b/src/backend/postmaster/Makefile @@ -12,7 +12,17 @@ subdir = src/backend/postmaster top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -OBJS = autovacuum.o bgworker.o bgwriter.o checkpointer.o fork_process.o \ - 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 diff --git a/src/backend/regex/Makefile b/src/backend/regex/Makefile index a6100ad35db..5210c16ec4d 100644 --- a/src/backend/regex/Makefile +++ b/src/backend/regex/Makefile @@ -12,7 +12,13 @@ subdir = src/backend/regex top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -OBJS = regcomp.o regerror.o regexec.o regfree.o regprefix.o regexport.o +OBJS = \ + regcomp.o \ + regerror.o \ + regexec.o \ + regexport.o \ + regfree.o \ + regprefix.o include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/replication/Makefile b/src/backend/replication/Makefile index 562b55fbaaa..fd08f093e1d 100644 --- a/src/backend/replication/Makefile +++ b/src/backend/replication/Makefile @@ -14,8 +14,16 @@ include $(top_builddir)/src/Makefile.global override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) -OBJS = walsender.o walreceiverfuncs.o walreceiver.o basebackup.o \ - 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 diff --git a/src/backend/replication/libpqwalreceiver/Makefile b/src/backend/replication/libpqwalreceiver/Makefile index 75b0e2b49fd..f26daa135f3 100644 --- a/src/backend/replication/libpqwalreceiver/Makefile +++ b/src/backend/replication/libpqwalreceiver/Makefile @@ -14,7 +14,9 @@ include $(top_builddir)/src/Makefile.global override CPPFLAGS := -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS) -OBJS = libpqwalreceiver.o $(WIN32RES) +OBJS = \ + $(WIN32RES) \ + libpqwalreceiver.o SHLIB_LINK_INTERNAL = $(libpq) SHLIB_LINK = $(filter -lintl, $(LIBS)) SHLIB_PREREQS = submake-libpq diff --git a/src/backend/replication/logical/Makefile b/src/backend/replication/logical/Makefile index bb417b042ee..c4e2fdeb719 100644 --- a/src/backend/replication/logical/Makefile +++ b/src/backend/replication/logical/Makefile @@ -14,7 +14,18 @@ include $(top_builddir)/src/Makefile.global override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -OBJS = decode.o launcher.o logical.o logicalfuncs.o message.o origin.o \ - 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 diff --git a/src/backend/replication/pgoutput/Makefile b/src/backend/replication/pgoutput/Makefile index cbe444bae30..3b41fbcfac2 100644 --- a/src/backend/replication/pgoutput/Makefile +++ b/src/backend/replication/pgoutput/Makefile @@ -12,7 +12,9 @@ subdir = src/backend/replication/pgoutput top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = pgoutput.o $(WIN32RES) +OBJS = \ + $(WIN32RES) \ + pgoutput.o PGFILEDESC = "pgoutput - standard logical replication output plugin" NAME = pgoutput diff --git a/src/backend/rewrite/Makefile b/src/backend/rewrite/Makefile index 25423d39e6d..b435b3e985c 100644 --- a/src/backend/rewrite/Makefile +++ b/src/backend/rewrite/Makefile @@ -12,8 +12,12 @@ subdir = src/backend/rewrite top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -OBJS = rewriteRemove.o rewriteDefine.o \ - 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 diff --git a/src/backend/snowball/Makefile b/src/backend/snowball/Makefile index bf55b192347..539f572d81a 100644 --- a/src/backend/snowball/Makefile +++ b/src/backend/snowball/Makefile @@ -16,7 +16,13 @@ include $(top_builddir)/src/Makefile.global override CPPFLAGS := -I$(top_srcdir)/src/include/snowball \ -I$(top_srcdir)/src/include/snowball/libstemmer $(CPPFLAGS) -OBJS= $(WIN32RES) dict_snowball.o api.o utilities.o \ +OBJS = \ + $(WIN32RES) \ + api.o \ + dict_snowball.o \ + utilities.o + +OBJS += \ stem_ISO_8859_1_danish.o \ stem_ISO_8859_1_dutch.o \ stem_ISO_8859_1_english.o \ diff --git a/src/backend/statistics/Makefile b/src/backend/statistics/Makefile index d2815265fbf..89cf8c27973 100644 --- a/src/backend/statistics/Makefile +++ b/src/backend/statistics/Makefile @@ -12,6 +12,10 @@ subdir = src/backend/statistics top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -OBJS = extended_stats.o dependencies.o mcv.o mvdistinct.o +OBJS = \ + dependencies.o \ + extended_stats.o \ + mcv.o \ + mvdistinct.o include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/storage/buffer/Makefile b/src/backend/storage/buffer/Makefile index 2c10fba9cd1..fd7c40dcb08 100644 --- a/src/backend/storage/buffer/Makefile +++ b/src/backend/storage/buffer/Makefile @@ -12,6 +12,11 @@ subdir = src/backend/storage/buffer top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = buf_table.o buf_init.o bufmgr.o freelist.o localbuf.o +OBJS = \ + buf_init.o \ + buf_table.o \ + bufmgr.o \ + freelist.o \ + localbuf.o include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/storage/file/Makefile b/src/backend/storage/file/Makefile index ca6a0e4f7d5..5e1291bf2d5 100644 --- a/src/backend/storage/file/Makefile +++ b/src/backend/storage/file/Makefile @@ -12,6 +12,11 @@ subdir = src/backend/storage/file top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = fd.o buffile.o copydir.o reinit.o sharedfileset.o +OBJS = \ + buffile.o \ + copydir.o \ + fd.o \ + reinit.o \ + sharedfileset.o include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/storage/freespace/Makefile b/src/backend/storage/freespace/Makefile index fca18169901..ac0fa8b40b6 100644 --- a/src/backend/storage/freespace/Makefile +++ b/src/backend/storage/freespace/Makefile @@ -12,6 +12,9 @@ subdir = src/backend/storage/freespace top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = freespace.o fsmpage.o indexfsm.o +OBJS = \ + freespace.o \ + fsmpage.o \ + indexfsm.o include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/storage/ipc/Makefile b/src/backend/storage/ipc/Makefile index 49e7c9f15e8..df90c6b093f 100644 --- a/src/backend/storage/ipc/Makefile +++ b/src/backend/storage/ipc/Makefile @@ -8,8 +8,23 @@ subdir = src/backend/storage/ipc top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = barrier.o dsm_impl.o dsm.o ipc.o ipci.o latch.o pmsignal.o procarray.o \ - 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 diff --git a/src/backend/storage/large_object/Makefile b/src/backend/storage/large_object/Makefile index e1fd01c862f..8a6bc36d319 100644 --- a/src/backend/storage/large_object/Makefile +++ b/src/backend/storage/large_object/Makefile @@ -12,6 +12,7 @@ subdir = src/backend/storage/large_object top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = inv_api.o +OBJS = \ + inv_api.o include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/storage/lmgr/Makefile b/src/backend/storage/lmgr/Makefile index 8179f6dceb5..829b792fcb1 100644 --- a/src/backend/storage/lmgr/Makefile +++ b/src/backend/storage/lmgr/Makefile @@ -12,8 +12,17 @@ subdir = src/backend/storage/lmgr top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = lmgr.o lock.o proc.o deadlock.o lwlock.o lwlocknames.o spin.o \ - 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 diff --git a/src/backend/storage/page/Makefile b/src/backend/storage/page/Makefile index 49ab40740ae..10021e2bb31 100644 --- a/src/backend/storage/page/Makefile +++ b/src/backend/storage/page/Makefile @@ -12,7 +12,10 @@ subdir = src/backend/storage/page top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = bufpage.o checksum.o itemptr.o +OBJS = \ + bufpage.o \ + checksum.o \ + itemptr.o include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/storage/smgr/Makefile b/src/backend/storage/smgr/Makefile index e486b7c0d1c..596b564656f 100644 --- a/src/backend/storage/smgr/Makefile +++ b/src/backend/storage/smgr/Makefile @@ -12,6 +12,8 @@ subdir = src/backend/storage/smgr top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = md.o smgr.o +OBJS = \ + md.o \ + smgr.o include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/storage/sync/Makefile b/src/backend/storage/sync/Makefile index cfc60cadb4c..be88b445ebc 100644 --- a/src/backend/storage/sync/Makefile +++ b/src/backend/storage/sync/Makefile @@ -12,6 +12,7 @@ subdir = src/backend/storage/sync top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = sync.o +OBJS = \ + sync.o include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/tcop/Makefile b/src/backend/tcop/Makefile index 2320319c4ef..c78f1e0a05e 100644 --- a/src/backend/tcop/Makefile +++ b/src/backend/tcop/Makefile @@ -12,6 +12,11 @@ subdir = src/backend/tcop top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -OBJS= dest.o fastpath.o postgres.o pquery.o utility.o +OBJS = \ + dest.o \ + fastpath.o \ + postgres.o \ + pquery.o \ + utility.o include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/tsearch/Makefile b/src/backend/tsearch/Makefile index 62d8bb32548..24fbcf7f18b 100644 --- a/src/backend/tsearch/Makefile +++ b/src/backend/tsearch/Makefile @@ -23,10 +23,22 @@ DICTFILES=synonym_sample.syn thesaurus_sample.ths \ # Local paths to dictionaries files DICTFILES_PATH=$(addprefix dicts/,$(DICTFILES)) -OBJS = ts_locale.o ts_parse.o wparser.o wparser_def.o dict.o \ - 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 diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile index 580043233b3..13efa9338c1 100644 --- a/src/backend/utils/adt/Makefile +++ b/src/backend/utils/adt/Makefile @@ -9,29 +9,107 @@ top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global # keep this list arranged alphabetically or it gets to be a mess -OBJS = acl.o amutils.o arrayfuncs.o array_expanded.o array_selfuncs.o \ - 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 diff --git a/src/backend/utils/cache/Makefile b/src/backend/utils/cache/Makefile index e6a6b9f395f..38e46d274b2 100644 --- a/src/backend/utils/cache/Makefile +++ b/src/backend/utils/cache/Makefile @@ -12,8 +12,20 @@ subdir = src/backend/utils/cache top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = attoptcache.o catcache.o evtcache.o inval.o lsyscache.o \ - 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 diff --git a/src/backend/utils/error/Makefile b/src/backend/utils/error/Makefile index 4c313b7f92b..612da215d04 100644 --- a/src/backend/utils/error/Makefile +++ b/src/backend/utils/error/Makefile @@ -12,6 +12,8 @@ subdir = src/backend/utils/error top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = assert.o elog.o +OBJS = \ + assert.o \ + elog.o include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/utils/fmgr/Makefile b/src/backend/utils/fmgr/Makefile index 094767a0290..f552b95ca99 100644 --- a/src/backend/utils/fmgr/Makefile +++ b/src/backend/utils/fmgr/Makefile @@ -12,7 +12,10 @@ subdir = src/backend/utils/fmgr top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = dfmgr.o fmgr.o funcapi.o +OBJS = \ + dfmgr.o \ + fmgr.o \ + funcapi.o override CPPFLAGS += -DDLSUFFIX=\"$(DLSUFFIX)\" diff --git a/src/backend/utils/hash/Makefile b/src/backend/utils/hash/Makefile index 64eebd1d996..fc7b165f7fc 100644 --- a/src/backend/utils/hash/Makefile +++ b/src/backend/utils/hash/Makefile @@ -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 diff --git a/src/backend/utils/init/Makefile b/src/backend/utils/init/Makefile index a2928c7f357..362569393b5 100644 --- a/src/backend/utils/init/Makefile +++ b/src/backend/utils/init/Makefile @@ -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 diff --git a/src/backend/utils/mb/Makefile b/src/backend/utils/mb/Makefile index 89bec21bd03..18dd758cfe8 100644 --- a/src/backend/utils/mb/Makefile +++ b/src/backend/utils/mb/Makefile @@ -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 diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile index ec7ec131e5a..2397fc2453e 100644 --- a/src/backend/utils/misc/Makefile +++ b/src/backend/utils/misc/Makefile @@ -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. diff --git a/src/backend/utils/mmgr/Makefile b/src/backend/utils/mmgr/Makefile index f644c40c467..3b4cfdbd520 100644 --- a/src/backend/utils/mmgr/Makefile +++ b/src/backend/utils/mmgr/Makefile @@ -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 diff --git a/src/backend/utils/resowner/Makefile b/src/backend/utils/resowner/Makefile index 512fca1046f..6e1d3f24b4e 100644 --- a/src/backend/utils/resowner/Makefile +++ b/src/backend/utils/resowner/Makefile @@ -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 diff --git a/src/backend/utils/sort/Makefile b/src/backend/utils/sort/Makefile index d8c08ac25e3..7ac3659261e 100644 --- a/src/backend/utils/sort/Makefile +++ b/src/backend/utils/sort/Makefile @@ -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 diff --git a/src/backend/utils/time/Makefile b/src/backend/utils/time/Makefile index f17b1c53249..380dd2fcd5b 100644 --- a/src/backend/utils/time/Makefile +++ b/src/backend/utils/time/Makefile @@ -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 diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile index 7c404430a94..aea3415e5b3 100644 --- a/src/bin/initdb/Makefile +++ b/src/bin/initdb/Makefile @@ -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 diff --git a/src/bin/pg_archivecleanup/Makefile b/src/bin/pg_archivecleanup/Makefile index c5bf99db0f4..49935d6dce3 100644 --- a/src/bin/pg_archivecleanup/Makefile +++ b/src/bin/pg_archivecleanup/Makefile @@ -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 diff --git a/src/bin/pg_basebackup/Makefile b/src/bin/pg_basebackup/Makefile index d7a081b9bb6..4f274925321 100644 --- a/src/bin/pg_basebackup/Makefile +++ b/src/bin/pg_basebackup/Makefile @@ -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 diff --git a/src/bin/pg_checksums/Makefile b/src/bin/pg_checksums/Makefile index 278b7a0f2ec..d0791d82cd4 100644 --- a/src/bin/pg_checksums/Makefile +++ b/src/bin/pg_checksums/Makefile @@ -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 diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile index b915c2388a8..9b1b0abd2a5 100644 --- a/src/bin/pg_config/Makefile +++ b/src/bin/pg_config/Makefile @@ -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 diff --git a/src/bin/pg_controldata/Makefile b/src/bin/pg_controldata/Makefile index 2d5c5621318..abeb21780aa 100644 --- a/src/bin/pg_controldata/Makefile +++ b/src/bin/pg_controldata/Makefile @@ -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 diff --git a/src/bin/pg_ctl/Makefile b/src/bin/pg_ctl/Makefile index 83cbf97ed88..0e70f73775c 100644 --- a/src/bin/pg_ctl/Makefile +++ b/src/bin/pg_ctl/Makefile @@ -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 diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile index d3c1dce178e..3398d35c98b 100644 --- a/src/bin/pg_dump/Makefile +++ b/src/bin/pg_dump/Makefile @@ -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 diff --git a/src/bin/pg_resetwal/Makefile b/src/bin/pg_resetwal/Makefile index 2a3835691fd..43ed3a7bd3f 100644 --- a/src/bin/pg_resetwal/Makefile +++ b/src/bin/pg_resetwal/Makefile @@ -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 diff --git a/src/bin/pg_rewind/Makefile b/src/bin/pg_rewind/Makefile index 7a97df660b5..d72d7004ce9 100644 --- a/src/bin/pg_rewind/Makefile +++ b/src/bin/pg_rewind/Makefile @@ -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 diff --git a/src/bin/pg_test_fsync/Makefile b/src/bin/pg_test_fsync/Makefile index 90496df566d..7632c94eb7f 100644 --- a/src/bin/pg_test_fsync/Makefile +++ b/src/bin/pg_test_fsync/Makefile @@ -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 diff --git a/src/bin/pg_test_timing/Makefile b/src/bin/pg_test_timing/Makefile index d1f35954f0f..334d6ff5c00 100644 --- a/src/bin/pg_test_timing/Makefile +++ b/src/bin/pg_test_timing/Makefile @@ -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 diff --git a/src/bin/pg_upgrade/Makefile b/src/bin/pg_upgrade/Makefile index 2cb829acd59..0360c37bf90 100644 --- a/src/bin/pg_upgrade/Makefile +++ b/src/bin/pg_upgrade/Makefile @@ -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) diff --git a/src/bin/pg_waldump/Makefile b/src/bin/pg_waldump/Makefile index 135979cef38..9f333d0c8ab 100644 --- a/src/bin/pg_waldump/Makefile +++ b/src/bin/pg_waldump/Makefile @@ -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) diff --git a/src/bin/pgbench/Makefile b/src/bin/pgbench/Makefile index 25abd0a875c..f402fe7b912 100644 --- a/src/bin/pgbench/Makefile +++ b/src/bin/pgbench/Makefile @@ -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) diff --git a/src/bin/pgevent/Makefile b/src/bin/pgevent/Makefile index 171d0d81a0e..32b7d765898 100644 --- a/src/bin/pgevent/Makefile +++ b/src/bin/pgevent/Makefile @@ -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 = diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile index 69bb297fe7c..42771bcca89 100644 --- a/src/bin/psql/Makefile +++ b/src/bin/psql/Makefile @@ -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 diff --git a/src/common/Makefile b/src/common/Makefile index 2f22b9b101d..4fd487a4ec4 100644 --- a/src/common/Makefile +++ b/src/common/Makefile @@ -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) diff --git a/src/fe_utils/Makefile b/src/fe_utils/Makefile index f2e516a2aa3..beea5065365 100644 --- a/src/fe_utils/Makefile +++ b/src/fe_utils/Makefile @@ -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 diff --git a/src/interfaces/ecpg/compatlib/Makefile b/src/interfaces/ecpg/compatlib/Makefile index b9a4fbe9c01..c2011043ed1 100644 --- a/src/interfaces/ecpg/compatlib/Makefile +++ b/src/interfaces/ecpg/compatlib/Makefile @@ -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 diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile index e888205dee5..b368976fb05 100644 --- a/src/interfaces/ecpg/ecpglib/Makefile +++ b/src/interfaces/ecpg/ecpglib/Makefile @@ -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) diff --git a/src/interfaces/ecpg/pgtypeslib/Makefile b/src/interfaces/ecpg/pgtypeslib/Makefile index 899ff40cf69..cc73c9624d9 100644 --- a/src/interfaces/ecpg/pgtypeslib/Makefile +++ b/src/interfaces/ecpg/pgtypeslib/Makefile @@ -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 diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile index 2ec10236263..c30642317a9 100644 --- a/src/interfaces/ecpg/preproc/Makefile +++ b/src/interfaces/ecpg/preproc/Makefile @@ -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 diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile index 2fad1bc44c3..3d56774fe64 100644 --- a/src/interfaces/libpq/Makefile +++ b/src/interfaces/libpq/Makefile @@ -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 $@ diff --git a/src/pl/plpgsql/src/Makefile b/src/pl/plpgsql/src/Makefile index af9f6fb209b..4d57bf5f1e5 100644 --- a/src/pl/plpgsql/src/Makefile +++ b/src/pl/plpgsql/src/Makefile @@ -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 diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile index 8ee4c3ff156..9e315dee6a7 100644 --- a/src/pl/tcl/Makefile +++ b/src/pl/tcl/Makefile @@ -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 diff --git a/src/port/Makefile b/src/port/Makefile index b9492b741f4..8defa1257bb 100644 --- a/src/port/Makefile +++ b/src/port/Makefile @@ -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 diff --git a/src/test/isolation/Makefile b/src/test/isolation/Makefile index dc22e5ca9d4..da5e088bdde 100644 --- a/src/test/isolation/Makefile +++ b/src/test/isolation/Makefile @@ -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) diff --git a/src/test/modules/test_bloomfilter/Makefile b/src/test/modules/test_bloomfilter/Makefile index 808c9314d4c..c8b7890d201 100644 --- a/src/test/modules/test_bloomfilter/Makefile +++ b/src/test/modules/test_bloomfilter/Makefile @@ -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 diff --git a/src/test/modules/test_ginpostinglist/Makefile b/src/test/modules/test_ginpostinglist/Makefile index 4d45ac999af..51b941b6a77 100644 --- a/src/test/modules/test_ginpostinglist/Makefile +++ b/src/test/modules/test_ginpostinglist/Makefile @@ -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 diff --git a/src/test/modules/test_integerset/Makefile b/src/test/modules/test_integerset/Makefile index 3b7c4999d6f..799c17cd1bd 100644 --- a/src/test/modules/test_integerset/Makefile +++ b/src/test/modules/test_integerset/Makefile @@ -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 diff --git a/src/test/modules/test_parser/Makefile b/src/test/modules/test_parser/Makefile index 0c755aac73b..71eb38de6db 100644 --- a/src/test/modules/test_parser/Makefile +++ b/src/test/modules/test_parser/Makefile @@ -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 diff --git a/src/test/modules/test_predtest/Makefile b/src/test/modules/test_predtest/Makefile index 1b50fa31a4e..a235e2aac9c 100644 --- a/src/test/modules/test_predtest/Makefile +++ b/src/test/modules/test_predtest/Makefile @@ -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 diff --git a/src/test/modules/test_rbtree/Makefile b/src/test/modules/test_rbtree/Makefile index a4184b4d2e5..faf376ae251 100644 --- a/src/test/modules/test_rbtree/Makefile +++ b/src/test/modules/test_rbtree/Makefile @@ -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 diff --git a/src/test/modules/test_rls_hooks/Makefile b/src/test/modules/test_rls_hooks/Makefile index 284fdaf0958..a4f7d855c0c 100644 --- a/src/test/modules/test_rls_hooks/Makefile +++ b/src/test/modules/test_rls_hooks/Makefile @@ -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 diff --git a/src/test/modules/test_shm_mq/Makefile b/src/test/modules/test_shm_mq/Makefile index 11c4e357202..1171ced3e4d 100644 --- a/src/test/modules/test_shm_mq/Makefile +++ b/src/test/modules/test_shm_mq/Makefile @@ -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 diff --git a/src/timezone/Makefile b/src/timezone/Makefile index 78aeab43922..bf23ac9da97 100644 --- a/src/timezone/Makefile +++ b/src/timezone/Makefile @@ -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 diff --git a/src/tools/findoidjoins/Makefile b/src/tools/findoidjoins/Makefile index b4238e49726..2682ad1e9b7 100644 --- a/src/tools/findoidjoins/Makefile +++ b/src/tools/findoidjoins/Makefile @@ -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 diff --git a/src/tools/ifaddrs/Makefile b/src/tools/ifaddrs/Makefile index 763f913f2fe..461de416919 100644 --- a/src/tools/ifaddrs/Makefile +++ b/src/tools/ifaddrs/Makefile @@ -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 |