Reorder some object files in makefiles

This restores some once-intended alphabetical orders and makes the
lists consistent between the different build systems.
pull/111/head
Peter Eisentraut 3 years ago
parent adb5c32eb5
commit 24b55cd949
  1. 4
      src/bin/pg_basebackup/Makefile
  2. 4
      src/common/Makefile
  3. 2
      src/tools/msvc/Mkvcbuild.pm

@ -44,8 +44,8 @@ BBOBJS = \
bbstreamer_gzip.o \ bbstreamer_gzip.o \
bbstreamer_inject.o \ bbstreamer_inject.o \
bbstreamer_lz4.o \ bbstreamer_lz4.o \
bbstreamer_zstd.o \ bbstreamer_tar.o \
bbstreamer_tar.o bbstreamer_zstd.o
all: pg_basebackup pg_receivewal pg_recvlogical all: pg_basebackup pg_receivewal pg_recvlogical

@ -83,9 +83,9 @@ OBJS_COMMON = \
ifeq ($(with_ssl),openssl) ifeq ($(with_ssl),openssl)
OBJS_COMMON += \ OBJS_COMMON += \
protocol_openssl.o \
cryptohash_openssl.o \ cryptohash_openssl.o \
hmac_openssl.o hmac_openssl.o \
protocol_openssl.o
else else
OBJS_COMMON += \ OBJS_COMMON += \
cryptohash.o \ cryptohash.o \

@ -404,8 +404,8 @@ sub mkvcbuild
$pgbasebackup->AddFile('src/bin/pg_basebackup/bbstreamer_gzip.c'); $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_inject.c');
$pgbasebackup->AddFile('src/bin/pg_basebackup/bbstreamer_lz4.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_tar.c');
$pgbasebackup->AddFile('src/bin/pg_basebackup/bbstreamer_zstd.c');
$pgbasebackup->AddLibrary('ws2_32.lib'); $pgbasebackup->AddLibrary('ws2_32.lib');
my $pgreceivewal = AddSimpleFrontend('pg_basebackup', 1); my $pgreceivewal = AddSimpleFrontend('pg_basebackup', 1);

Loading…
Cancel
Save