Make "make proto" work for VPATH builds.

[rsync/rsync.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index dad43db..9171b69 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,13 +29,14 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o zlib/infcodes.o zlib/inffast.o \
        zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
        zlib/zutil.o zlib/adler32.o 
 OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o main.o checksum.o match.o syscall.o log.o backup.o
-OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o fileio.o batch.o
+OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o fileio.o batch.o \
+       clientname.o
 DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
 popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
        popt/popthelp.o popt/poptparse.o
 OBJS=$(OBJS1) $(OBJS2) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@
 
-tls_OBJ = tls.o syscall.o lib/permstring.o 
+TLS_OBJ = tls.o syscall.o lib/permstring.o 
 
 # Programs we must have to run the test cases
 CHECK_PROGS = rsync tls
@@ -67,8 +68,8 @@ rsync: $(OBJS)
 
 $(OBJS): config.h
 
-tls: $(tls_OBJ)
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(tls_OBJ) $(LIBS)
+tls: $(TLS_OBJ)
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ) $(LIBS)
 
 Makefile: Makefile.in configure config.status
        echo "WARNING: You need to run ./config.status --recheck"
@@ -84,7 +85,7 @@ rsyncd.conf.5: rsyncd.conf.yo
        yodl2man -o rsyncd.conf.5 rsyncd.conf.yo
 
 proto:
-       cat *.c lib/compat.c | awk -f mkproto.awk > proto.h
+       cat $(srcdir)/*.c $(srcdir)/lib/compat.c | awk -f $(srcdir)/mkproto.awk > $(srcdir)/proto.h
 
 clean:
        rm -f *~ $(OBJS) rsync $(TLS_OBJ) tls