diff options
| author | Andres Freund | 2019-11-05 22:41:07 +0000 |
|---|---|---|
| committer | Andres Freund | 2019-11-05 22:41:07 +0000 |
| commit | 01368e5d9da77099b38aac527b01b85cc7869b25 (patch) | |
| tree | d624590ddf92466c262c86007b221d2d274bf602 /src/common | |
| parent | 66c61c81b90c68db84d422092fbbf8a1a82ee09a (diff) | |
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
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/Makefile | 37 |
1 files changed, 30 insertions, 7 deletions
diff --git a/src/common/Makefile b/src/common/Makefile index 2f22b9b101d..4fd487a4ec4 100644 --- a/src/common/Makefile +++ b/src/common/Makefile @@ -46,11 +46,30 @@ LIBS += $(PTHREAD_LIBS) # If you add objects here, see also src/tools/msvc/Mkvcbuild.pm -OBJS_COMMON = base64.o config_info.o controldata_utils.o d2s.o exec.o f2s.o \ - file_perm.o ip.o keywords.o kwlookup.o link-canary.o md5.o \ - pg_lzcompress.o pgfnames.o psprintf.o relpath.o \ - rmtree.o saslprep.o scram-common.o string.o unicode_norm.o \ - username.o wait_error.o +OBJS_COMMON = \ + base64.o \ + config_info.o \ + controldata_utils.o \ + d2s.o \ + exec.o \ + f2s.o \ + file_perm.o \ + ip.o \ + keywords.o \ + kwlookup.o \ + link-canary.o \ + md5.o \ + pg_lzcompress.o \ + pgfnames.o \ + psprintf.o \ + relpath.o \ + rmtree.o \ + saslprep.o \ + scram-common.o \ + string.o \ + unicode_norm.o \ + username.o \ + wait_error.o ifeq ($(with_openssl),yes) OBJS_COMMON += sha2_openssl.o @@ -60,8 +79,12 @@ endif # A few files are currently only built for frontend, not server # (Mkvcbuild.pm has a copy of this list, too) -OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o file_utils.o \ - logging.o restricted_token.o +OBJS_FRONTEND = \ + $(OBJS_COMMON) \ + fe_memutils.o \ + file_utils.o \ + logging.o \ + restricted_token.o # foo.o, foo_shlib.o, and foo_srv.o are all built from foo.c OBJS_SHLIB = $(OBJS_FRONTEND:%.o=%_shlib.o) |