mirror of
https://github.com/ossrs/srs.git
synced 2025-02-12 11:21:52 +00:00
Fix make -jN random failed.
This commit is contained in:
parent
7f7b016b8e
commit
cee4feda61
3 changed files with 6 additions and 2 deletions
|
@ -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 '!';
|
||||
|
|
|
@ -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}
|
||||
|
|
4
trunk/configure
vendored
4
trunk/configure
vendored
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue