From: Wayne Davison <wayne@opencoder.net>
Date: Fri, 7 Aug 2020 04:10:46 +0000 (-0700)
Subject: Simplify where version.h is included.
X-Git-Tag: v3.2.4pre1~148
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6816b3137899f8cceb2ec0ba8dc27ae9a270fe7b;p=thirdparty%2Frsync.git

Simplify where version.h is included.
---

diff --git a/Makefile.in b/Makefile.in
index d935651a..2b55d9f7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,7 +35,7 @@ ASM_x86_64=lib/md5-asm-x86_64.o
 GENFILES=configure.sh aclocal.m4 config.h.in rsync.1 rsync.1.html \
 	 rsync-ssl.1 rsync-ssl.1.html rsyncd.conf.5 rsyncd.conf.5.html
 HEADERS=byteorder.h config.h errcode.h proto.h rsync.h ifuncs.h itypes.h inums.h \
-	lib/pool_alloc.h lib/mdigest.h lib/md-defines.h version.h
+	lib/pool_alloc.h lib/mdigest.h lib/md-defines.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@
 zlib_OBJS=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
@@ -99,7 +99,7 @@ rsync$(EXEEXT): $(OBJS)
 $(OBJS): $(HEADERS)
 $(CHECK_OBJS): $(HEADERS)
 tls.o xattrs.o: lib/sysxattrs.h
-usage.o: latest-year.h help-rsync.h help-rsyncd.h git-version.h default-cvsignore.h
+usage.o: version.h latest-year.h help-rsync.h help-rsyncd.h git-version.h default-cvsignore.h
 loadparm.o: default-dont-compress.h daemon-parm.h
 
 flist.o: rounding.h
diff --git a/rsync.h b/rsync.h
index 0f5304ee..0b618d16 100644
--- a/rsync.h
+++ b/rsync.h
@@ -300,7 +300,6 @@ enum delret {
 #include "errcode.h"
 
 #include "config.h"
-#include "version.h"
 
 /* The default RSYNC_RSH is always set in config.h. */
 
diff --git a/usage.c b/usage.c
index 66857bb4..2b5f3761 100644
--- a/usage.c
+++ b/usage.c
@@ -18,6 +18,7 @@
  */
 
 #include "rsync.h"
+#include "version.h"
 #include "latest-year.h"
 #include "git-version.h"
 #include "default-cvsignore.h"