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

9 files changed, 30 insertions, 9 deletions

diff --git a/src/test/isolation/Makefile b/src/test/isolation/Makefile
index dc22e5ca9d4..da5e088bdde 100644
--- a/src/test/isolation/Makefile
+++ b/src/test/isolation/Makefile
@@ -11,7 +11,10 @@ include $(top_builddir)/src/Makefile.global
 
 override CPPFLAGS := -I$(srcdir) -I$(libpq_srcdir) -I$(srcdir)/../regress $(CPPFLAGS)
 
-OBJS =  specparse.o isolationtester.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	isolationtester.o \
+	specparse.o
 
 all: isolationtester$(X) pg_isolation_regress$(X)
 
diff --git a/src/test/modules/test_bloomfilter/Makefile b/src/test/modules/test_bloomfilter/Makefile
index 808c9314d4c..c8b7890d201 100644
--- a/src/test/modules/test_bloomfilter/Makefile
+++ b/src/test/modules/test_bloomfilter/Makefile
@@ -1,7 +1,9 @@
 # src/test/modules/test_bloomfilter/Makefile
 
 MODULE_big = test_bloomfilter
-OBJS = test_bloomfilter.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	test_bloomfilter.o
 PGFILEDESC = "test_bloomfilter - test code for Bloom filter library"
 
 EXTENSION = test_bloomfilter
diff --git a/src/test/modules/test_ginpostinglist/Makefile b/src/test/modules/test_ginpostinglist/Makefile
index 4d45ac999af..51b941b6a77 100644
--- a/src/test/modules/test_ginpostinglist/Makefile
+++ b/src/test/modules/test_ginpostinglist/Makefile
@@ -1,7 +1,9 @@
 # src/test/modules/test_ginpostinglist/Makefile
 
 MODULE_big = test_ginpostinglist
-OBJS = test_ginpostinglist.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	test_ginpostinglist.o
 PGFILEDESC = "test_ginpostinglist - test code for src/backend/access/gin//ginpostinglist.c"
 
 EXTENSION = test_ginpostinglist
diff --git a/src/test/modules/test_integerset/Makefile b/src/test/modules/test_integerset/Makefile
index 3b7c4999d6f..799c17cd1bd 100644
--- a/src/test/modules/test_integerset/Makefile
+++ b/src/test/modules/test_integerset/Makefile
@@ -1,7 +1,9 @@
 # src/test/modules/test_integerset/Makefile
 
 MODULE_big = test_integerset
-OBJS = test_integerset.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	test_integerset.o
 PGFILEDESC = "test_integerset - test code for src/backend/lib/integerset.c"
 
 EXTENSION = test_integerset
diff --git a/src/test/modules/test_parser/Makefile b/src/test/modules/test_parser/Makefile
index 0c755aac73b..71eb38de6db 100644
--- a/src/test/modules/test_parser/Makefile
+++ b/src/test/modules/test_parser/Makefile
@@ -1,7 +1,9 @@
 # src/test/modules/test_parser/Makefile
 
 MODULE_big = test_parser
-OBJS = test_parser.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	test_parser.o
 PGFILEDESC = "test_parser - example of a custom parser for full-text search"
 
 EXTENSION = test_parser
diff --git a/src/test/modules/test_predtest/Makefile b/src/test/modules/test_predtest/Makefile
index 1b50fa31a4e..a235e2aac9c 100644
--- a/src/test/modules/test_predtest/Makefile
+++ b/src/test/modules/test_predtest/Makefile
@@ -1,7 +1,9 @@
 # src/test/modules/test_predtest/Makefile
 
 MODULE_big = test_predtest
-OBJS = test_predtest.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	test_predtest.o
 PGFILEDESC = "test_predtest - test code for optimizer/util/predtest.c"
 
 EXTENSION = test_predtest
diff --git a/src/test/modules/test_rbtree/Makefile b/src/test/modules/test_rbtree/Makefile
index a4184b4d2e5..faf376ae251 100644
--- a/src/test/modules/test_rbtree/Makefile
+++ b/src/test/modules/test_rbtree/Makefile
@@ -1,7 +1,9 @@
 # src/test/modules/test_rbtree/Makefile
 
 MODULE_big = test_rbtree
-OBJS = test_rbtree.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	test_rbtree.o
 PGFILEDESC = "test_rbtree - test code for red-black tree library"
 
 EXTENSION = test_rbtree
diff --git a/src/test/modules/test_rls_hooks/Makefile b/src/test/modules/test_rls_hooks/Makefile
index 284fdaf0958..a4f7d855c0c 100644
--- a/src/test/modules/test_rls_hooks/Makefile
+++ b/src/test/modules/test_rls_hooks/Makefile
@@ -1,7 +1,9 @@
 # src/test/modules/test_rls_hooks/Makefile
 
 MODULE_big = test_rls_hooks
-OBJS = test_rls_hooks.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	test_rls_hooks.o
 PGFILEDESC = "test_rls_hooks - example use of RLS hooks"
 
 EXTENSION = test_rls_hooks
diff --git a/src/test/modules/test_shm_mq/Makefile b/src/test/modules/test_shm_mq/Makefile
index 11c4e357202..1171ced3e4d 100644
--- a/src/test/modules/test_shm_mq/Makefile
+++ b/src/test/modules/test_shm_mq/Makefile
@@ -1,7 +1,11 @@
 # src/test/modules/test_shm_mq/Makefile
 
 MODULE_big = test_shm_mq
-OBJS = test.o setup.o worker.o $(WIN32RES)
+OBJS = \
+	$(WIN32RES) \
+	setup.o \
+	test.o \
+	worker.o
 PGFILEDESC = "test_shm_mq - example use of shared memory message queue"
 
 EXTENSION = test_shm_mq