Skip to content

Commit 24b55cd

Browse files
committed
Reorder some object files in makefiles
This restores some once-intended alphabetical orders and makes the lists consistent between the different build systems.
1 parent adb5c32 commit 24b55cd

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/bin/pg_basebackup/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ BBOBJS = \
4444
bbstreamer_gzip.o \
4545
bbstreamer_inject.o \
4646
bbstreamer_lz4.o \
47-
bbstreamer_zstd.o \
48-
bbstreamer_tar.o
47+
bbstreamer_tar.o \
48+
bbstreamer_zstd.o
4949

5050
all: pg_basebackup pg_receivewal pg_recvlogical
5151

src/common/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ OBJS_COMMON = \
8383

8484
ifeq ($(with_ssl),openssl)
8585
OBJS_COMMON += \
86-
protocol_openssl.o \
8786
cryptohash_openssl.o \
88-
hmac_openssl.o
87+
hmac_openssl.o \
88+
protocol_openssl.o
8989
else
9090
OBJS_COMMON += \
9191
cryptohash.o \

src/tools/msvc/Mkvcbuild.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,8 +404,8 @@ sub mkvcbuild
404404
$pgbasebackup->AddFile('src/bin/pg_basebackup/bbstreamer_gzip.c');
405405
$pgbasebackup->AddFile('src/bin/pg_basebackup/bbstreamer_inject.c');
406406
$pgbasebackup->AddFile('src/bin/pg_basebackup/bbstreamer_lz4.c');
407-
$pgbasebackup->AddFile('src/bin/pg_basebackup/bbstreamer_zstd.c');
408407
$pgbasebackup->AddFile('src/bin/pg_basebackup/bbstreamer_tar.c');
408+
$pgbasebackup->AddFile('src/bin/pg_basebackup/bbstreamer_zstd.c');
409409
$pgbasebackup->AddLibrary('ws2_32.lib');
410410

411411
my $pgreceivewal = AddSimpleFrontend('pg_basebackup', 1);

0 commit comments

Comments
 (0)