diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 0b0682237..0feb9d29b 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -476,6 +476,10 @@ if [[ $SRS_SSL == YES && $SRS_USE_SYS_SSL != YES ]]; then ln -sf /usr/local/include/openssl) fi fi + # For osx, if exists openssl, use it. + if [[ $SRS_OSX == YES && -f ${SRS_OBJS}/openssl-1.1.0e/_release/lib/libssl.a ]]; then + (cd ${SRS_OBJS} && rm -rf openssl && ln -sf openssl-1.1.0e/_release openssl) + fi # cross build not specified, if exists flag, need to rebuild for no-arm platform. if [[ -f ${SRS_OBJS}/openssl/lib/libssl.a ]]; then echo "Openssl-1.1.0e is ok."; diff --git a/trunk/configure b/trunk/configure index 99852914d..9fdae1440 100755 --- a/trunk/configure +++ b/trunk/configure @@ -440,7 +440,7 @@ mv ${SRS_WORKDIR}/${SRS_MAKEFILE} ${SRS_WORKDIR}/${SRS_MAKEFILE}.bk # generate phony header cat << END > ${SRS_WORKDIR}/${SRS_MAKEFILE} -.PHONY: default _default install install-api help clean server srs_ingest_hls librtmp utest _prepare_dir $__mphonys +.PHONY: default _default install install-api help clean destroy server srs_ingest_hls librtmp utest _prepare_dir $__mphonys # install prefix. SRS_PREFIX=${SRS_PREFIX} @@ -462,6 +462,7 @@ help: @echo "Usage: make |||||||" @echo " help display this help menu" @echo " clean cleanup project" + @echo " destroy cleanup project and depends" @echo " server build the srs(simple rtmp server) over st(state-threads)" @echo " librtmp build the client publish/play library, and samples" @echo " utest build the utest for srs" @@ -480,6 +481,11 @@ clean: (cd research/librtmp && make clean) (cd research/api-server/static-dir && rm -rf crossdomain.xml forward live players) +destroy: clean + (cd ${SRS_OBJS_DIR} && rm -rf opus srtp2 st st-srs openssl ffmpeg) + (cd 3rdparty/st-srs && make clean && rm -rf LINUX_* DARWIN_*) + (cd 3rdparty/ffmpeg-4.2-fit && make clean && rm -rf _release) + END # for Makefile of all modules.