The call to test_skipped if makepath failed didn't work, presumably because

[rsync/rsync.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 535dace..253b76c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,6 +43,9 @@ TLS_OBJ = tls.o syscall.o lib/permstring.o
 # Programs we must have to run the test cases
 CHECK_PROGS = rsync tls getgroups trimslash t_unsafe
 
+# Objects for CHECK_PROGS to clean
+CHECK_OBJS=getgroups.o t_stub.o t_unsafe.o trimslash.o
+
 # note that the -I. is needed to handle config.h when using VPATH
 .c.o:
 @OBJ_SAVE@
@@ -80,7 +83,7 @@ TRIMSLASH_OBJ = trimslash.o syscall.o
 trimslash: $(TRIMSLASH_OBJ)
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TRIMSLASH_OBJ) $(LIBS)
 
-T_UNSAFE_OBJ = t_unsafe.o syscall.o util.o t_stub.o lib/compat.o
+T_UNSAFE_OBJ = t_unsafe.o syscall.o util.o t_stub.o lib/compat.o lib/snprintf.o
 t_unsafe: $(T_UNSAFE_OBJ)
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_UNSAFE_OBJ) $(LIBS)
 
@@ -96,17 +99,17 @@ t_unsafe: $(T_UNSAFE_OBJ)
 #configure: configure.in
 #      echo "WARNING: you need to rerun autoconf"
 
-rsync.1: rsync.yo
-       yodl2man -o rsync.1 rsync.yo
+$(srcdir)/rsync.1: $(srcdir)/rsync.yo
+       yodl2man -o $(srcdir)/rsync.1 $(srcdir)/rsync.yo
 
-rsyncd.conf.5: rsyncd.conf.yo
-       yodl2man -o rsyncd.conf.5 rsyncd.conf.yo
+$(srcdir)/rsyncd.conf.5: $(srcdir)/rsyncd.conf.yo
+       yodl2man -o $(srcdir)/rsyncd.conf.5 $(srcdir)/rsyncd.conf.yo
 
 proto:
        cat $(srcdir)/*.c $(srcdir)/lib/compat.c | awk -f $(srcdir)/mkproto.awk > $(srcdir)/proto.h
 
 clean: cleantests
-       rm -f *~ $(OBJS) rsync $(TLS_OBJ) $(CHECK_PROGS)
+       rm -f *~ $(OBJS) rsync $(TLS_OBJ) $(CHECK_PROGS) $(CHECK_OBJS)
 
 cleantests:
        rm -rf ./testtmp*