X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/07ad305e8a0c10c82ad7b055e24be5e92601d00c..b6800a0b32d53cbb23129a3eea8fa832fb864b79:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 9e61f4eb..bc18f4a5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -51,7 +51,7 @@ CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) getfsdev$(EXEEXT) \
 CHECK_SYMLINKS = testsuite/chown-fake.test testsuite/devices-fake.test
 
 # Objects for CHECK_PROGS to clean
-CHECK_OBJS=getgroups.o getfsdev.o t_stub.o t_unsafe.o trimslash.o wildtest.o
+CHECK_OBJS=tls.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:
@@ -75,6 +75,9 @@ install-strip:
 rsync$(EXEEXT): $(OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
+$(OBJS): $(HEADERS)
+$(CHECK_OBJS): $(HEADERS)
+
 flist.o: rounding.h
 
 rounding.h: mkrounding$(EXEEXT)
@@ -102,8 +105,6 @@ T_UNSAFE_OBJ = t_unsafe.o syscall.o util.o t_stub.o lib/compat.o lib/snprintf.o
 t_unsafe$(EXEEXT): $(T_UNSAFE_OBJ)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_UNSAFE_OBJ) $(LIBS)
 
-$(OBJS) $(TLS_OBJ) $(TRIMSLASH_OBJ) $(T_UNSAFE_OBJ): $(HEADERS)
-
 gen: conf proto.h man
 
 gensend: gen
@@ -118,29 +119,33 @@ configure.sh config.h.in: configure.in aclocal.m4
 	autoconf -o configure.sh
 	autoheader && touch config.h.in
 	@echo 'Configure files changed -- perhaps run:'
-	@echo '  ./config.status --recheck; ./config.status'
+	@echo '  make reconfigure'
 	@exit 1
 
+reconfigure:
+	./config.status --recheck
+	./config.status
+
 proto: proto.h-tstamp
 
 proto.h: proto.h-tstamp
 	@echo ' ' >/dev/null
 
-proto.h-tstamp: *.c lib/compat.c
-	perl mkproto.pl *.c lib/compat.c
+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
 
 rsync.1: rsync.yo
-	yodl2man -o rsync.1 rsync.yo
-	-./tweak_manpage rsync.1
+	yodl2man -o rsync.1 $(srcdir)/rsync.yo
+	-$(srcdir)/tweak_manpage rsync.1
 
 rsyncd.conf.5: rsyncd.conf.yo
-	yodl2man -o rsyncd.conf.5 rsyncd.conf.yo
-	-./tweak_manpage rsyncd.conf.5
+	yodl2man -o rsyncd.conf.5 $(srcdir)/rsyncd.conf.yo
+	-$(srcdir)/tweak_manpage rsyncd.conf.5
 
 clean: cleantests
-	rm -f *~ $(OBJS) $(TLS_OBJ) $(CHECK_PROGS) $(CHECK_OBJS) $(CHECK_SYMLINKS) \
+	rm -f *~ $(OBJS) $(CHECK_PROGS) $(CHECK_OBJS) $(CHECK_SYMLINKS) \
 		mkrounding mkrounding.h rounding.h
 
 cleantests: