From cee4feda61ce667fe319a8a89ecbb70c273d22c0 Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 20 Dec 2019 11:49:27 +0800 Subject: [PATCH] Fix make -jN random failed. --- trunk/auto/apps.sh | 3 +++ trunk/auto/libs.sh | 1 + trunk/configure | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/trunk/auto/apps.sh b/trunk/auto/apps.sh index 59fc92672..aaccac70d 100755 --- a/trunk/auto/apps.sh +++ b/trunk/auto/apps.sh @@ -23,6 +23,8 @@ echo "# build ${APP_TARGET}" >> ${FILE} # generate the binary depends, for example: # srs: objs/srs echo "${BUILD_KEY}: ${APP_TARGET}" >> ${FILE} +echo "" >> ${FILE} + # the link commands, for example: # objs/srs: objs/src/core/srs_core.o echo -n "${APP_TARGET}: " >> ${FILE} @@ -88,5 +90,6 @@ done # link options. echo -n "${LINK_OPTIONS}" >> ${FILE} echo "" >> ${FILE} +echo "" >> ${FILE} echo -n "Generate app ${APP_NAME} ok"; echo '!'; diff --git a/trunk/auto/libs.sh b/trunk/auto/libs.sh index 89f4e8ccd..af1103414 100755 --- a/trunk/auto/libs.sh +++ b/trunk/auto/libs.sh @@ -19,6 +19,7 @@ echo "Generating lib ${LIB_NAME} depends." echo "" >> ${FILE} echo "# archive library ${LIB_TAGET_STATIC}" >> ${FILE} echo "${BUILD_KEY}: ${LIB_TAGET_STATIC}" >> ${FILE} +echo "" >> ${FILE} # build depends echo -n "${LIB_TAGET_STATIC}: " >> ${FILE} diff --git a/trunk/configure b/trunk/configure index 23119b755..bcffc0dc3 100755 --- a/trunk/configure +++ b/trunk/configure @@ -429,13 +429,13 @@ for SRS_MODULE in ${SRS_MODULES[*]}; do # if export librtmp, donot build the bravo-ingest. if [ $SRS_EXPORT_LIBRTMP_PROJECT != NO ]; then cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} -$SRS_MODULE_NAME: _prepare_dir +$SRS_MODULE_NAME: _prepare_dir server @echo "Ingore the $SRS_MODULE_NAME for srs-librtmp" END else cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} -$SRS_MODULE_NAME: _prepare_dir +$SRS_MODULE_NAME: _prepare_dir server @echo "Build the $SRS_MODULE_NAME over SRS" \$(MAKE) -f ${SRS_OBJS_DIR}/${SRS_MAKEFILE} $SRS_MODULE_NAME