From 01368e5d9da77099b38aac527b01b85cc7869b25 Mon Sep 17 00:00:00 2001
From: Andres Freund
Date: Tue, 5 Nov 2019 14:41:07 -0800
Subject: 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
---
 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 +++++++++++++++---
 5 files changed, 55 insertions(+), 12 deletions(-)

(limited to 'src/backend/optimizer')

diff --git a/src/backend/optimizer/geqo/Makefile b/src/backend/optimizer/geqo/Makefile
index 3be7d7d450..1978c14a0a 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 6864a62132..1e199ff66f 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 88a9f7ff8c..80ef162e48 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 86301bfbd3..5733df4573 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 bb33e2cc7c..4fb115cb11 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
-- 
cgit v1.2.3