X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7fc2ca2551088823f4600264a3ce7fa7360d737e..c493b6b81d814db3cdd91f3bb98f5a84456756ff:/Makefile.in diff --git a/Makefile.in b/Makefile.in index 9c9a58e5..826cf1f5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -162,8 +162,12 @@ Makefile: Makefile.in config.status configure.sh config.h.in echo "Makefile is unchanged."; \ rm Makefile.old; \ else \ - echo "Makefile updated -- rerun your make command."; \ - exit 1; \ + 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 @@ -171,7 +175,7 @@ proto: proto.h-tstamp proto.h: proto.h-tstamp @if test -f proto.h; then :; else cp -p $(srcdir)/proto.h .; fi -proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c +proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c config.h perl $(srcdir)/mkproto.pl $(srcdir)/*.c $(srcdir)/lib/compat.c man: rsync.1 rsyncd.conf.5 @@ -236,6 +240,9 @@ check: all $(CHECK_PROGS) $(CHECK_SYMLINKS) check29: all $(CHECK_PROGS) $(CHECK_SYMLINKS) rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh --protocol=29 +check30: all $(CHECK_PROGS) $(CHECK_SYMLINKS) + rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh --protocol=30 + wildtest.o: wildtest.c lib/wildmatch.c rsync.h config.h wildtest$(EXEEXT): wildtest.o lib/compat.o lib/snprintf.o @BUILD_POPT@ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ wildtest.o lib/compat.o lib/snprintf.o @BUILD_POPT@ $(LIBS)