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/interfaces/libpq/Makefile | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

(limited to 'src/interfaces/libpq')

diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index 2fad1bc44c3..3d56774fe64 100644
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -27,19 +27,36 @@ endif
 # The MSVC build system scrapes OBJS from this file.  If you change any of
 # the conditional additions of files to OBJS, update Mkvcbuild.pm to match.
 
-OBJS=	fe-auth.o fe-auth-scram.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
-	fe-protocol2.o fe-protocol3.o pqexpbuffer.o fe-secure.o \
-	legacy-pqsignal.o libpq-events.o
+OBJS = \
+	fe-auth-scram.o \
+	fe-connect.o \
+	fe-exec.o \
+	fe-lobj.o \
+	fe-misc.o \
+	fe-print.o \
+	fe-protocol2.o \
+	fe-protocol3.o \
+	fe-secure.o \
+	legacy-pqsignal.o \
+	libpq-events.o \
+	pqexpbuffer.o \
+	fe-auth.o
 
 # src/backend/utils/mb
-OBJS += encnames.o wchar.o
+OBJS += \
+	encnames.o \
+	wchar.o
 
 ifeq ($(with_openssl),yes)
-OBJS += fe-secure-openssl.o fe-secure-common.o
+OBJS += \
+	fe-secure-common.o \
+	fe-secure-openssl.o
 endif
 
 ifeq ($(with_gssapi),yes)
-OBJS += fe-gssapi-common.o fe-secure-gssapi.o
+OBJS += \
+	fe-gssapi-common.o \
+	fe-secure-gssapi.o
 endif
 
 ifeq ($(PORTNAME), cygwin)
@@ -47,7 +64,9 @@ override shlib = cyg$(NAME)$(DLSUFFIX)
 endif
 
 ifeq ($(PORTNAME), win32)
-OBJS += win32.o libpqrc.o
+OBJS += \
+	libpqrc.o \
+	win32.o
 
 libpqrc.o: libpq.rc
 	$(WINDRES) -i $< -o $@
-- 
cgit v1.2.3