Merge branch 'develop' of https://github.com/skalenetwork/sgxwallet into develop

README.md

@@ -48,11 +48,6 @@ If you do not see the `isgx` device, you need to troubleshoot your driver instal
 
 `cd scripts; sudo ./install_packages.sh`
 
-## Install automake 1.15
-
-Currently the build builds with automake 1.15. You need to install it since Ubuntu 18 comes with automake 1.16 by default.
-
-`cd scripts; sudo dpkg -i automake_1.15.1-3ubuntu2_all.deb`
 
 ## Build dependencies
 

scripts/build.py

@@ -81,32 +81,15 @@ BLS_DIR = topDir +  "/libBLS"
 BLS_BUILD_DIR = BLS_DIR + "/build"
 
 
-AUTOMAKE_DIR = "/usr/share/automake-1.15"
-
-if not os.path.isdir(AUTOMAKE_DIR):
-    raise Exception("Could not find " + AUTOMAKE_DIR)
 
 
 
 
 subprocess.call(["git", "submodule",  "update", "--init"])
 
-subprocess.call(["rm", "-f",  "install-sh"])
-subprocess.call(["rm", "-f",  "compile"])
-subprocess.call(["rm", "-f",  "missing"])
-subprocess.call(["rm", "-f",  "depcomp"])
-
 subprocess.call(["rm", "-rf",  GMP_BUILD_DIR])
 subprocess.call(["rm", "-rf", TGMP_BUILD_DIR])
 subprocess.call(["rm", "-rf", SDK_DIR])
-
-
-
-subprocess.call(["ln", "-s", AUTOMAKE_DIR + "/install-sh", "install-sh"])
-subprocess.call(["ln", "-s", AUTOMAKE_DIR + "/depcomp", "depcomp"])
-subprocess.call(["ln", "-s", AUTOMAKE_DIR + "/missing", "missing"])
-subprocess.call(["ln", "-s", AUTOMAKE_DIR + "/compile", "compile"])
-
 assert subprocess.call(["cp", "configure.gmp", GMP_DIR + "/configure"]) == 0
 
 os.chdir(LEVELDB_DIR);
@@ -166,7 +149,7 @@ print "===>>> Making SSL  project"
 
 os.chdir(SSL_MAKE_DIR);
 
-assert subprocess.call(["make",   "SGX_SDK=" + SGX_SDK_DIR_SSL, "all",  "test"]) == 0
+assert subprocess.call(["make",   "SGX_SDK=" + SGX_SDK_DIR_SSL, "all"]) == 0
 
 os.chdir(topDir)