From 2dc370174aa4fcad6d933aa3b95bdf113d8d7f98 Mon Sep 17 00:00:00 2001 From: "Angelo Mantellini (manangel)" Date: Thu, 8 Jun 2017 16:31:55 +0200 Subject: correct makefile Change-Id: If4fc8a5552989a538a142074e17c7444a04b0c70 Signed-off-by: Angelo Mantellini (manangel) --- Makefile | 20 ++++++++------------ README.md | 5 +---- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index e115e137..b8a2a80a 100644 --- a/Makefile +++ b/Makefile @@ -132,27 +132,25 @@ curl-clean: @rm -rf ${DISTILLERY_INSTALL_DIR}/lib/libcurl* @rm -rf ${DISTILLERY_INSTALL_DIR}/include/curl -boost-clean: - @rm -rf ${DISTILLERY_INSTALL_DIR}/lib/libboost* - @rm -rf ${DISTILLERY_INSTALL_DIR}/include/boost - openssl-clean: @rm -rf ${DISTILLERY_INSTALL_DIR}/lib/libssl.* @rm -rf ${DISTILLERY_INSTALL_DIR}/lib/libcrypto.* @rm -rf ${DISTILLERY_INSTALL_DIR}/include/openssl @rm -rf external/openssl-1.0.2k* - @rm -rf external/crystax-ndk-10.3.2/sources/openssl/1.0.2k + @rm -rf ${NDK}/sources/openssl/1.0.2k + +boost-clean: + @rm -rf ${DISTILLERY_INSTALL_DIR}/lib/libboost* + @rm -rf ${DISTILLERY_INSTALL_DIR}/include/boost + @rm -rf external/boost_1_63_0 + @rm -rf external/boost_1_63_0.tar.gz -crystax-clean: - @rm -rf ${DISTILLERY_INSTALL_DIR}/lib/libxrystax.* event-clean: @rm -rf external/libevent @rm -rf ${DISTILLERY_INSTALL_DIR}/lib/libevent* @rm -rf ${DISTILLERY_INSTALL_DIR}/include/event2 -crystaxndk-clean: - @rm -rf external/crystax-ndk* xml2-clean: @rm -rf external/libxml2 @@ -165,7 +163,7 @@ xml2-clean: @rm -rf ${DISTILLERY_INSTALL_DIR}/include/win32config.h @rm -rf ${DISTILLERY_INSTALL_DIR}/include/wsockcompat.h -dependencies-clean: crystaxndk-clean event-clean crystax-clean openssl-clean boost-clean curl-clean xml2-clean +dependencies-clean: event-clean openssl-clean boost-clean curl-clean xml2-clean sdk-clean: @rm -rf sdk/android-sdk_* @@ -233,9 +231,7 @@ help: @echo "curl-clean - Clean curl files and libs" @echo "boost-clean - Clean boost files and libs" @echo "openssl-clean - Clean opennssl files and libs" - @echo "crystax-clean - Clean crystax files and libs" @echo "event-clean - Clean libevent files and libs" - @echo "crystaxndk-clean - Clean crystax ndk files" @echo "xml2-clean - Clean libxml2 files and libs" @echo "dependencies-clean - Clean all dependencies files and libs" @echo "sdk-clean - Clean sdk files" diff --git a/README.md b/README.md index 58f14085..6b311f85 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,6 @@ If Max Os X brew install automake libconf libtool ``` - ## Quick Start ## Clone this distro @@ -104,9 +103,7 @@ Here's a short summary: - `curl-clean` - Clean curl files and libs - `boost-clean` - Clean boost files and libs - `openssl-clean` - Clean opennssl files and libs -- `crystax-clean` - Clean crystax files and libs - `event-clean` - Clean libevent files and libs -- `crystaxndk-clean` - Clean crystax ndk files - `xml2-clean` - Clean libxml2 files and libs - `dependencies-clean` - Clean all dependencies files and libs - `sdk-clean` - Clean sdk files @@ -130,4 +127,4 @@ Here's a short summary: ## Configuration ## -Distillery can be configured in multiple ways. Please check the config directory (specifically `config/config.mk`) for more information. \ No newline at end of file +Distillery can be configured in multiple ways. Please check the config directory (specifically `config/config.mk`) for more information. -- cgit 1.2.3-korg