Separate makefile object list on each line for less merge conflicts in the future.

diff --git a/Makefile.in b/Makefile.in
index 1063fa9636a85b6ecf979631e951eb677d5eaa0d..fb91bf7ec551610a934c71b80ea0ce81064da42e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -71,12 +71,60 @@ mandir = ${prefix}/share/man
 man3dir = ${mandir}/man3
 pkgconfigdir = ${libdir}/pkgconfig
 
-OBJZ = adler32.o compare258.o compress.o crc32.o deflate.o deflate_fast.o deflate_medium.o deflate_slow.o functable.o infback.o inffast.o inflate.o inftrees.o insert_string.o trees.o uncompr.o zutil.o $(ARCH_STATIC_OBJS)
-OBJG = gzclose.o gzlib.o gzread.o gzwrite.o
+OBJZ = \
+       adler32.o \
+       compare258.o \
+       compress.o \
+       crc32.o \
+       deflate.o \
+       deflate_fast.o \
+       deflate_medium.o \
+       deflate_slow.o \
+       functable.o \
+       infback.o \
+       inffast.o \
+       inflate.o \
+       inftrees.o \
+       insert_string.o \
+       trees.o \
+       uncompr.o \
+       zutil.o \
+       $(ARCH_STATIC_OBJS)
+
+OBJG = \
+       gzclose.o \
+       gzlib.o \
+       gzread.o \
+       gzwrite.o
+
 OBJC = $(OBJZ) $(OBJG)
 
-PIC_OBJZ = adler32.lo compare258.lo compress.lo crc32.lo deflate.lo deflate_fast.lo deflate_medium.lo deflate_slow.lo functable.lo infback.lo inffast.lo inflate.lo inftrees.lo insert_string.lo trees.lo uncompr.lo zutil.lo $(ARCH_SHARED_OBJS)
-PIC_OBJG = gzclose.lo gzlib.lo gzread.lo gzwrite.lo
+PIC_OBJZ = \
+       adler32.lo \
+       compare258.lo \
+       compress.lo \
+       crc32.lo \
+       deflate.lo \
+       deflate_fast.lo \
+       deflate_medium.lo \
+       deflate_slow.lo \
+       functable.lo \
+       infback.lo \
+       inffast.lo \
+       inflate.lo \
+       inftrees.lo \
+       insert_string.lo \
+       trees.lo \
+       uncompr.lo \
+       zutil.lo \
+       $(ARCH_SHARED_OBJS)
+
+PIC_OBJG = \
+       gzclose.lo \
+       gzlib.lo \
+       gzread.lo \
+       gzwrite.lo
+
 PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG)
 
 OBJS = $(OBJC)

diff --git a/arch/arm/Makefile.in b/arch/arm/Makefile.in
index 9a25482ce4bfac6ace9e2ba41e9e09a1c0f28627..486cdfd52cfcef0b346c7354dec5e02433b93d5c 100644 (file)
--- a/arch/arm/Makefile.in
+++ b/arch/arm/Makefile.in
@@ -12,7 +12,12 @@ SRCDIR=.
 SRCTOP=../..
 TOPDIR=$(SRCTOP)
 
-all: adler32_neon.o adler32_neon.lo armfeature.o armfeature.lo crc32_acle.o crc32_acle.lo slide_neon.o slide_neon.lo insert_string_acle.o insert_string_acle.lo
+all: \
+       adler32_neon.o adler32_neon.lo \
+       armfeature.o armfeature.lo \
+       crc32_acle.o crc32_acle.lo \
+       slide_neon.o slide_neon.lo \
+       insert_string_acle.o insert_string_acle.lo
 
 adler32_neon.o:
        $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/adler32_neon.c

diff --git a/arch/x86/Makefile.in b/arch/x86/Makefile.in
index c119591073dad55df3bb05e1da6df9b53ad108d6..b7b923fd52236232f132016defa7d2daf657b6a4 100644 (file)
--- a/arch/x86/Makefile.in
+++ b/arch/x86/Makefile.in
@@ -17,7 +17,15 @@ SRCDIR=.
 SRCTOP=../..
 TOPDIR=$(SRCTOP)
 
-all: x86.o x86.lo compare258_avx.o compare258_avx.lo compare258_sse.o compare258_sse.lo deflate_quick.o deflate_quick.lo insert_string_sse.o insert_string_sse.lo crc_folding.o crc_folding.lo slide_avx.o slide_avx.lo slide_sse.o slide_sse.lo
+all: \
+       x86.o x86.lo \
+       compare258_avx.o compare258_avx.lo \
+       compare258_sse.o compare258_sse.lo \
+       deflate_quick.o deflate_quick.lo \
+       insert_string_sse.o insert_string_sse.lo \
+       crc_folding.o crc_folding.lo \
+       slide_avx.o slide_avx.lo
+       slide_sse.o slide_sse.lo
 
 x86.o:
        $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/x86.c

diff --git a/win32/Makefile.a64 b/win32/Makefile.a64
index ece0150725852aaa94600803a08941af560cd83e..43c978cd2fc8ccdb09fe46ae638f759f9b2b5422 100644 (file)
--- a/win32/Makefile.a64
+++ b/win32/Makefile.a64
@@ -33,10 +33,26 @@ RESFILE = zlib1.res
 WITH_GZFILEOP =
 SUFFIX =
 
-OBJS = adler32.obj armfeature.obj compress.obj crc32.obj deflate.obj deflate_fast.obj deflate_slow.obj \
-       deflate_medium.obj \
-       functable.obj infback.obj inflate.obj inftrees.obj inffast.obj insert_string.obj \
-       trees.obj uncompr.obj zutil.obj fill_window_arm.obj
+OBJS = \
+       adler32.obj \
+       armfeature.obj \
+       compress.obj \
+       crc32.obj \
+       deflate.obj \
+       deflate_fast.obj \
+       deflate_slow.obj \
+       deflate_medium.obj \
+       functable.obj \
+       infback.obj \
+       inflate.obj \
+       inftrees.obj \
+       inffast.obj \
+       insert_string.obj \
+       trees.obj \
+       uncompr.obj \
+       zutil.obj \
+       fill_window_arm.obj
+
 !if "$(WITH_GZFILEOP)" != ""
 WFLAGS = $(WFLAGS) -DWITH_GZFILEOP
 OBJS = $(OBJS) gzclose.obj gzlib.obj gzread.obj gzwrite.obj

diff --git a/win32/Makefile.arm b/win32/Makefile.arm
index 2e64886c5d9d432f508f432443e6cff997ffa51b..df6ffc4dba6810e009359516e337e85000e83c29 100644 (file)
--- a/win32/Makefile.arm
+++ b/win32/Makefile.arm
@@ -37,10 +37,26 @@ WITH_VFPV3 =
 NEON_ARCH = /arch:VFPv4
 SUFFIX =
 
-OBJS = adler32.obj armfeature.obj compress.obj crc32.obj deflate.obj deflate_fast.obj deflate_slow.obj \
-       deflate_medium.obj \
-       functable.obj infback.obj inflate.obj inftrees.obj inffast.obj insert_string.obj \
-       trees.obj uncompr.obj zutil.obj fill_window_arm.obj
+OBJS = \
+       adler32.obj \
+       armfeature.obj \
+       compress.obj \
+       crc32.obj \
+       deflate.obj \
+       deflate_fast.obj \
+       deflate_slow.obj \
+       deflate_medium.obj \
+       functable.obj \
+       infback.obj \
+       inflate.obj \
+       inftrees.obj \
+       inffast.obj \
+       insert_string.obj \
+       trees.obj \
+       uncompr.obj \
+       zutil.obj \
+       fill_window_arm.obj
+
 !if "$(WITH_GZFILEOP)" != ""
 WFLAGS = $(WFLAGS) -DWITH_GZFILEOP
 OBJS = $(OBJS) gzclose.obj gzlib.obj gzread.obj gzwrite.obj

diff --git a/win32/Makefile.msc b/win32/Makefile.msc
index e12bc592a53056645d19e6cc281f15f00d8fd1bb..e7beedac6666958fdccc8877e47f96c17850fb10 100644 (file)
--- a/win32/Makefile.msc
+++ b/win32/Makefile.msc
@@ -34,11 +34,33 @@ WITH_GZFILEOP =
 ZLIB_COMPAT =
 SUFFIX =
 
-OBJS = adler32.obj compare258.obj compare258_avx.obj compare258_sse.obj compress.obj crc32.obj \
-       deflate.obj deflate_fast.obj deflate_quick.obj deflate_slow.obj deflate_medium.obj \
-       functable.obj infback.obj inflate.obj inftrees.obj inffast.obj insert_string.obj \
-       slide_avx.obj slide_sse.obj trees.obj uncompr.obj zutil.obj \
-       x86.obj insert_string_sse.obj crc_folding.obj
+OBJS = \
+       adler32.obj \
+       compare258.obj \
+       compare258_avx.obj \
+       compare258_sse.obj \
+       compress.obj \
+       crc32.obj \
+       crc_folding.obj \
+       deflate.obj \
+       deflate_fast.obj \
+       deflate_quick.obj \
+       deflate_slow.obj \
+       deflate_medium.obj \
+       functable.obj \
+       infback.obj \
+       inflate.obj \
+       inftrees.obj \
+       inffast.obj \
+       insert_string.obj \
+       insert_string_sse.obj \
+       slide_avx.obj \
+       slide_sse.obj \
+       trees.obj \
+       uncompr.obj \
+       zutil.obj \
+       x86.obj
+
 !if "$(ZLIB_COMPAT)" != ""
 WITH_GZFILEOP = yes
 WFLAGS = $(WFLAGS) -DZLIB_COMPAT