Re: RFC: split OBJS lines to one object per line

Andres Freund <andres@anarazel.de>

From: Andres Freund <andres@anarazel.de>
To: Tom Lane <tgl@sss.pgh.pa.us>, Peter Geoghegan <pg@bowt.ie>
Cc: pgsql-hackers@postgresql.org
Date: 2019-11-05T22:47:55Z
Lists: pgsql-hackers
Hi,

On 2019-10-29 23:32:09 -0700, Andres Freund wrote:
> On 2019-10-29 16:31:11 -0400, Tom Lane wrote:
> > Andres Freund <andres@anarazel.de> writes:
> > > one of the most frequent conflicts I see is that two patches add files
> > > to OBJS (or one of its other spellings), and there are conflicts because
> > > another file has been added.
> > > ...
> > > Now, obviously these types of conflicts are easy enough to resolve, but
> > > it's still annoying.  It seems that this would be substantially less
> > > often a problem if we just split such lines to one file per
> > > line.
> > 
> > We did something similar not too long ago in configure.in (bfa6c5a0c),
> > and it seems to have helped.  +1
> 
> Cool. Any opinion on whether to got for
> 
> OBJS = \
> 	dest.o \
> 	fastpath.o \
> ...
> 
> or
> 
> OBJS = dest.o \
> 	fastpath.o \
> ...
> 
> I'm mildly inclined to go for the former.

Pushed a patch going with the former. Let's see what the buildfarm
says...

Greetings,

Andres Freund



Commits

  1. Fix some OBJS lists in two Makefiles to be ordered alphabetically

  2. Split all OBJS style lines in makefiles into one-line-per-entry style.