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/tools/findoidjoins/Makefile | 3 ++-
 src/tools/ifaddrs/Makefile      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/findoidjoins/Makefile b/src/tools/findoidjoins/Makefile
index b4238e49726..2682ad1e9b7 100644
--- a/src/tools/findoidjoins/Makefile
+++ b/src/tools/findoidjoins/Makefile
@@ -15,7 +15,8 @@ include $(top_builddir)/src/Makefile.global
 override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
 LDFLAGS_INTERNAL += $(libpq_pgport)
 
-OBJS= findoidjoins.o
+OBJS = \
+	findoidjoins.o
 
 all: findoidjoins
 
diff --git a/src/tools/ifaddrs/Makefile b/src/tools/ifaddrs/Makefile
index 763f913f2fe..461de416919 100644
--- a/src/tools/ifaddrs/Makefile
+++ b/src/tools/ifaddrs/Makefile
@@ -16,7 +16,8 @@ libpq_backend_dir = $(top_builddir)/src/backend/libpq
 
 override CPPFLAGS := -I$(libpq_backend_dir) $(CPPFLAGS)
 
-OBJS = test_ifaddrs.o
+OBJS = \
+	test_ifaddrs.o
 
 all: test_ifaddrs
 
-- 
cgit v1.2.3