Fixed a build problem for those building in a different dir from

[rsync.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 8d814eed03aa8cc0f13d09e918f81e62ae9eba5b..c09084623ce391e7ca20789b9130874f02e163a0 100644 (file)
--- 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:
@@ -76,6 +76,7 @@ rsync$(EXEEXT): $(OBJS)
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
 $(OBJS): $(HEADERS)
+$(CHECK_OBJS): $(HEADERS)
 
 flist.o: rounding.h
 
@@ -126,8 +127,8 @@ 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 mkproto.pl $(srcdir)/*.c $(srcdir)/lib/compat.c
 
 man: rsync.1 rsyncd.conf.5
 
@@ -140,7 +141,7 @@ rsyncd.conf.5: rsyncd.conf.yo
        -./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:
@@ -186,7 +187,7 @@ check: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
 check29: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
        rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh --protocol=29
 
-wildtest.o: wildtest.c lib/wildmatch.c rsync.h
+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)