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/jit | |
| 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/backend/jit')
| -rw-r--r-- | src/backend/jit/Makefile | 3 | ||||
| -rw-r--r-- | src/backend/jit/llvm/Makefile | 14 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/backend/jit/Makefile b/src/backend/jit/Makefile index cdb9009ec1b..a895ebac5fb 100644 --- a/src/backend/jit/Makefile +++ b/src/backend/jit/Makefile @@ -17,6 +17,7 @@ include $(top_builddir)/src/Makefile.global override CPPFLAGS += -DDLSUFFIX=\"$(DLSUFFIX)\" -OBJS = jit.o +OBJS = \ + jit.o include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/jit/llvm/Makefile b/src/backend/jit/llvm/Makefile index 17ff0691f37..0268bd46d5c 100644 --- a/src/backend/jit/llvm/Makefile +++ b/src/backend/jit/llvm/Makefile @@ -33,12 +33,20 @@ SHLIB_LINK += $(LLVM_LIBS) # loadable modules. override COMPILER = $(CXX) $(CFLAGS) -OBJS=$(WIN32RES) +OBJS = \ + $(WIN32RES) # Infrastructure -OBJS += llvmjit.o llvmjit_error.o llvmjit_inline.o llvmjit_wrap.o +OBJS += \ + llvmjit.o \ + llvmjit_error.o \ + llvmjit_inline.o \ + llvmjit_wrap.o + # Code generation -OBJS += llvmjit_expr.o llvmjit_deform.o +OBJS += \ + llvmjit_deform.o \ + llvmjit_expr.o all: all-shared-lib llvmjit_types.bc |