X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/0d7a6b4906236307533699ec245033d0365c27c0..5a3e9ff6081cb83873881df9a7bcfc19f9af5e58:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 7eb01400..ed3b0c62 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,9 +31,9 @@ LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \
 	lib/permstring.o lib/pool_alloc.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 \
+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
 OBJS3=progress.o pipe.o
 DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
@@ -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
+	@sed '1,/^struct file_struct/d; /^}/,$$d' <rsync.h >mkrounding.h
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ mkrounding.c
+	@rm mkrounding.h
+
 tls$(EXEEXT): $(TLS_OBJ)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ) $(LIBS)
 
@@ -101,12 +111,8 @@ proto:
 	cd $(srcdir) && $(MAKE) -f prepare-source.mak proto.h
 
 clean: cleantests
-	rm -f *~ $(OBJS) $(TLS_OBJ) $(CHECK_PROGS) $(CHECK_OBJS)
-	cd $(srcdir)
-	[ -f acls.c ] && patch -p1 -R <patches/acls.diff || true
-	rm -f *.orig *.rej */*.orig */*.rej
-	$(MAKE) -f prepare-source.mak proto.h
-	rm -f lib/sysacls.c lib/sysacls.h smb_acls.h acls.c
+	rm -f *~ $(OBJS) $(TLS_OBJ) $(CHECK_PROGS) $(CHECK_OBJS) \
+		mkrounding mkrounding.h rounding.h
 
 cleantests:
 	rm -rf ./testtmp*
@@ -151,8 +157,8 @@ check: all $(CHECK_PROGS)
 	rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh
 
 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,