X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e7d29902a6a7d9cea7c8a524478bb70062100d34..cef40af20967675efc04f125d433a4bc9c774b75:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index d2799c71..fa678cee 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,10 +17,13 @@ srcdir=@srcdir@
 VPATH=$(srcdir)
 SHELL=/bin/sh
 
+VERSION=@VERSION@
+
 .SUFFIXES:
 .SUFFIXES: .c .o
 
-LIBOBJ=lib/fnmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o
+LIBOBJ=lib/fnmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \
+	@LIBOBJS@
 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 
@@ -31,6 +34,11 @@ 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 
+
+# Programs we must have to run the test cases
+CHECK_PROGS = rsync tls
+
 # note that the -I. is needed to handle config.h when using VPATH
 .c.o:
 @OBJ_SAVE@
@@ -55,6 +63,9 @@ install-strip:
 rsync: $(OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o rsync $(OBJS) $(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"
 
@@ -73,10 +84,16 @@ proto:
 
 clean:
 	rm -f *~ $(OBJS) rsync 
+	rm -rf ./testtmp
 
 distclean: clean
 	rm -f config.h config.cache config.status Makefile
 
+# missing functions
+getaddrinfo.o:	lib/getaddrinfo.c
+	$(CC) -I. -I$(srcdir) -I$(srcdir)/lib $(CFLAGS) -c lib/getaddrinfo.c
+getnameinfo.o:	lib/getnameinfo.c
+	$(CC) -I. -I$(srcdir) -I$(srcdir)/lib $(CFLAGS) -c lib/getnameinfo.c
 
 # this target is really just for my use. It only works on a limited
 # range of machines and is used to produce a list of potentially
@@ -95,12 +112,24 @@ test: check
 # There seems to be no standard way to specify some variables as
 # exported from a Makefile apart from listing them like this.
 
-# TODO: These targets both ought to depend on a set of test programs
-# to build, if any.
+# TODO: Tests that depend on built test aide programs like tls need to
+# know where the build directory is.
+
+# This depends on building rsync; if we need any helper programs it
+# should depend on them too.
+
+# We try to run the scripts with POSIX mode on, in the hope that will
+# catch Bash-isms earlier even if we're running on GNU.  Of course, we
+# might lose in the future where POSIX diverges from old sh.
+
+check: all $(CHECK_PROGS)
+	POSIXLY_CORRECT=1 rsync_bin=`pwd`/rsync srcdir="$(srcdir)" $(srcdir)/runtests.sh
 
-check:
-	rsync_bin=./rsync srcdir="$(srcdir)" $(srcdir)/runtests.sh
+# This does *not* depend on building or installing: you can use it to
+# check a version installed from a binary or some other source tree,
+# if you want.
 
-installcheck:
-	rsync_bin="$(bindir)/rsync" srcdir="$(srcdir)" $(srcdir)/runtests.sh
+installcheck: $(CHECK_PROGS)
+	POSIXLY_CORRECT=1 rsync_bin="$(bindir)/rsync" srcdir="$(srcdir)" $(srcdir)/runtests.sh
 
+# TODO: Add 'dist' target; need to know which files will be included