X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/5e1ec06f0968c1592567c77185648189f5a6a6d0..492fc3536db8e6b304228a7834949b5cfe71f58d:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 2959bc3b..bc931ca9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,7 +39,7 @@ 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 -td $(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: