X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/914f3066bb0fa068a4e34e574ae853210f02ae20..fe1c19dcdfa000c2461e85ed7bf712de49904377:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 05e8824d..93f882aa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,14 +41,14 @@ popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
 	popt/popthelp.o popt/poptparse.o
 OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@
 
-TLS_OBJ = tls.o syscall.o lib/permstring.o
+TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o
 
 # Programs we must have to run the test cases
-CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) \
+CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) getfsdev$(EXEEXT) \
 	trimslash$(EXEEXT) t_unsafe$(EXEEXT) wildtest$(EXEEXT)
 
 # Objects for CHECK_PROGS to clean
-CHECK_OBJS=getgroups.o t_stub.o t_unsafe.o trimslash.o wildtest.o
+CHECK_OBJS=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:
@@ -58,10 +58,6 @@ CHECK_OBJS=getgroups.o t_stub.o t_unsafe.o trimslash.o wildtest.o
 
 all: rsync$(EXEEXT)
 
-gen: configure config.h.in proto man
-
-man: rsync.1 rsyncd.conf.5
-
 install: all
 	-mkdir -p ${DESTDIR}${bindir}
 	${INSTALLCMD} ${INSTALL_STRIP} -m 755 rsync$(EXEEXT) ${DESTDIR}${bindir}
@@ -84,7 +80,10 @@ tls$(EXEEXT): $(TLS_OBJ)
 getgroups$(EXEEXT): getgroups.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ getgroups.o $(LIBS)
 
-TRIMSLASH_OBJ = trimslash.o syscall.o
+getfsdev$(EXEEXT): getfsdev.o
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ getfsdev.o $(LIBS)
+
+TRIMSLASH_OBJ = trimslash.o syscall.o lib/compat.o lib/snprintf.o
 trimslash$(EXEEXT): $(TRIMSLASH_OBJ)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TRIMSLASH_OBJ) $(LIBS)
 
@@ -92,11 +91,15 @@ 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)
 
-configure: configure.in aclocal.m4
-	autoconf
+gen: $(srcdir)/configure $(srcdir)/config.h.in proto man
+
+man: $(srcdir)/rsync.1 $(srcdir)/rsyncd.conf.5
+
+$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4
+	cd $(srcdir); autoconf
 
-config.h.in: configure.in aclocal.m4
-	autoheader
+$(srcdir)/config.h.in: $(srcdir)/configure.in $(srcdir)/aclocal.m4
+	cd $(srcdir); autoheader
 
 $(srcdir)/rsync.1: $(srcdir)/rsync.yo
 	yodl2man -o $(srcdir)/rsync.1 $(srcdir)/rsync.yo