X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9c3c30e5c7cdeaa9fb658f8c1e649e04bb491f55..e4fdf1debee8313a767c94a42f5181df9ca881e0:/Makefile.in diff --git a/Makefile.in b/Makefile.in index 11d1a74f..bd0a6e77 100644 --- a/Makefile.in +++ b/Makefile.in @@ -32,14 +32,14 @@ LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \ ZLIBOBJ=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=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \ - main.o checksum.o match.o syscall.o log.o backup.o -OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \ + main.o checksum.o match.o syscall.o log.o backup.o options.o +OBJS2=flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \ fileio.o batch.o clientname.o chmod.o OBJS3=progress.o pipe.o DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ popt/popthelp.o popt/poptparse.o -OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@ +OBJS=$(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(OBJS1) $(ZLIBOBJ) @BUILD_POPT@ TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o @@ -143,7 +143,7 @@ test: check # might lose in the future where POSIX diverges from old sh. check: all $(CHECK_PROGS) - POSIXLY_CORRECT=1 TOOLDIR=`pwd` rsync_bin=`pwd`/rsync$(EXEEXT) srcdir="$(srcdir)" $(srcdir)/runtests.sh + rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh wildtest.o: wildtest.c lib/wildmatch.c rsync.h wildtest$(EXEEXT): wildtest.o lib/compat.o