From 473b86a8e621c5f22f4e5b6afd8c733cb5300fb1 Mon Sep 17 00:00:00 2001
From: arvidn <arvid@libtorrent.org>
Date: Fri, 29 Dec 2017 10:50:48 +0100
Subject: [PATCH] cleanup tarball build script

---
 build_dist.sh  | 20 +++++---------------
 tools/clean.py |  6 ++++++
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/build_dist.sh b/build_dist.sh
index 8269755c4..a03cbe4e2 100755
--- a/build_dist.sh
+++ b/build_dist.sh
@@ -1,25 +1,15 @@
 #!/bin/sh
 
-make clean
+set -e
+set -x
+
+python tools/clean.py
 
 cd docs
-make clean
-make RST2HTML=rst2html.py
+make RST2HTML=rst2html-2.7.py
 cd ..
 
-#clear out any extended attributes that Finder may add
-sudo xattr -r -d com.apple.FinderInfo *
-
-rm -f config.log config.report configure
 rm -f m4/libtool.m4 m4/lt~obsolete.m4 m4/ltsugar.m4 m4/ltversion.m4 m4/ltoptions.m4
-rm -fr autom4te.cache build-aux
-rm -f Makefile Makefile.in
-rm -f src/Makefile src/Makefile.in
-rm -f include/libtorrent/Makefile include/libtorrent/Makefile.in
-rm -f examples/Makefile examples/Makefile.in examples/.dep examples/.libs
-rm -rf test/Makefile test/Makefile.in test/.dep test/.lib
-rm -rf bindings/Makefile bindings/Makefile.in bindings/.dep bindings/.libs
-rm -f bindings/python/Makefile bindings/python/Makefile.in
 chmod a-x docs/*.rst docs/*.htm* src/*.cpp include/libtorrent/*.hpp
 
 ./autotool.sh
diff --git a/tools/clean.py b/tools/clean.py
index 83df9d346..33677da11 100755
--- a/tools/clean.py
+++ b/tools/clean.py
@@ -13,6 +13,7 @@ def clean():
 		'upnp.log',
 		'natpmp.log',
 		'bin',
+		'build-aux',
 		'.deps',
 		'test_tmp_*',
 		'bjam_build.*.xml'
@@ -33,6 +34,11 @@ def clean():
 		'lib*.a',
 		'Jamfile.rej',
 		'Jamfile.orig',
+		'autom4te.cache',
+		'configure',
+		'config.report',
+		'config.log',
+		'.lib',
 	]
 
 	directories = [