1
0
mirror of https://github.com/postgres/postgres.git synced 2025-09-06 13:46:51 +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:
Andres Freund
2019-11-05 14:41:07 -08:00
parent 66c61c81b9
commit 01368e5d9d
147 changed files with 1271 additions and 302 deletions

View File

@@ -12,6 +12,11 @@ subdir = src/backend/storage/buffer
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = buf_table.o buf_init.o bufmgr.o freelist.o localbuf.o
OBJS = \
buf_init.o \
buf_table.o \
bufmgr.o \
freelist.o \
localbuf.o
include $(top_srcdir)/src/backend/common.mk

View File

@@ -12,6 +12,11 @@ subdir = src/backend/storage/file
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = fd.o buffile.o copydir.o reinit.o sharedfileset.o
OBJS = \
buffile.o \
copydir.o \
fd.o \
reinit.o \
sharedfileset.o
include $(top_srcdir)/src/backend/common.mk

View File

@@ -12,6 +12,9 @@ subdir = src/backend/storage/freespace
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = freespace.o fsmpage.o indexfsm.o
OBJS = \
freespace.o \
fsmpage.o \
indexfsm.o
include $(top_srcdir)/src/backend/common.mk

View File

@@ -8,8 +8,23 @@ subdir = src/backend/storage/ipc
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = barrier.o dsm_impl.o dsm.o ipc.o ipci.o latch.o pmsignal.o procarray.o \
procsignal.o shmem.o shmqueue.o shm_mq.o shm_toc.o signalfuncs.o \
sinval.o sinvaladt.o standby.o
OBJS = \
barrier.o \
dsm.o \
dsm_impl.o \
ipc.o \
ipci.o \
latch.o \
pmsignal.o \
procarray.o \
procsignal.o \
shm_mq.o \
shm_toc.o \
shmem.o \
shmqueue.o \
signalfuncs.o \
sinval.o \
sinvaladt.o \
standby.o
include $(top_srcdir)/src/backend/common.mk

View File

@@ -12,6 +12,7 @@ subdir = src/backend/storage/large_object
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = inv_api.o
OBJS = \
inv_api.o
include $(top_srcdir)/src/backend/common.mk

View File

@@ -12,8 +12,17 @@ subdir = src/backend/storage/lmgr
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = lmgr.o lock.o proc.o deadlock.o lwlock.o lwlocknames.o spin.o \
s_lock.o predicate.o condition_variable.o
OBJS = \
condition_variable.o \
deadlock.o \
lmgr.o \
lock.o \
lwlock.o \
lwlocknames.o \
predicate.o \
proc.o \
s_lock.o \
spin.o
include $(top_srcdir)/src/backend/common.mk

View File

@@ -12,7 +12,10 @@ subdir = src/backend/storage/page
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = bufpage.o checksum.o itemptr.o
OBJS = \
bufpage.o \
checksum.o \
itemptr.o
include $(top_srcdir)/src/backend/common.mk

View File

@@ -12,6 +12,8 @@ subdir = src/backend/storage/smgr
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = md.o smgr.o
OBJS = \
md.o \
smgr.o
include $(top_srcdir)/src/backend/common.mk

View File

@@ -12,6 +12,7 @@ subdir = src/backend/storage/sync
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
OBJS = sync.o
OBJS = \
sync.o
include $(top_srcdir)/src/backend/common.mk