Merge across rsync+ patch; add a little documentation to the manpage. More documenta...

[rsync/rsync.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 8820299..56e1b04 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,7 +26,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o zlib/infcodes.o zlib/inffast.o \
        zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
        zlib/zutil.o zlib/adler32.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 fileio.o
+OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o fileio.o batch.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
@@ -54,17 +54,14 @@ install-strip:
        $(MAKE) INSTALLCMD='$(INSTALLCMD) -s' install
 
 rsync: $(OBJS)
-       @-echo "    Note: The link command may give a warning about use of mktemp."
-       @-echo "    The warning may be ignored because rsync uses this function in a safe way."
        $(CC) $(CFLAGS) $(LDFLAGS) -o rsync $(OBJS) $(LIBS)
 
 Makefile: Makefile.in configure config.status
-       ./config.status --recheck
+       echo "WARNING: You need to run ./config.status --recheck"
 
-# It's OK if this fails, because we don't require people to have
-# autoconf installed.
+# don't actually run autoconf, just issue a warning
 configure: configure.in
-       -cd $(srcdir) && autoconf
+       echo "WARNING: you need to rerun autoconf"
 
 rsync.1: rsync.yo
        yodl2man -o rsync.1 rsync.yo