X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/590eb6c02d56bd1d0869d26587c540935a4f596e..9439c0cb5a4b020b9bfcfe0351e33c17b9c53b54:/Makefile.in diff --git a/Makefile.in b/Makefile.in index 7d729c16..969a5524 100644 --- a/Makefile.in +++ b/Makefile.in @@ -26,22 +26,22 @@ VERSION=@VERSION@ .SUFFIXES: .SUFFIXES: .c .o -HEADERS=byteorder.h config.h errcode.h proto.h rsync.h lib/pool_alloc.h -LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \ - lib/permstring.o lib/pool_alloc.o @LIBOBJS@ +HEADERS=byteorder.h config.h errcode.h proto.h rsync.h smb_acls.h lib/pool_alloc.h +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@ ZLIBOBJ=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 -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 chmod.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 +OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o \ + fileio.o batch.o clientname.o chmod.o acls.o xattrs.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@ -TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o +TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o lib/sysxattrs.o # Programs we must have to run the test cases CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) getfsdev$(EXEEXT) \ @@ -56,7 +56,7 @@ CHECK_OBJS=getgroups.o getfsdev.o t_stub.o t_unsafe.o trimslash.o wildtest.o $(CC) -I. -I$(srcdir) $(CFLAGS) $(CPPFLAGS) -c $< @CC_SHOBJ_FLAG@ @OBJ_RESTORE@ -all: proto rsync$(EXEEXT) +all: rsync$(EXEEXT) install: all -mkdir -p ${DESTDIR}${bindir} @@ -74,6 +74,16 @@ rsync$(EXEEXT): $(OBJS) $(OBJS): $(HEADERS) +flist.o: rounding.h + +rounding.h: mkrounding$(EXEEXT) + ./mkrounding$(EXEEXT) >rounding.h + +mkrounding$(EXEEXT): mkrounding.c rsync.h + @sed '1,/^struct file_struct/d; /^}/,$$d' <$(srcdir)/rsync.h >mkrounding.h + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -I. $(srcdir)/mkrounding.c + @rm mkrounding.h + tls$(EXEEXT): $(TLS_OBJ) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ) $(LIBS) @@ -100,13 +110,9 @@ man: proto: cd $(srcdir) && $(MAKE) -f prepare-source.mak proto.h -unpatch: - [ -f $(srcdir)/acls.c ] && patch -d $(srcdir) -p1 -R <$(srcdir)/patches/acls.diff || true - rm -f $(srcdir)/lib/sysacls.? $(srcdir)/smb_acls.h $(srcdir)/acls.c - rm -f $(srcdir)/*.orig $(srcdir)/*.rej $(srcdir)/*/*.orig $(srcdir)/*/*.rej - -clean: unpatch proto cleantests - rm -f *~ $(OBJS) $(TLS_OBJ) $(CHECK_PROGS) $(CHECK_OBJS) +clean: cleantests + rm -f *~ $(OBJS) $(TLS_OBJ) $(CHECK_PROGS) $(CHECK_OBJS) \ + mkrounding mkrounding.h rounding.h cleantests: rm -rf ./testtmp* @@ -150,9 +156,12 @@ test: check check: all $(CHECK_PROGS) rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh +check29: all $(CHECK_PROGS) + rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh --protocol=29 + wildtest.o: wildtest.c lib/wildmatch.c rsync.h -wildtest$(EXEEXT): wildtest.o lib/compat.o - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ wildtest.o lib/compat.o @BUILD_POPT@ $(LIBS) +wildtest$(EXEEXT): wildtest.o lib/compat.o lib/snprintf.o + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ wildtest.o lib/compat.o lib/snprintf.o @BUILD_POPT@ $(LIBS) # 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,