]> git.lizzy.rs Git - dragonfireclient.git/commitdiff
Android: Remove unused build target curl_binary
authorSapier <sapier AT gmx dot net>
Thu, 17 Dec 2015 19:51:54 +0000 (20:51 +0100)
committerSapier <sapier AT gmx dot net>
Thu, 17 Dec 2015 22:00:51 +0000 (23:00 +0100)
build/android/Makefile

index 0a817c97f5710aa65fe41a3c0d6f276e8de8d945..dd6c89ad93942d40a8c7ceca0fbc8a32c5c85566 100644 (file)
@@ -168,7 +168,7 @@ endif
        $(ASSETS_TIMESTAMP) $(LEVELDB_TIMESTAMP) \
        $(OPENAL_TIMESTAMP) $(OGG_TIMESTAMP) \
        $(IRRLICHT_TIMESTAMP) $(CURL_TIMESTAMP) \
        $(ASSETS_TIMESTAMP) $(LEVELDB_TIMESTAMP) \
        $(OPENAL_TIMESTAMP) $(OGG_TIMESTAMP) \
        $(IRRLICHT_TIMESTAMP) $(CURL_TIMESTAMP) \
-       $(OPENSSL_TIMESTAMP) curl_binary \
+       $(OPENSSL_TIMESTAMP) \
        $(ROOT)/jni/src/android_version.h \
        $(ROOT)/jni/src/android_version_githash.h
 
        $(ROOT)/jni/src/android_version.h \
        $(ROOT)/jni/src/android_version_githash.h
 
@@ -625,18 +625,6 @@ clean_curl :
        $(RM) -rf deps/curl-${CURL_VERSION}                                        \
        $(RM) -f deps/curl
 
        $(RM) -rf deps/curl-${CURL_VERSION}                                        \
        $(RM) -f deps/curl
 
-
-curl_binary:
-       @if [ ! -d "deps/curl-${CURL_VERSION_BINARY}" ] ; then                     \
-               echo "curl binary missing, downloading...";                           \
-               mkdir -p ${ROOT}/deps;                                                 \
-               cd deps;                                                               \
-               wget http://curl.haxx.se/gknw.net/7.34.0/dist-android/curl-7.34.0-rtmp-ssh2-ssl-zlib-static-bin-android.tar.gz || exit 1;\
-               tar -xzf curl-7.34.0-rtmp-ssh2-ssl-zlib-static-bin-android.tar.gz || exit 1;\
-               mv curl-7.34.0-rtmp-ssh2-ssl-zlib-static-bin-android curl-${CURL_VERSION_BINARY};\
-               rm curl-7.34.0-rtmp-ssh2-ssl-zlib-static-bin-android.tar.gz;           \
-       fi
-
 $(GMP_TIMESTAMP) : gmp_download
        @LAST_MODIF=$$(find ${GMP_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
        if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then                     \
 $(GMP_TIMESTAMP) : gmp_download
        @LAST_MODIF=$$(find ${GMP_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
        if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then                     \