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
Fix --help layout.
[rsync/rsync.git]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index
f61468e
..
74fe440
100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-12,6
+12,7
@@
CFLAGS=@CFLAGS@
LDFLAGS=@LDFLAGS@
INSTALLCMD=@INSTALL@
LDFLAGS=@LDFLAGS@
INSTALLCMD=@INSTALL@
+INSTALLMAN=@INSTALL@
srcdir=@srcdir@
VPATH=$(srcdir)
srcdir=@srcdir@
VPATH=$(srcdir)
@@
-29,13
+30,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
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@
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
# Programs we must have to run the test cases
CHECK_PROGS = rsync tls
@@
-55,17
+57,20
@@
install: all
${INSTALLCMD} -m 755 rsync ${bindir}
-mkdir -p ${mandir}/man1
-mkdir -p ${mandir}/man5
${INSTALLCMD} -m 755 rsync ${bindir}
-mkdir -p ${mandir}/man1
-mkdir -p ${mandir}/man5
- ${INSTALL
CMD
} -m 644 $(srcdir)/rsync.1 ${mandir}/man1
- ${INSTALL
CMD
} -m 644 $(srcdir)/rsyncd.conf.5 ${mandir}/man5
+ ${INSTALL
MAN
} -m 644 $(srcdir)/rsync.1 ${mandir}/man1
+ ${INSTALL
MAN
} -m 644 $(srcdir)/rsyncd.conf.5 ${mandir}/man5
install-strip:
$(MAKE) INSTALLCMD='$(INSTALLCMD) -s' install
rsync: $(OBJS)
install-strip:
$(MAKE) INSTALLCMD='$(INSTALLCMD) -s' install
rsync: $(OBJS)
+ @echo "Please ignore warnings below about mktemp -- it is used in a safe way"
$(CC) $(CFLAGS) $(LDFLAGS) -o rsync $(OBJS) $(LIBS)
$(CC) $(CFLAGS) $(LDFLAGS) -o rsync $(OBJS) $(LIBS)
-tls: $(tls_OBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(tls_OBJ) $(LIBS)
+$(OBJS): config.h
+
+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"
@@
-81,15
+86,23
@@
rsyncd.conf.5: rsyncd.conf.yo
yodl2man -o rsyncd.conf.5 rsyncd.conf.yo
proto:
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:
+clean:
rm -f *~ $(OBJS) rsync $(TLS_OBJ) tls
rm -rf ./testtmp
rm -f *~ $(OBJS) rsync $(TLS_OBJ) tls
rm -rf ./testtmp
- rm -f config.cache
+# We try to delete built files from both the source and build
+# directories, just in case somebody previously configured things in
+# the source directory.
distclean: clean
distclean: clean
- rm -f Makefile config.h config.status
+ rm -f Makefile config.h config.status
+ rm -f $(srcdir)/Makefile $(srcdir)/config.h $(srcdir)/config.status
+
+ rm -f config.cache config.log
+ rm -f $(srcdir)/config.cache $(srcdir)/config.log
+
+ rm -f shconfig $(srcdir)/shconfig
# 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
@@
-119,13
+132,28
@@
test: check
# might lose in the future where POSIX diverges from old sh.
check: all $(CHECK_PROGS)
# 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
+ POSIXLY_CORRECT=1
TLS=`pwd`/tls
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: $(CHECK_PROGS)
# 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: $(CHECK_PROGS)
- POSIXLY_CORRECT=1 rsync_bin="$(bindir)/rsync" srcdir="$(srcdir)" $(srcdir)/runtests.sh
+ POSIXLY_CORRECT=1
TLS=`pwd`/tls
rsync_bin="$(bindir)/rsync" srcdir="$(srcdir)" $(srcdir)/runtests.sh
# TODO: Add 'dist' target; need to know which files will be included
# TODO: Add 'dist' target; need to know which files will be included
+
+# Run the SPLINT (Secure Programming Lint) tool. <www.splint.org>
+.PHONY: splint
+splint:
+ splint +unixlib +gnuextensions -weak rsync.c
+
+
+rsync.dvi: doc/rsync.texinfo
+ texi2dvi -o $@ $<
+
+rsync.ps: rsync.dvi
+ dvips -ta4 -o $@ $<
+
+rsync.pdf: doc/rsync.texinfo
+ texi2dvi -o $@ --pdf $<