aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils/cache
diff options
context:
space:
mode:
authorAndres Freund <andres@anarazel.de>2019-11-05 14:41:07 -0800
committerAndres Freund <andres@anarazel.de>2019-11-05 14:41:07 -0800
commit01368e5d9da77099b38aac527b01b85cc7869b25 (patch)
treed624590ddf92466c262c86007b221d2d274bf602 /src/backend/utils/cache
parent66c61c81b90c68db84d422092fbbf8a1a82ee09a (diff)
downloadpostgresql-01368e5d9da77099b38aac527b01b85cc7869b25.tar.gz
postgresql-01368e5d9da77099b38aac527b01b85cc7869b25.zip
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
Diffstat (limited to 'src/backend/utils/cache')
-rw-r--r--src/backend/utils/cache/Makefile18
1 files changed, 15 insertions, 3 deletions
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