Add a test case for trim_trailing_slashes, and make it handle other cases.

[rsync/rsync.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 9171b69..2c56395 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,6 +12,7 @@ CFLAGS=@CFLAGS@
 LDFLAGS=@LDFLAGS@
 
 INSTALLCMD=@INSTALL@
+INSTALLMAN=@INSTALL@
 
 srcdir=@srcdir@
 VPATH=$(srcdir)
@@ -39,7 +40,7 @@ OBJS=$(OBJS1) $(OBJS2) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@
 TLS_OBJ = tls.o syscall.o lib/permstring.o 
 
 # Programs we must have to run the test cases
-CHECK_PROGS = rsync tls
+CHECK_PROGS = rsync tls getgroups trimslash
 
 # note that the -I. is needed to handle config.h when using VPATH
 .c.o:
@@ -52,15 +53,15 @@ all: rsync
 man: rsync.1 rsyncd.conf.5
 
 install: all
-       -mkdir -p ${bindir}
-       ${INSTALLCMD} -m 755 rsync ${bindir}
-       -mkdir -p ${mandir}/man1
-       -mkdir -p ${mandir}/man5
-       ${INSTALLCMD} -m 644 $(srcdir)/rsync.1 ${mandir}/man1
-       ${INSTALLCMD} -m 644 $(srcdir)/rsyncd.conf.5 ${mandir}/man5
+       -mkdir -p ${DESTDIR}${bindir}
+       ${INSTALLCMD} ${STRIP} -m 755 rsync ${DESTDIR}${bindir}
+       -mkdir -p ${DESTDIR}${mandir}/man1
+       -mkdir -p ${DESTDIR}${mandir}/man5
+       ${INSTALLMAN} -m 644 $(srcdir)/rsync.1 ${DESTDIR}${mandir}/man1
+       ${INSTALLMAN} -m 644 $(srcdir)/rsyncd.conf.5 ${DESTDIR}${mandir}/man5
 
 install-strip:
-       $(MAKE) INSTALLCMD='$(INSTALLCMD) -s' install
+       $(MAKE) STRIP='-s' install
 
 rsync: $(OBJS)
        @echo "Please ignore warnings below about mktemp -- it is used in a safe way"
@@ -71,6 +72,13 @@ $(OBJS): config.h
 tls: $(TLS_OBJ)
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ) $(LIBS)
 
+getgroups: getgroups.o
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
+
+TRIMSLASH_OBJ = trimslash.o syscall.o
+trimslash: $(TRIMSLASH_OBJ)
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TRIMSLASH_OBJ) $(LIBS)
+
 Makefile: Makefile.in configure config.status
        echo "WARNING: You need to run ./config.status --recheck"
 
@@ -87,13 +95,23 @@ rsyncd.conf.5: rsyncd.conf.yo
 proto:
        cat $(srcdir)/*.c $(srcdir)/lib/compat.c | awk -f $(srcdir)/mkproto.awk > $(srcdir)/proto.h
 
-clean:
-       rm -f *~ $(OBJS) rsync $(TLS_OBJ) tls
-       rm -rf ./testtmp
-       rm -f config.cache 
+clean: cleantests
+       rm -f *~ $(OBJS) rsync $(TLS_OBJ) $(CHECK_PROGS)
+
+cleantests:
+       rm -rf ./testtmp*
 
+# 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
-       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
@@ -123,13 +141,28 @@ test: check
 # might lose in the future where POSIX diverges from old sh.
 
 check: all $(CHECK_PROGS)
-       POSIXLY_CORRECT=1 TLS=`pwd`/tls rsync_bin=`pwd`/rsync srcdir="$(srcdir)" $(srcdir)/runtests.sh
+       POSIXLY_CORRECT=1 TOOLDIR=`pwd` 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)
-       POSIXLY_CORRECT=1 TLS=`pwd`/tls rsync_bin="$(bindir)/rsync" srcdir="$(srcdir)" $(srcdir)/runtests.sh
+       POSIXLY_CORRECT=1 TOOLDIR=`pwd` rsync_bin="$(bindir)/rsync" 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
+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 $<