1*4882a593SmuzhiyunFrom 81700d1a0e51391028c761cc8ef1cd660084d114 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Ross Burton <ross.burton@intel.com> 3*4882a593SmuzhiyunDate: Tue, 12 Apr 2016 15:51:54 +0100 4*4882a593SmuzhiyunSubject: [PATCH] rsync: remove upstream's rebuild logic 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunRemove the Makefile rules to reinvoke autoconf, they're not out-of-tree safe and 7*4882a593Smuzhiyungenerally overcomplicated, and we ensure that autoreconf is invoked if required. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunUpstream-Status: Inappropriate 10*4882a593SmuzhiyunSigned-off-by: Ross Burton <ross.burton@intel.com> 11*4882a593Smuzhiyun 12*4882a593Smuzhiyun--- 13*4882a593Smuzhiyun Makefile.in | 54 ----------------------------------------------------- 14*4882a593Smuzhiyun 1 file changed, 54 deletions(-) 15*4882a593Smuzhiyun 16*4882a593Smuzhiyundiff --git a/Makefile.in b/Makefile.in 17*4882a593Smuzhiyunindex 3cde955..d963a70 100644 18*4882a593Smuzhiyun--- a/Makefile.in 19*4882a593Smuzhiyun+++ b/Makefile.in 20*4882a593Smuzhiyun@@ -190,60 +190,6 @@ gensend: gen 21*4882a593Smuzhiyun fi 22*4882a593Smuzhiyun rsync -aic $(GENFILES) git-version.h $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/ || true 23*4882a593Smuzhiyun 24*4882a593Smuzhiyun-aclocal.m4: $(srcdir)/m4/*.m4 25*4882a593Smuzhiyun- aclocal -I $(srcdir)/m4 26*4882a593Smuzhiyun- 27*4882a593Smuzhiyun-configure.sh config.h.in: configure.ac aclocal.m4 28*4882a593Smuzhiyun- @if test -f configure.sh; then cp -p configure.sh configure.sh.old; else touch configure.sh.old; fi 29*4882a593Smuzhiyun- @if test -f config.h.in; then cp -p config.h.in config.h.in.old; else touch config.h.in.old; fi 30*4882a593Smuzhiyun- autoconf -o configure.sh 31*4882a593Smuzhiyun- autoheader && touch config.h.in 32*4882a593Smuzhiyun- @if diff configure.sh configure.sh.old >/dev/null 2>&1; then \ 33*4882a593Smuzhiyun- echo "configure.sh is unchanged."; \ 34*4882a593Smuzhiyun- rm configure.sh.old; \ 35*4882a593Smuzhiyun- else \ 36*4882a593Smuzhiyun- echo "configure.sh has CHANGED."; \ 37*4882a593Smuzhiyun- fi 38*4882a593Smuzhiyun- @if diff config.h.in config.h.in.old >/dev/null 2>&1; then \ 39*4882a593Smuzhiyun- echo "config.h.in is unchanged."; \ 40*4882a593Smuzhiyun- rm config.h.in.old; \ 41*4882a593Smuzhiyun- else \ 42*4882a593Smuzhiyun- echo "config.h.in has CHANGED."; \ 43*4882a593Smuzhiyun- fi 44*4882a593Smuzhiyun- @if test -f configure.sh.old || test -f config.h.in.old; then \ 45*4882a593Smuzhiyun- if test "$(MAKECMDGOALS)" = reconfigure; then \ 46*4882a593Smuzhiyun- echo 'Continuing with "make reconfigure".'; \ 47*4882a593Smuzhiyun- else \ 48*4882a593Smuzhiyun- echo 'You may need to run:'; \ 49*4882a593Smuzhiyun- echo ' make reconfigure'; \ 50*4882a593Smuzhiyun- exit 1; \ 51*4882a593Smuzhiyun- fi \ 52*4882a593Smuzhiyun- fi 53*4882a593Smuzhiyun- 54*4882a593Smuzhiyun-.PHONY: reconfigure 55*4882a593Smuzhiyun-reconfigure: configure.sh 56*4882a593Smuzhiyun- ./config.status --recheck 57*4882a593Smuzhiyun- ./config.status 58*4882a593Smuzhiyun- 59*4882a593Smuzhiyun-.PHONY: restatus 60*4882a593Smuzhiyun-restatus: 61*4882a593Smuzhiyun- ./config.status 62*4882a593Smuzhiyun- 63*4882a593Smuzhiyun-Makefile: Makefile.in config.status configure.sh config.h.in 64*4882a593Smuzhiyun- @if test -f Makefile; then cp -p Makefile Makefile.old; else touch Makefile.old; fi 65*4882a593Smuzhiyun- @./config.status 66*4882a593Smuzhiyun- @if diff Makefile Makefile.old >/dev/null 2>&1; then \ 67*4882a593Smuzhiyun- echo "Makefile is unchanged."; \ 68*4882a593Smuzhiyun- rm Makefile.old; \ 69*4882a593Smuzhiyun- else \ 70*4882a593Smuzhiyun- if test "$(MAKECMDGOALS)" = reconfigure; then \ 71*4882a593Smuzhiyun- echo 'Continuing with "make reconfigure".'; \ 72*4882a593Smuzhiyun- else \ 73*4882a593Smuzhiyun- echo "Makefile updated -- rerun your make command."; \ 74*4882a593Smuzhiyun- exit 1; \ 75*4882a593Smuzhiyun- fi \ 76*4882a593Smuzhiyun- fi 77*4882a593Smuzhiyun- 78*4882a593Smuzhiyun stunnel-rsyncd.conf: $(srcdir)/stunnel-rsyncd.conf.in Makefile 79*4882a593Smuzhiyun sed 's;\@bindir\@;$(bindir);g' <$(srcdir)/stunnel-rsyncd.conf.in >stunnel-rsyncd.conf 80*4882a593Smuzhiyun 81