Move var declaration for older C compilers.

[rsync.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 9c9a58e58604281d734529efe21ff8fc6727915c..dfb4e078551728fd0a7c37166872e4d90219cbd3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,12 +47,12 @@ TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o lib/sysxa
 
 # Programs we must have to run the test cases
 CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) getfsdev$(EXEEXT) \
-       trimslash$(EXEEXT) t_unsafe$(EXEEXT) wildtest$(EXEEXT)
+       testrun$(EXEEXT) trimslash$(EXEEXT) t_unsafe$(EXEEXT) wildtest$(EXEEXT)
 
-CHECK_SYMLINKS = testsuite/chown-fake.test testsuite/devices-fake.test
+CHECK_SYMLINKS = testsuite/chown-fake.test testsuite/devices-fake.test testsuite/xattrs-hlink.test
 
 # Objects for CHECK_PROGS to clean
-CHECK_OBJS=tls.o getgroups.o getfsdev.o t_stub.o t_unsafe.o trimslash.o wildtest.o
+CHECK_OBJS=tls.o testrun.o getgroups.o getfsdev.o t_stub.o t_unsafe.o trimslash.o wildtest.o
 
 # note that the -I. is needed to handle config.h when using VPATH
 .c.o:
@@ -102,6 +102,9 @@ rounding.h: rounding.c rsync.h
 tls$(EXEEXT): $(TLS_OBJ)
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ) $(LIBS)
 
+testrun$(EXEEXT): testrun.o
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ testrun.o
+
 getgroups$(EXEEXT): getgroups.o
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ getgroups.o $(LIBS)
 
@@ -124,7 +127,7 @@ gensend: gen
 conf:
        cd $(srcdir) && $(MAKE) -f prepare-source.mak conf
 
-configure.sh config.h.in: configure.in aclocal.m4
+configure.sh config.h.in: configure.ac 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
@@ -162,8 +165,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 +178,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 +243,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)
@@ -246,6 +256,9 @@ testsuite/chown-fake.test:
 testsuite/devices-fake.test:
        ln -s devices.test $(srcdir)/testsuite/devices-fake.test
 
+testsuite/xattrs-hlink.test:
+       ln -s xattrs.test $(srcdir)/testsuite/xattrs-hlink.test
+
 # This does *not* depend on building or installing: you can use it to
 # check a version installed from a binary or some other source tree,
 # if you want.