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/backend/port | |
| 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/[email protected]
Diffstat (limited to 'src/backend/port')
| -rw-r--r-- | src/backend/port/Makefile | 6 | ||||
| -rw-r--r-- | src/backend/port/win32/Makefile | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/backend/port/Makefile b/src/backend/port/Makefile index f4120bec55f..2d00b4f05a7 100644 --- a/src/backend/port/Makefile +++ b/src/backend/port/Makefile @@ -21,7 +21,11 @@ subdir = src/backend/port top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -OBJS = atomics.o pg_sema.o pg_shmem.o $(TAS) +OBJS = \ + $(TAS) \ + atomics.o \ + pg_sema.o \ + pg_shmem.o ifeq ($(PORTNAME), win32) SUBDIRS += win32 diff --git a/src/backend/port/win32/Makefile b/src/backend/port/win32/Makefile index 833c9e06dc6..90126f634ac 100644 --- a/src/backend/port/win32/Makefile +++ b/src/backend/port/win32/Makefile @@ -12,7 +12,10 @@ subdir = src/backend/port/win32 top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -OBJS = timer.o socket.o signal.o +OBJS = \ + signal.o \ + socket.o \ + timer.o ifeq ($(have_win32_dbghelp), yes) OBJS += crashdump.o endif |