| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | Remove the Makefile rules to reinvoke autoconf, they're not out-of-tree safe and |
| 2 | generally overcomplicated, and we ensure that autoreconf is invoked if required. |
| 3 | |
| 4 | Upstream-Status: Inappropriate |
| 5 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 6 | |
| 7 | diff --git a/Makefile.in b/Makefile.in |
| 8 | index 151247d..8f3fdb6 100644 |
| 9 | --- a/Makefile.in |
| 10 | +++ b/Makefile.in |
| 11 | @@ -141,58 +141,6 @@ gen: conf proto.h man |
| 12 | gensend: gen |
| 13 | rsync -aivzc $(GENFILES) $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/ |
| 14 | |
| 15 | -conf: |
| 16 | - cd $(srcdir) && $(MAKE) -f prepare-source.mak conf |
| 17 | - |
| 18 | -aclocal.m4: $(srcdir)/m4/*.m4 |
| 19 | - aclocal -I $(srcdir)/m4 |
| 20 | - |
| 21 | -configure.sh config.h.in: configure.ac aclocal.m4 |
| 22 | - @if test -f configure.sh; then cp -p configure.sh configure.sh.old; else touch configure.sh.old; fi |
| 23 | - @if test -f config.h.in; then cp -p config.h.in config.h.in.old; else touch config.h.in.old; fi |
| 24 | - autoconf -o configure.sh |
| 25 | - autoheader && touch config.h.in |
| 26 | - @if diff configure.sh configure.sh.old >/dev/null 2>&1; then \ |
| 27 | - echo "configure.sh is unchanged."; \ |
| 28 | - rm configure.sh.old; \ |
| 29 | - else \ |
| 30 | - echo "configure.sh has CHANGED."; \ |
| 31 | - fi |
| 32 | - @if diff config.h.in config.h.in.old >/dev/null 2>&1; then \ |
| 33 | - echo "config.h.in is unchanged."; \ |
| 34 | - rm config.h.in.old; \ |
| 35 | - else \ |
| 36 | - echo "config.h.in has CHANGED."; \ |
| 37 | - fi |
| 38 | - @if test -f configure.sh.old -o -f config.h.in.old; then \ |
| 39 | - if test "$(MAKECMDGOALS)" = reconfigure; then \ |
| 40 | - echo 'Continuing with "make reconfigure".'; \ |
| 41 | - else \ |
| 42 | - echo 'You may need to run:'; \ |
| 43 | - echo ' make reconfigure'; \ |
| 44 | - exit 1; \ |
| 45 | - fi \ |
| 46 | - fi |
| 47 | - |
| 48 | -reconfigure: configure.sh |
| 49 | - ./config.status --recheck |
| 50 | - ./config.status |
| 51 | - |
| 52 | -Makefile: Makefile.in config.status configure.sh config.h.in |
| 53 | - @if test -f Makefile; then cp -p Makefile Makefile.old; else touch Makefile.old; fi |
| 54 | - @./config.status |
| 55 | - @if diff Makefile Makefile.old >/dev/null 2>&1; then \ |
| 56 | - echo "Makefile is unchanged."; \ |
| 57 | - rm Makefile.old; \ |
| 58 | - else \ |
| 59 | - if test "$(MAKECMDGOALS)" = reconfigure; then \ |
| 60 | - echo 'Continuing with "make reconfigure".'; \ |
| 61 | - else \ |
| 62 | - echo "Makefile updated -- rerun your make command."; \ |
| 63 | - exit 1; \ |
| 64 | - fi \ |
| 65 | - fi |
| 66 | - |
| 67 | rsync-ssl: $(srcdir)/rsync-ssl.in Makefile |
| 68 | sed 's;\@bindir\@;$(bindir);g' <$(srcdir)/rsync-ssl.in >rsync-ssl |
| 69 | @chmod +x rsync-ssl |