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
Got rid of trailing whitespace and tweaked a few things that might
[rsync/rsync.git]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index
253b76c
..
87d0c8a
100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-9,6
+9,8
@@
mandir=@mandir@
LIBS=@LIBS@
CC=@CC@
CFLAGS=@CFLAGS@
LIBS=@LIBS@
CC=@CC@
CFLAGS=@CFLAGS@
+CPPFLAGS=@CPPFLAGS@
+EXEEXT=@EXEEXT@
LDFLAGS=@LDFLAGS@
INSTALLCMD=@INSTALL@
LDFLAGS=@LDFLAGS@
INSTALLCMD=@INSTALL@
@@
-24,24
+26,30
@@
VERSION=@VERSION@
.SUFFIXES: .c .o
LIBOBJ=lib/fnmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \
.SUFFIXES: .c .o
LIBOBJ=lib/fnmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \
- lib/permstring.o \
- @LIBOBJS@
+ lib/permstring.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 \
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 \
- clientname.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 clientname.o
OBJS3=progress.o pipe.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) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@
OBJS3=progress.o pipe.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) $(OBJS3) $(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
# Programs we must have to run the test cases
-CHECK_PROGS = rsync tls getgroups trimslash t_unsafe
+RSYNC_EXE=rsync$(EXEEXT)
+TLS_EXE=tls$(EXEEXT)
+GETGROUPS_EXE=getgroups$(EXEEXT)
+TRIMSLASH_EXE=trimslash$(EXEEXT)
+T_UNSAFE_EXE=t_unsafe$(EXEEXT)
+CHECK_PROGS=$(RSYNC_EXE) $(TLS_EXE) $(GETGROUPS_EXE) \
+ $(TRIMSLASH_EXE) $(T_UNSAFE_EXE)
# Objects for CHECK_PROGS to clean
CHECK_OBJS=getgroups.o t_stub.o t_unsafe.o trimslash.o
# Objects for CHECK_PROGS to clean
CHECK_OBJS=getgroups.o t_stub.o t_unsafe.o trimslash.o
@@
-49,16
+57,16
@@
CHECK_OBJS=getgroups.o t_stub.o t_unsafe.o trimslash.o
# 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@
- $(CC) -I. -I$(srcdir) $(CFLAGS) -c $< @CC_SHOBJ_FLAG@
+ $(CC) -I. -I$(srcdir) $(CFLAGS)
$(CPPFLAGS)
-c $< @CC_SHOBJ_FLAG@
@OBJ_RESTORE@
@OBJ_RESTORE@
-all:
rsync
+all:
$(RSYNC_EXE)
man: rsync.1 rsyncd.conf.5
install: all
-mkdir -p ${DESTDIR}${bindir}
man: rsync.1 rsyncd.conf.5
install: all
-mkdir -p ${DESTDIR}${bindir}
- ${INSTALLCMD} ${STRIP} -m 755
rsync
${DESTDIR}${bindir}
+ ${INSTALLCMD} ${STRIP} -m 755
$(RSYNC_EXE)
${DESTDIR}${bindir}
-mkdir -p ${DESTDIR}${mandir}/man1
-mkdir -p ${DESTDIR}${mandir}/man5
${INSTALLMAN} -m 644 $(srcdir)/rsync.1 ${DESTDIR}${mandir}/man1
-mkdir -p ${DESTDIR}${mandir}/man1
-mkdir -p ${DESTDIR}${mandir}/man5
${INSTALLMAN} -m 644 $(srcdir)/rsync.1 ${DESTDIR}${mandir}/man1
@@
-67,24
+75,23
@@
install: all
install-strip:
$(MAKE) STRIP='-s' install
install-strip:
$(MAKE) STRIP='-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)
+$(RSYNC_EXE): $(OBJS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
$(OBJS): config.h
$(OBJS): config.h
-
tls
: $(TLS_OBJ)
+
$(TLS_EXE)
: $(TLS_OBJ)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ) $(LIBS)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ) $(LIBS)
-
getgroups
: getgroups.o
+
$(GETGROUPS_EXE)
: getgroups.o
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ getgroups.o $(LIBS)
TRIMSLASH_OBJ = trimslash.o syscall.o
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ getgroups.o $(LIBS)
TRIMSLASH_OBJ = trimslash.o syscall.o
-
trimslash
: $(TRIMSLASH_OBJ)
+
$(TRIMSLASH_EXE)
: $(TRIMSLASH_OBJ)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TRIMSLASH_OBJ) $(LIBS)
T_UNSAFE_OBJ = t_unsafe.o syscall.o util.o t_stub.o lib/compat.o lib/snprintf.o
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TRIMSLASH_OBJ) $(LIBS)
T_UNSAFE_OBJ = t_unsafe.o syscall.o util.o t_stub.o lib/compat.o lib/snprintf.o
-
t_unsafe
: $(T_UNSAFE_OBJ)
+
$(T_UNSAFE_EXE)
: $(T_UNSAFE_OBJ)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_UNSAFE_OBJ) $(LIBS)
# I don't like these rules because CVS can skew the timestamps and
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_UNSAFE_OBJ) $(LIBS)
# I don't like these rules because CVS can skew the timestamps and
@@
-109,7
+116,7
@@
proto:
cat $(srcdir)/*.c $(srcdir)/lib/compat.c | awk -f $(srcdir)/mkproto.awk > $(srcdir)/proto.h
clean: cleantests
cat $(srcdir)/*.c $(srcdir)/lib/compat.c | awk -f $(srcdir)/mkproto.awk > $(srcdir)/proto.h
clean: cleantests
- rm -f *~ $(OBJS)
rsync
$(TLS_OBJ) $(CHECK_PROGS) $(CHECK_OBJS)
+ rm -f *~ $(OBJS) $(TLS_OBJ) $(CHECK_PROGS) $(CHECK_OBJS)
cleantests:
rm -rf ./testtmp*
cleantests:
rm -rf ./testtmp*
@@
-118,8
+125,8
@@
cleantests:
# directories, just in case somebody previously configured things in
# the source directory.
distclean: clean
# directories, just in case somebody previously configured things in
# the source directory.
distclean: clean
- rm -f Makefile config.h config.status
- rm -f $(srcdir)/Makefile $(srcdir)/config.h $(srcdir)/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 config.cache config.log
rm -f $(srcdir)/config.cache $(srcdir)/config.log
@@
-132,7
+139,7
@@
distclean: clean
finddead:
nm *.o */*.o |grep 'U ' | awk '{print $$2}' | sort -u > nmused.txt
nm *.o */*.o |grep 'T ' | awk '{print $$3}' | sort -u > nmfns.txt
finddead:
nm *.o */*.o |grep 'U ' | awk '{print $$2}' | sort -u > nmused.txt
nm *.o */*.o |grep 'T ' | awk '{print $$3}' | sort -u > nmfns.txt
- comm -13 nmused.txt nmfns.txt
+ comm -13 nmused.txt nmfns.txt
# 'check' is the GNU name, 'test' is the name for everybody else :-)
.PHONY: check test
# 'check' is the GNU name, 'test' is the name for everybody else :-)
.PHONY: check test
@@
-154,37
+161,37
@@
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 TOOLDIR=`pwd` rsync_bin=`pwd`/
rsync
srcdir="$(srcdir)" $(srcdir)/runtests.sh
+ POSIXLY_CORRECT=1 TOOLDIR=`pwd` rsync_bin=`pwd`/
$(RSYNC_EXE)
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 TOOLDIR=`pwd` rsync_bin="$(bindir)/
rsync
" srcdir="$(srcdir)" $(srcdir)/runtests.sh
+ POSIXLY_CORRECT=1 TOOLDIR=`pwd` rsync_bin="$(bindir)/
$(RSYNC_EXE)
" srcdir="$(srcdir)" $(srcdir)/runtests.sh
# TODO: Add 'dist' target; need to know which files will be included
# Run the SPLINT (Secure Programming Lint) tool. <www.splint.org>
.PHONY: splint
# 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:
splint +unixlib +gnuextensions -weak rsync.c
rsync.dvi: doc/rsync.texinfo
texi2dvi -o $@ $<
splint +unixlib +gnuextensions -weak rsync.c
rsync.dvi: doc/rsync.texinfo
texi2dvi -o $@ $<
-rsync.ps: rsync.dvi
+rsync.ps: rsync.dvi
dvips -ta4 -o $@ $<
rsync.pdf: doc/rsync.texinfo
texi2dvi -o $@ --pdf $<
dvips -ta4 -o $@ $<
rsync.pdf: doc/rsync.texinfo
texi2dvi -o $@ --pdf $<
-doxygen:
+doxygen:
cd $(srcdir) && rm dox/html/* && doxygen
# for maintainers only
cd $(srcdir) && rm dox/html/* && doxygen
# for maintainers only
-doxygen-upload:
+doxygen-upload:
rsync -avzv $(srcdir)/dox/html/ --delete \
samba.org:/home/httpd/html/rsync/doxygen/head/
rsync -avzv $(srcdir)/dox/html/ --delete \
samba.org:/home/httpd/html/rsync/doxygen/head/