From 24b55cd949a11b712927acf2557683976ee149ac Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Wed, 28 Dec 2022 14:20:53 +0100 Subject: [PATCH] Reorder some object files in makefiles This restores some once-intended alphabetical orders and makes the lists consistent between the different build systems. --- src/bin/pg_basebackup/Makefile | 4 ++-- src/common/Makefile | 4 ++-- src/tools/msvc/Mkvcbuild.pm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bin/pg_basebackup/Makefile b/src/bin/pg_basebackup/Makefile index 0035ebcef54..a16106eec2d 100644 --- a/src/bin/pg_basebackup/Makefile +++ b/src/bin/pg_basebackup/Makefile @@ -44,8 +44,8 @@ BBOBJS = \ bbstreamer_gzip.o \ bbstreamer_inject.o \ bbstreamer_lz4.o \ - bbstreamer_zstd.o \ - bbstreamer_tar.o + bbstreamer_tar.o \ + bbstreamer_zstd.o all: pg_basebackup pg_receivewal pg_recvlogical diff --git a/src/common/Makefile b/src/common/Makefile index e9af7346c9c..898701fae1c 100644 --- a/src/common/Makefile +++ b/src/common/Makefile @@ -83,9 +83,9 @@ OBJS_COMMON = \ ifeq ($(with_ssl),openssl) OBJS_COMMON += \ - protocol_openssl.o \ cryptohash_openssl.o \ - hmac_openssl.o + hmac_openssl.o \ + protocol_openssl.o else OBJS_COMMON += \ cryptohash.o \ diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index 7e52e9ad0ae..7b855d51f0d 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -404,8 +404,8 @@ sub mkvcbuild $pgbasebackup->AddFile('src/bin/pg_basebackup/bbstreamer_gzip.c'); $pgbasebackup->AddFile('src/bin/pg_basebackup/bbstreamer_inject.c'); $pgbasebackup->AddFile('src/bin/pg_basebackup/bbstreamer_lz4.c'); - $pgbasebackup->AddFile('src/bin/pg_basebackup/bbstreamer_zstd.c'); $pgbasebackup->AddFile('src/bin/pg_basebackup/bbstreamer_tar.c'); + $pgbasebackup->AddFile('src/bin/pg_basebackup/bbstreamer_zstd.c'); $pgbasebackup->AddLibrary('ws2_32.lib'); my $pgreceivewal = AddSimpleFrontend('pg_basebackup', 1);