summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorWayne Davison <wayne@opencoder.net>2021-02-25 09:13:52 -0800
committerWayne Davison <wayne@opencoder.net>2021-02-25 09:14:33 -0800
commitd3085f7add38a5cf833a0b31cb0637ff46c80f8d (patch)
tree380d64ba1ae5df88729faba6a4aa0679a147454b /Makefile.in
parent1da64c37e85e08c73e73debc8f49af0b0cca6a51 (diff)
downloadrsync-d3085f7add38a5cf833a0b31cb0637ff46c80f8d.tar.gz
Rename util.c to util1.c
Fixes an issue where the Makefile's glob of *.c could sort util.c & util2.c in an order that depends on the current collation setting.
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index 7f6fc7bf..67190489 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,7 +41,7 @@ LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o lib/md5.o \
zlib_OBJS=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o
OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
- util.o util2.o main.o checksum.o match.o syscall.o log.o backup.o delete.o
+ util1.o util2.o main.o checksum.o match.o syscall.o log.o backup.o delete.o
OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o hashtable.o \
usage.o fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
OBJS3=progress.o pipe.o @ASM@
@@ -159,7 +159,7 @@ TRIMSLASH_OBJ = trimslash.o syscall.o t_stub.o lib/compat.o lib/snprintf.o
trimslash$(EXEEXT): $(TRIMSLASH_OBJ)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TRIMSLASH_OBJ) $(LIBS)
-T_UNSAFE_OBJ = t_unsafe.o syscall.o util.o util2.o t_stub.o lib/compat.o lib/snprintf.o lib/wildmatch.o
+T_UNSAFE_OBJ = t_unsafe.o syscall.o util1.o util2.o t_stub.o lib/compat.o lib/snprintf.o lib/wildmatch.o
t_unsafe$(EXEEXT): $(T_UNSAFE_OBJ)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_UNSAFE_OBJ) $(LIBS)