Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check for -lnsl, -lsocket, etc, *before* looking for getaddrinfo,
[rsync/rsync.git]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index
0f55e20
..
fa678ce
100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-17,10
+17,13
@@
srcdir=@srcdir@
VPATH=$(srcdir)
SHELL=/bin/sh
VPATH=$(srcdir)
SHELL=/bin/sh
+VERSION=@VERSION@
+
.SUFFIXES:
.SUFFIXES: .c .o
.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
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@
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@
# 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)
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"
Makefile: Makefile.in configure config.status
echo "WARNING: You need to run ./config.status --recheck"
@@
-78,6
+89,11
@@
clean:
distclean: clean
rm -f config.h config.cache config.status Makefile
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
# 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
@@
-96,8
+112,8
@@
test: check
# There seems to be no standard way to specify some variables as
# exported from a Makefile apart from listing them like this.
# There seems to be no standard way to specify some variables as
# exported from a Makefile apart from listing them like this.
-# TODO: T
hese targets both ought to depend on a set of test programs
-#
to build, if any
.
+# TODO: T
ests 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.
# This depends on building rsync; if we need any helper programs it
# should depend on them too.
@@
-106,13
+122,14
@@
test: check
# 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.
# 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: all
$(CHECK_PROGS)
POSIXLY_CORRECT=1 rsync_bin=`pwd`/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.
POSIXLY_CORRECT=1 rsync_bin=`pwd`/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:
+installcheck:
$(CHECK_PROGS)
POSIXLY_CORRECT=1 rsync_bin="$(bindir)/rsync" srcdir="$(srcdir)" $(srcdir)/runtests.sh
POSIXLY_CORRECT=1 rsync_bin="$(bindir)/rsync" srcdir="$(srcdir)" $(srcdir)/runtests.sh
+# TODO: Add 'dist' target; need to know which files will be included