Don't try to backup a file being removed from the backup area.

[rsync/rsync.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 8a021d1..0176954 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -27,13 +27,14 @@ VERSION=@VERSION@
 .SUFFIXES: .c .o
 
 GENFILES=configure.sh config.h.in proto.h proto.h-tstamp rsync.1 rsyncd.conf.5
-HEADERS=byteorder.h config.h errcode.h proto.h rsync.h ifuncs.h lib/pool_alloc.h
+HEADERS=byteorder.h config.h errcode.h proto.h rsync.h ifuncs.h itypes.h inums.h \
+       lib/pool_alloc.h
 LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o lib/md5.o \
        lib/permstring.o lib/pool_alloc.o lib/sysacls.o lib/sysxattrs.o @LIBOBJS@
 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=flist.o 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
+       util.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 \
        fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
 OBJS3=progress.o pipe.o
@@ -59,15 +60,15 @@ CHECK_OBJS=tls.o getgroups.o getfsdev.o t_stub.o t_unsafe.o trimslash.o wildtest
        $(CC) -I. -I$(srcdir) $(CFLAGS) $(CPPFLAGS) -c $< @CC_SHOBJ_FLAG@
 @OBJ_RESTORE@
 
-all: conf_stop make_stop rsync$(EXEEXT) @MAKE_MAN@
+all: Makefile rsync$(EXEEXT) @MAKE_MAN@
 
 install: all
        -mkdir -p ${DESTDIR}${bindir}
        ${INSTALLCMD} ${INSTALL_STRIP} -m 755 rsync$(EXEEXT) ${DESTDIR}${bindir}
        -mkdir -p ${DESTDIR}${mandir}/man1
        -mkdir -p ${DESTDIR}${mandir}/man5
-       if test -f $(srcdir)/rsync.1; then ${INSTALLMAN} -m 644 $(srcdir)/rsync.1 ${DESTDIR}${mandir}/man1; fi
-       if test -f $(srcdir)/rsyncd.conf.5; then ${INSTALLMAN} -m 644 $(srcdir)/rsyncd.conf.5 ${DESTDIR}${mandir}/man5; fi
+       if test -f rsync.1; then ${INSTALLMAN} -m 644 rsync.1 ${DESTDIR}${mandir}/man1; fi
+       if test -f rsyncd.conf.5; then ${INSTALLMAN} -m 644 rsyncd.conf.5 ${DESTDIR}${mandir}/man5; fi
 
 install-strip:
        $(MAKE) INSTALL_STRIP='-s' install
@@ -123,25 +124,51 @@ gensend: gen
 conf:
        cd $(srcdir) && $(MAKE) -f prepare-source.mak conf
 
-conf_stop: configure.sh config.h.in
-
 configure.sh config.h.in: configure.in aclocal.m4
+       @if test -f configure.sh; then cp -p configure.sh configure.sh.old; else touch configure.sh.old; fi
+       @if test -f config.h.in; then cp -p config.h.in config.h.in.old; else touch config.h.in.old; fi
        autoconf -o configure.sh
        autoheader && touch config.h.in
-       @echo 'Configure files changed -- perhaps run:'
-       @echo '  make reconfigure'
-       @exit 1
+       @if diff configure.sh configure.sh.old >/dev/null 2>&1; then \
+           echo "configure.sh is unchanged."; \
+           rm configure.sh.old; \
+       else \
+           echo "configure.sh has CHANGED."; \
+       fi
+       @if diff config.h.in config.h.in.old >/dev/null 2>&1; then \
+           echo "config.h.in is unchanged."; \
+           rm config.h.in.old; \
+       else \
+           echo "config.h.in has CHANGED."; \
+       fi
+       @if test -f configure.sh.old -o -f config.h.in.old; then \
+           if test "$(MAKECMDGOALS)" = reconfigure; then \
+               echo 'Continuing with "make reconfigure".'; \
+           else \
+               echo 'You may need to run:'; \
+               echo '  make reconfigure'; \
+               exit 1; \
+           fi \
+       fi
 
 reconfigure: configure.sh
        ./config.status --recheck
        ./config.status
 
-make_stop: Makefile
-
-Makefile: Makefile.in config.status
+Makefile: Makefile.in config.status configure.sh config.h.in
+       @if test -f Makefile; then cp -p Makefile Makefile.old; else touch Makefile.old; fi
        @./config.status
-       @echo "Makefile updated -- rerun your make command."
-       @exit 1
+       @if diff Makefile Makefile.old >/dev/null 2>&1; then \
+           echo "Makefile is unchanged."; \
+           rm Makefile.old; \
+       else \
+           if test "$(MAKECMDGOALS)" = reconfigure; then \
+               echo 'Continuing with "make reconfigure".'; \
+           else \
+               echo "Makefile updated -- rerun your make command."; \
+               exit 1; \
+           fi \
+       fi
 
 proto: proto.h-tstamp
 
@@ -152,6 +179,8 @@ proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c
        perl $(srcdir)/mkproto.pl $(srcdir)/*.c $(srcdir)/lib/compat.c
 
 man: rsync.1 rsyncd.conf.5
+       @if test -f rsync.1; then :; else cp -p $(srcdir)/rsync.1 .; fi
+       @if test -f rsyncd.conf.5; then :; else cp -p $(srcdir)/rsyncd.conf.5 .; fi
 
 rsync.1: rsync.yo
        yodl2man -o rsync.1 $(srcdir)/rsync.yo
@@ -163,7 +192,7 @@ rsyncd.conf.5: rsyncd.conf.yo
 
 clean: cleantests
        rm -f *~ $(OBJS) $(CHECK_PROGS) $(CHECK_OBJS) $(CHECK_SYMLINKS) \
-               rounding rounding.h
+               rounding rounding.h *.old
 
 cleantests:
        rm -rf ./testtmp*