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

From: Andres Freund <andres(at)anarazel(dot)de>
To: pgsql-committers(at)lists(dot)postgresql(dot)org
Subject: pgsql: Split all OBJS style lines in makefiles into one-line-per-entry
Date: 2019-11-05 22:47:19
Message-ID: E1iS7bb-0002E4-7Y@gemulon.postgresql.org
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgsql-committers

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

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

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

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

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/01368e5d9da77099b38aac527b01b85cc7869b25

Modified Files
--------------
contrib/adminpack/Makefile | 4 +-
contrib/amcheck/Makefile | 4 +-
contrib/auto_explain/Makefile | 4 +-
contrib/bloom/Makefile | 9 +-
contrib/btree_gin/Makefile | 4 +-
contrib/btree_gist/Makefile | 31 ++++--
contrib/cube/Makefile | 5 +-
contrib/dblink/Makefile | 4 +-
contrib/dict_int/Makefile | 4 +-
contrib/dict_xsyn/Makefile | 4 +-
contrib/fuzzystrmatch/Makefile | 5 +-
contrib/hstore/Makefile | 9 +-
contrib/hstore_plperl/Makefile | 4 +-
contrib/hstore_plpython/Makefile | 4 +-
contrib/intarray/Makefile | 11 +-
contrib/jsonb_plperl/Makefile | 4 +-
contrib/jsonb_plpython/Makefile | 4 +-
contrib/ltree/Makefile | 13 ++-
contrib/ltree_plpython/Makefile | 4 +-
contrib/oid2name/Makefile | 4 +-
contrib/pageinspect/Makefile | 11 +-
contrib/passwordcheck/Makefile | 4 +-
contrib/pg_buffercache/Makefile | 4 +-
contrib/pg_freespacemap/Makefile | 4 +-
contrib/pg_prewarm/Makefile | 5 +-
contrib/pg_standby/Makefile | 4 +-
contrib/pg_stat_statements/Makefile | 4 +-
contrib/pg_trgm/Makefile | 7 +-
contrib/pg_visibility/Makefile | 4 +-
contrib/pgcrypto/Makefile | 35 ++++--
contrib/pgrowlocks/Makefile | 4 +-
contrib/pgstattuple/Makefile | 6 +-
contrib/postgres_fdw/Makefile | 8 +-
contrib/seg/Makefile | 5 +-
contrib/sepgsql/Makefile | 13 ++-
contrib/sslinfo/Makefile | 4 +-
contrib/tsm_system_rows/Makefile | 4 +-
contrib/tsm_system_time/Makefile | 4 +-
contrib/unaccent/Makefile | 4 +-
contrib/uuid-ossp/Makefile | 5 +-
contrib/vacuumlo/Makefile | 4 +-
contrib/xml2/Makefile | 5 +-
src/backend/Makefile | 7 +-
src/backend/access/brin/Makefile | 11 +-
src/backend/access/common/Makefile | 17 ++-
src/backend/access/gin/Makefile | 19 +++-
src/backend/access/gist/Makefile | 14 ++-
src/backend/access/hash/Makefile | 13 ++-
src/backend/access/heap/Makefile | 13 ++-
src/backend/access/index/Makefile | 6 +-
src/backend/access/nbtree/Makefile | 13 ++-
src/backend/access/rmgrdesc/Makefile | 26 ++++-
src/backend/access/spgist/Makefile | 16 ++-
src/backend/access/table/Makefile | 6 +-
src/backend/access/tablesample/Makefile | 5 +-
src/backend/access/transam/Makefile | 25 ++++-
src/backend/bootstrap/Makefile | 4 +-
src/backend/catalog/Makefile | 37 +++++--
src/backend/commands/Makefile | 55 ++++++++--
src/backend/executor/Makefile | 80 ++++++++++----
src/backend/foreign/Makefile | 3 +-
src/backend/jit/Makefile | 3 +-
src/backend/jit/llvm/Makefile | 14 ++-
src/backend/lib/Makefile | 14 ++-
src/backend/libpq/Makefile | 15 ++-
src/backend/main/Makefile | 3 +-
src/backend/nodes/Makefile | 19 +++-
src/backend/optimizer/geqo/Makefile | 20 +++-
src/backend/optimizer/path/Makefile | 12 ++-
src/backend/optimizer/plan/Makefile | 11 +-
src/backend/optimizer/prep/Makefile | 6 +-
src/backend/optimizer/util/Makefile | 18 +++-
src/backend/parser/Makefile | 26 ++++-
src/backend/partitioning/Makefile | 5 +-
src/backend/port/Makefile | 6 +-
src/backend/port/win32/Makefile | 5 +-
src/backend/postmaster/Makefile | 14 ++-
src/backend/regex/Makefile | 8 +-
src/backend/replication/Makefile | 12 ++-
src/backend/replication/libpqwalreceiver/Makefile | 4 +-
src/backend/replication/logical/Makefile | 15 ++-
src/backend/replication/pgoutput/Makefile | 4 +-
src/backend/rewrite/Makefile | 10 +-
src/backend/snowball/Makefile | 8 +-
src/backend/statistics/Makefile | 6 +-
src/backend/storage/buffer/Makefile | 7 +-
src/backend/storage/file/Makefile | 7 +-
src/backend/storage/freespace/Makefile | 5 +-
src/backend/storage/ipc/Makefile | 21 +++-
src/backend/storage/large_object/Makefile | 3 +-
src/backend/storage/lmgr/Makefile | 13 ++-
src/backend/storage/page/Makefile | 5 +-
src/backend/storage/smgr/Makefile | 4 +-
src/backend/storage/sync/Makefile | 3 +-
src/backend/tcop/Makefile | 7 +-
src/backend/tsearch/Makefile | 20 +++-
src/backend/utils/adt/Makefile | 124 ++++++++++++++++++----
src/backend/utils/cache/Makefile | 18 +++-
src/backend/utils/error/Makefile | 4 +-
src/backend/utils/fmgr/Makefile | 5 +-
src/backend/utils/hash/Makefile | 5 +-
src/backend/utils/init/Makefile | 5 +-
src/backend/utils/mb/Makefile | 8 +-
src/backend/utils/misc/Makefile | 16 ++-
src/backend/utils/mmgr/Makefile | 10 +-
src/backend/utils/resowner/Makefile | 3 +-
src/backend/utils/sort/Makefile | 7 +-
src/backend/utils/time/Makefile | 4 +-
src/bin/initdb/Makefile | 7 +-
src/bin/pg_archivecleanup/Makefile | 4 +-
src/bin/pg_basebackup/Makefile | 6 +-
src/bin/pg_checksums/Makefile | 4 +-
src/bin/pg_config/Makefile | 4 +-
src/bin/pg_controldata/Makefile | 4 +-
src/bin/pg_ctl/Makefile | 4 +-
src/bin/pg_dump/Makefile | 15 ++-
src/bin/pg_resetwal/Makefile | 4 +-
src/bin/pg_rewind/Makefile | 15 ++-
src/bin/pg_test_fsync/Makefile | 4 +-
src/bin/pg_test_timing/Makefile | 4 +-
src/bin/pg_upgrade/Makefile | 20 +++-
src/bin/pg_waldump/Makefile | 9 +-
src/bin/pgbench/Makefile | 5 +-
src/bin/pgevent/Makefile | 4 +-
src/bin/psql/Makefile | 23 +++-
src/common/Makefile | 37 +++++--
src/fe_utils/Makefile | 10 +-
src/interfaces/ecpg/compatlib/Makefile | 4 +-
src/interfaces/ecpg/ecpglib/Makefile | 14 ++-
src/interfaces/ecpg/pgtypeslib/Makefile | 10 +-
src/interfaces/ecpg/preproc/Makefile | 17 ++-
src/interfaces/libpq/Makefile | 33 ++++--
src/pl/plpgsql/src/Makefile | 10 +-
src/pl/tcl/Makefile | 4 +-
src/port/Makefile | 29 ++++-
src/test/isolation/Makefile | 5 +-
src/test/modules/test_bloomfilter/Makefile | 4 +-
src/test/modules/test_ginpostinglist/Makefile | 4 +-
src/test/modules/test_integerset/Makefile | 4 +-
src/test/modules/test_parser/Makefile | 4 +-
src/test/modules/test_predtest/Makefile | 4 +-
src/test/modules/test_rbtree/Makefile | 4 +-
src/test/modules/test_rls_hooks/Makefile | 4 +-
src/test/modules/test_shm_mq/Makefile | 6 +-
src/timezone/Makefile | 9 +-
src/tools/findoidjoins/Makefile | 3 +-
src/tools/ifaddrs/Makefile | 3 +-
147 files changed, 1271 insertions(+), 302 deletions(-)

Browse pgsql-committers by date

  From Date Subject
Next Message Andres Freund 2019-11-06 00:39:30 pgsql: Make StringInfo available to frontend code.
Previous Message Tom Lane 2019-11-05 19:29:36 pgsql: Avoid logging complaints about abandoned connections when using