From 1c659874727719a5097ea6c287b80725d9d6826c Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 29 Mar 2020 16:51:56 +0800 Subject: [PATCH] Refine links use relative path --- trunk/auto/depends.sh | 15 +++++++++++++-- trunk/configure | 6 +++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index f31f3696c..454990507 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -327,9 +327,20 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then echo "Building state-threads."; ( rm -rf ${SRS_OBJS}/${SRS_PLATFORM}/st-srs && mkdir -p ${SRS_OBJS}/${SRS_PLATFORM}/st-srs && + # Create a hidden directory .src cd ${SRS_OBJS}/${SRS_PLATFORM}/st-srs && ln -sf ../../../3rdparty/st-srs .src && - for dir in `(cd .src && find . -type d|grep '\./'|grep -v Linux|grep -v Darwin)`; do mkdir -p $dir; done && - for file in `(cd .src && find . -type f ! -name '*.o' ! -name '*.d'|grep -v '\/\.')`; do ln -sf `pwd`/.src/$file $file; done && + # Link source files under .src + for file in `(cd .src && find . -maxdepth 1 -type f ! -name '*.o' ! -name '*.d')`; do + ln -sf .src/$file $file; + done && + # Link source files under .src/xxx, the first child dir. + for dir in `(cd .src && find . -type d|grep '\./'|grep -v Linux|grep -v Darwin)`; do + mkdir -p $dir && + for file in `(cd .src/$dir && find . -maxdepth 1 -type f ! -name '*.o' ! -name '*.d')`; do + ln -sf .src/$dir/$file $dir/$file; + done; + done && + # Build source code. make ${_ST_MAKE} EXTRA_CFLAGS="${_ST_EXTRA_CFLAGS}" \ CC=${SRS_TOOL_CC} AR=${SRS_TOOL_AR} LD=${_ST_LD} RANDLIB=${SRS_TOOL_RANDLIB} && cd .. && rm -f st && ln -sf st-srs/${_ST_OBJ} st diff --git a/trunk/configure b/trunk/configure index b8d13c3f3..d3750ba8b 100755 --- a/trunk/configure +++ b/trunk/configure @@ -388,15 +388,15 @@ doclean: (cd research/librtmp && make clean) (cd research/api-server/static-dir && rm -rf crossdomain.xml forward live players) -clean: clean_srs clean_modules clean_st clean_openssl clean_ffmpeg clean_nginx clean_cherrypy +clean: clean_srs clean_modules @echo "You can clean each some components, see make help" -destroy: +destroy: clean_st clean_openssl clean_ffmpeg clean_nginx clean_cherrypy (cd ${SRS_OBJS_DIR} && rm -rf ${SRS_PLATFORM}) clean_srs: (cd ${SRS_OBJS_DIR} && rm -rf srs srs_utest) - (cd ${SRS_OBJS_DIR}/${SRS_PLATFORM} && rm -rf include lib utest) + (cd ${SRS_OBJS_DIR}/${SRS_PLATFORM} && rm -rf src include lib utest) clean_modules: (cd ${SRS_OBJS_DIR} && rm -rf $__mdefaults)