mirror of
https://github.com/postgres/postgres.git
synced 2025-11-10 17:42:29 +03:00
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
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user