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 --- contrib/jsonb_plperl/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'contrib/jsonb_plperl') diff --git a/contrib/jsonb_plperl/Makefile b/contrib/jsonb_plperl/Makefile index b43c8ed97bd..ba9480e819b 100644 --- a/contrib/jsonb_plperl/Makefile +++ b/contrib/jsonb_plperl/Makefile @@ -1,7 +1,9 @@ # contrib/jsonb_plperl/Makefile MODULE_big = jsonb_plperl -OBJS = jsonb_plperl.o $(WIN32RES) +OBJS = \ + $(WIN32RES) \ + jsonb_plperl.o PGFILEDESC = "jsonb_plperl - jsonb transform for plperl" PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plperl -- cgit v1.2.3