From: Wayne Davison <wayne@opencoder.net>
Date: Mon, 27 Dec 2021 23:44:51 +0000 (-0800)
Subject: Include "rrsync" in "all" target when `--with-rrsync` was used.
X-Git-Tag: v3.2.4pre1~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3008e7c2269936672d796d95b85b285fc07adc01;p=thirdparty%2Frsync.git

Include "rrsync" in "all" target when `--with-rrsync` was used.
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4f5cbf23..a44cd2ab 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
     - name: configure
       run: ./configure --with-rrsync
     - name: make
-      run: make all rrsync
+      run: make
     - name: install
       run: sudo make install
     - name: info
@@ -63,7 +63,7 @@ jobs:
     - name: configure
       run: CPPFLAGS=-I/usr/local/opt/openssl/include/ LDFLAGS=-L/usr/local/opt/openssl/lib/ ./configure --with-rrsync
     - name: make
-      run: make all rrsync
+      run: make
     - name: install
       run: sudo make install
     - name: info
@@ -103,7 +103,7 @@ jobs:
     - name: configure
       run: bash -c './configure --with-rrsync'
     - name: make
-      run: bash -c 'make all rrsync'
+      run: bash -c 'make'
     - name: install
       run: bash -c 'make install'
     - name: info
diff --git a/Makefile.in b/Makefile.in
index 14d95abe..334f1bd7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -45,11 +45,11 @@ OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
 	util1.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 \
 	usage.o fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
-OBJS3=progress.o pipe.o @ASM@
+OBJS3=progress.o pipe.o @ASM@ @SIMD@
 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) @SIMD@ $(DAEMON_OBJ) $(LIBOBJ) @BUILD_ZLIB@ @BUILD_POPT@
+OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) @BUILD_ZLIB@ @BUILD_POPT@
 
 TLS_OBJ = tls.o syscall.o util2.o t_stub.o lib/compat.o lib/snprintf.o lib/permstring.o lib/sysxattrs.o @BUILD_POPT@
 
@@ -68,7 +68,7 @@ CHECK_OBJS=tls.o testrun.o getgroups.o getfsdev.o t_stub.o t_unsafe.o trimslash.
 	$(CC) -I. -I$(srcdir) $(CFLAGS) $(CPPFLAGS) -c $< @CC_SHOBJ_FLAG@
 @OBJ_RESTORE@
 
-all: Makefile rsync$(EXEEXT) stunnel-rsyncd.conf @MAKE_MAN@
+all: Makefile rsync$(EXEEXT) stunnel-rsyncd.conf @MAKE_RRSYNC@ @MAKE_MAN@
 .PHONY: all
 
 .PHONY: install
@@ -255,7 +255,7 @@ proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c daemon-parm.h
 	$(AWK) -f $(srcdir)/mkproto.awk $(srcdir)/*.c $(srcdir)/lib/compat.c daemon-parm.h
 
 .PHONY: man
-man: rsync.1 rsync-ssl.1 rsyncd.conf.5 rrsync.1
+man: rsync.1 rsync-ssl.1 rsyncd.conf.5 @MAKE_RRSYNC_1@
 
 rsync.1: rsync.1.md md-convert version.h Makefile
 	@$(srcdir)/maybe-make-man $(srcdir) rsync.1.md
diff --git a/configure.ac b/configure.ac
index b30eeb93..3caf5e39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,7 +117,6 @@ if test x"$enable_md2man" != x"no"; then
     MAKE_MAN=man
 else
     AC_MSG_RESULT(no)
-    MAKE_MAN=''
 fi
 
 # Specifically, this turns on panic_action handling.
@@ -140,6 +139,9 @@ AC_ARG_WITH(rrsync,
         AS_HELP_STRING([--with-rrsync],[also install the rrsync script and its man page]))
 if test x"$with_rrsync" != x"yes"; then
     with_rrsync=no
+else
+    MAKE_RRSYNC='rrsync'
+    MAKE_RRSYNC_1='rrsync.1'
 fi
 AC_SUBST(with_rrsync)
 
@@ -1253,6 +1255,8 @@ AC_SUBST(OBJ_RESTORE)
 AC_SUBST(CC_SHOBJ_FLAG)
 AC_SUBST(BUILD_POPT)
 AC_SUBST(BUILD_ZLIB)
+AC_SUBST(MAKE_RRSYNC)
+AC_SUBST(MAKE_RRSYNC_1)
 AC_SUBST(MAKE_MAN)
 
 AC_CHECK_FUNCS(_acl __acl _facl __facl)