X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1580899c1dea856683c32f28eca0f6ccf8714bf0..c55b39afadb95fde35bbe70dab6b948f232ea956:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index bd0a6e77..3dbb4246 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,14 +32,14 @@ LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \
 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 options.o 
-OBJS2=flist.o io.o compat.o hlink.o token.o uidlist.o socket.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
 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=$(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(OBJS1) $(ZLIBOBJ) @BUILD_POPT@
+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
 
@@ -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: rsync$(EXEEXT)
+all: proto rsync$(EXEEXT)
 
 install: all
 	-mkdir -p ${DESTDIR}${bindir}
@@ -100,7 +100,13 @@ man:
 proto:
 	cd $(srcdir) && $(MAKE) -f prepare-source.mak proto.h
 
-clean: cleantests
+unpatch:
+	test -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
+	rm -f $(srcdir)/testsuite/default-acls.test $(srcdir)/testsuite/acls.test
+
+clean: unpatch proto cleantests
 	rm -f *~ $(OBJS) $(TLS_OBJ) $(CHECK_PROGS) $(CHECK_OBJS)
 
 cleantests: