mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
Squash: Merge 4.0.201
This commit is contained in:
parent
a862573220
commit
e16830e989
14 changed files with 518 additions and 1143 deletions
7
trunk/configure
vendored
7
trunk/configure
vendored
|
@ -447,7 +447,7 @@ mv ${SRS_WORKDIR}/${SRS_MAKEFILE} ${SRS_WORKDIR}/${SRS_MAKEFILE}.bk
|
|||
|
||||
# generate phony header
|
||||
cat << END > ${SRS_WORKDIR}/${SRS_MAKEFILE}
|
||||
.PHONY: default _default install help clean destroy server srs_ingest_hls utest _prepare_dir $__mphonys
|
||||
.PHONY: default all _default install help clean destroy server srs_ingest_hls utest _prepare_dir $__mphonys
|
||||
.PHONY: clean_srs clean_modules clean_openssl clean_srtp2 clean_opus clean_ffmpeg clean_st
|
||||
.PHONY: st ffmpeg
|
||||
|
||||
|
@ -462,8 +462,9 @@ CXXFLAGS = ${CXXFLAGS}
|
|||
SRS_PREFIX=${SRS_PREFIX}
|
||||
__REAL_INSTALL=\$(DESTDIR)\$(SRS_PREFIX)
|
||||
|
||||
default:
|
||||
\$(MAKE) _default
|
||||
default: server
|
||||
|
||||
all: _default
|
||||
|
||||
END
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue