Diff for /embedaddon/rsync/Makefile.in between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/17 15:09:30 version 1.1.1.2, 2013/10/14 07:51:14
Line 4 Line 4
 prefix=@prefix@  prefix=@prefix@
 datarootdir=@datarootdir@  datarootdir=@datarootdir@
 exec_prefix=@exec_prefix@  exec_prefix=@exec_prefix@
   stunnel4=@STUNNEL4@
 bindir=@bindir@  bindir=@bindir@
 mandir=@mandir@  mandir=@mandir@
   
Line 18  INSTALLCMD=@INSTALL@ Line 19  INSTALLCMD=@INSTALL@
 INSTALLMAN=@INSTALL@  INSTALLMAN=@INSTALL@
   
 srcdir=@srcdir@  srcdir=@srcdir@
   MKDIR_P=@MKDIR_P@
 VPATH=$(srcdir)  VPATH=$(srcdir)
 SHELL=/bin/sh  SHELL=/bin/sh
   
VERSION=@VERSION@VERSION=@RSYNC_VERSION@
   
 .SUFFIXES:  .SUFFIXES:
 .SUFFIXES: .c .o  .SUFFIXES: .c .o
   
 GENFILES=configure.sh config.h.in proto.h proto.h-tstamp rsync.1 rsyncd.conf.5  GENFILES=configure.sh config.h.in proto.h proto.h-tstamp rsync.1 rsyncd.conf.5
HEADERS=byteorder.h config.h errcode.h proto.h rsync.h ifuncs.h lib/pool_alloc.hHEADERS=byteorder.h config.h errcode.h proto.h rsync.h ifuncs.h itypes.h inums.h \
         lib/pool_alloc.h
 LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o lib/md5.o \  LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o lib/md5.o \
         lib/permstring.o lib/pool_alloc.o lib/sysacls.o lib/sysxattrs.o @LIBOBJS@          lib/permstring.o lib/pool_alloc.o lib/sysacls.o lib/sysxattrs.o @LIBOBJS@
ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \zlib_OBJS=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
         zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o          zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o
 OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \  OBJS1=flist.o 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        util.o util2.o main.o checksum.o match.o syscall.o log.o backup.o delete.o
 OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o hashtable.o \  OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o hashtable.o \
         fileio.o batch.o clientname.o chmod.o acls.o xattrs.o          fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
 OBJS3=progress.o pipe.o  OBJS3=progress.o pipe.o
 DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.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_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
         popt/popthelp.o popt/poptparse.o          popt/popthelp.o popt/poptparse.o
OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) @BUILD_ZLIB@ @BUILD_POPT@
   
 TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o lib/sysxattrs.o @BUILD_POPT@  TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o lib/sysxattrs.o @BUILD_POPT@
   
 # Programs we must have to run the test cases  # Programs we must have to run the test cases
 CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) getfsdev$(EXEEXT) \  CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) getfsdev$(EXEEXT) \
        trimslash$(EXEEXT) t_unsafe$(EXEEXT) wildtest$(EXEEXT)        testrun$(EXEEXT) trimslash$(EXEEXT) t_unsafe$(EXEEXT) wildtest$(EXEEXT)
   
 CHECK_SYMLINKS = testsuite/chown-fake.test testsuite/devices-fake.test testsuite/xattrs-hlink.test  CHECK_SYMLINKS = testsuite/chown-fake.test testsuite/devices-fake.test testsuite/xattrs-hlink.test
   
 # Objects for CHECK_PROGS to clean  # Objects for CHECK_PROGS to clean
CHECK_OBJS=tls.o getgroups.o getfsdev.o t_stub.o t_unsafe.o trimslash.o wildtest.oCHECK_OBJS=tls.o testrun.o getgroups.o getfsdev.o t_stub.o t_unsafe.o trimslash.o wildtest.o
   
 # note that the -I. is needed to handle config.h when using VPATH  # note that the -I. is needed to handle config.h when using VPATH
 .c.o:  .c.o:
Line 59  CHECK_OBJS=tls.o getgroups.o getfsdev.o t_stub.o t_uns Line 62  CHECK_OBJS=tls.o getgroups.o getfsdev.o t_stub.o t_uns
         $(CC) -I. -I$(srcdir) $(CFLAGS) $(CPPFLAGS) -c $< @CC_SHOBJ_FLAG@          $(CC) -I. -I$(srcdir) $(CFLAGS) $(CPPFLAGS) -c $< @CC_SHOBJ_FLAG@
 @OBJ_RESTORE@  @OBJ_RESTORE@
   
all: Makefile rsync$(EXEEXT) @MAKE_MAN@all: Makefile rsync$(EXEEXT) rsync-ssl stunnel-rsync stunnel-rsyncd.conf @MAKE_MAN@
   
 install: all  install: all
        -mkdir -p ${DESTDIR}${bindir}        -${MKDIR_P} ${DESTDIR}${bindir}
         ${INSTALLCMD} ${INSTALL_STRIP} -m 755 rsync$(EXEEXT) ${DESTDIR}${bindir}          ${INSTALLCMD} ${INSTALL_STRIP} -m 755 rsync$(EXEEXT) ${DESTDIR}${bindir}
        -mkdir -p ${DESTDIR}${mandir}/man1        -${MKDIR_P} ${DESTDIR}${mandir}/man1
        -mkdir -p ${DESTDIR}${mandir}/man5        -${MKDIR_P} ${DESTDIR}${mandir}/man5
         if test -f rsync.1; then ${INSTALLMAN} -m 644 rsync.1 ${DESTDIR}${mandir}/man1; fi          if test -f rsync.1; then ${INSTALLMAN} -m 644 rsync.1 ${DESTDIR}${mandir}/man1; fi
         if test -f rsyncd.conf.5; then ${INSTALLMAN} -m 644 rsyncd.conf.5 ${DESTDIR}${mandir}/man5; fi          if test -f rsyncd.conf.5; then ${INSTALLMAN} -m 644 rsyncd.conf.5 ${DESTDIR}${mandir}/man5; fi
   
   install-ssl-client: rsync-ssl stunnel-rsync
           -${MKDIR_P} ${DESTDIR}${bindir}
           ${INSTALLCMD} ${INSTALL_STRIP} -m 755 rsync-ssl ${DESTDIR}${bindir}
           ${INSTALLCMD} ${INSTALL_STRIP} -m 755 stunnel-rsync ${DESTDIR}${bindir}
   
   install-ssl-daemon: stunnel-rsyncd.conf
           -${MKDIR_P} ${DESTDIR}/etc/stunnel
           ${INSTALLCMD} ${INSTALL_STRIP} -m 644 stunnel-rsyncd.conf ${DESTDIR}/etc/stunnel/rsyncd.conf
           @if ! ls /etc/rsync-ssl/certs/server.* >/dev/null 2>/dev/null; then \
               echo "Note that you'll need to install the certificate used by /etc/stunnel/rsyncd.conf"; \
           fi
   
   install-all: install install-ssl-client install-ssl-daemon
   
 install-strip:  install-strip:
         $(MAKE) INSTALL_STRIP='-s' install          $(MAKE) INSTALL_STRIP='-s' install
   
Line 101  rounding.h: rounding.c rsync.h Line 118  rounding.h: rounding.c rsync.h
 tls$(EXEEXT): $(TLS_OBJ)  tls$(EXEEXT): $(TLS_OBJ)
         $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ) $(LIBS)          $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ) $(LIBS)
   
   testrun$(EXEEXT): testrun.o
           $(CC) $(CFLAGS) $(LDFLAGS) -o $@ testrun.o
   
 getgroups$(EXEEXT): getgroups.o  getgroups$(EXEEXT): getgroups.o
         $(CC) $(CFLAGS) $(LDFLAGS) -o $@ getgroups.o $(LIBS)          $(CC) $(CFLAGS) $(LDFLAGS) -o $@ getgroups.o $(LIBS)
   
Line 111  TRIMSLASH_OBJ = trimslash.o syscall.o lib/compat.o lib Line 131  TRIMSLASH_OBJ = trimslash.o syscall.o lib/compat.o lib
 trimslash$(EXEEXT): $(TRIMSLASH_OBJ)  trimslash$(EXEEXT): $(TRIMSLASH_OBJ)
         $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TRIMSLASH_OBJ) $(LIBS)          $(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 lib/wildmatch.oT_UNSAFE_OBJ = t_unsafe.o syscall.o util.o util2.o t_stub.o lib/compat.o lib/snprintf.o lib/wildmatch.o
 t_unsafe$(EXEEXT): $(T_UNSAFE_OBJ)  t_unsafe$(EXEEXT): $(T_UNSAFE_OBJ)
         $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_UNSAFE_OBJ) $(LIBS)          $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_UNSAFE_OBJ) $(LIBS)
   
Line 169  Makefile: Makefile.in config.status configure.sh confi Line 189  Makefile: Makefile.in config.status configure.sh confi
             fi \              fi \
         fi          fi
   
   rsync-ssl: $(srcdir)/rsync-ssl.in Makefile
           sed 's;\@bindir\@;$(bindir);g' <$(srcdir)/rsync-ssl.in >rsync-ssl
           @chmod +x rsync-ssl
   
   stunnel-rsync: $(srcdir)/stunnel-rsync.in Makefile
           sed 's;\@stunnel4\@;$(stunnel4);g' <$(srcdir)/stunnel-rsync.in >stunnel-rsync
           @chmod +x stunnel-rsync
   
   stunnel-rsyncd.conf: $(srcdir)/stunnel-rsyncd.conf.in Makefile
           sed 's;\@bindir\@;$(bindir);g' <$(srcdir)/stunnel-rsyncd.conf.in >stunnel-rsyncd.conf
   
 proto: proto.h-tstamp  proto: proto.h-tstamp
   
 proto.h: proto.h-tstamp  proto.h: proto.h-tstamp
Line 177  proto.h: proto.h-tstamp Line 208  proto.h: proto.h-tstamp
 proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c config.h  proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c config.h
         perl $(srcdir)/mkproto.pl $(srcdir)/*.c $(srcdir)/lib/compat.c          perl $(srcdir)/mkproto.pl $(srcdir)/*.c $(srcdir)/lib/compat.c
   
man: rsync.1 rsyncd.conf.5man: rsync.1 rsyncd.conf.5 man-copy
        @if test -f rsync.1; then :; else cp -p $(srcdir)/rsync.1 .; fi 
        @if test -f rsyncd.conf.5; then :; else cp -p $(srcdir)/rsyncd.conf.5 .; fi 
   
   man-copy:
           @-if test -f rsync.1; then :; else echo 'Copying srcdir rsync.1'; cp -p $(srcdir)/rsync.1 .; fi
           @-if test -f rsyncd.conf.5; then :; else echo 'Copying srcdir rsyncd.conf.5'; cp -p $(srcdir)/rsyncd.conf.5 .; fi
   
 rsync.1: rsync.yo  rsync.1: rsync.yo
         yodl2man -o rsync.1 $(srcdir)/rsync.yo          yodl2man -o rsync.1 $(srcdir)/rsync.yo
         -$(srcdir)/tweak_manpage rsync.1          -$(srcdir)/tweak_manpage rsync.1
Line 201  cleantests: Line 234  cleantests:
 # the source directory.  # the source directory.
 distclean: clean  distclean: clean
         rm -f Makefile config.h config.status          rm -f Makefile config.h config.status
           rm -f rsync-ssl stunnel-rsync stunnel-rsyncd.conf
         rm -f lib/dummy popt/dummy zlib/dummy          rm -f lib/dummy popt/dummy zlib/dummy
         rm -f $(srcdir)/Makefile $(srcdir)/config.h $(srcdir)/config.status          rm -f $(srcdir)/Makefile $(srcdir)/config.h $(srcdir)/config.status
         rm -f $(srcdir)/lib/dummy $(srcdir)/popt/dummy $(srcdir)/zlib/dummy          rm -f $(srcdir)/lib/dummy $(srcdir)/popt/dummy $(srcdir)/zlib/dummy
Line 238  check: all $(CHECK_PROGS) $(CHECK_SYMLINKS) Line 272  check: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
   
 check29: all $(CHECK_PROGS) $(CHECK_SYMLINKS)  check29: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
         rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh --protocol=29          rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh --protocol=29
   
   check30: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
           rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh --protocol=30
   
 wildtest.o: wildtest.c lib/wildmatch.c rsync.h config.h  wildtest.o: wildtest.c lib/wildmatch.c rsync.h config.h
 wildtest$(EXEEXT): wildtest.o lib/compat.o lib/snprintf.o @BUILD_POPT@  wildtest$(EXEEXT): wildtest.o lib/compat.o lib/snprintf.o @BUILD_POPT@

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>