winlin

refine script, use PROTOCOL as RTMP.

@@ -154,7 +154,7 @@ KERNEL_INCS="src/kernel"; MODULE_DIR=${KERNEL_INCS} . auto/modules.sh @@ -154,7 +154,7 @@ KERNEL_INCS="src/kernel"; MODULE_DIR=${KERNEL_INCS} . auto/modules.sh
154 KERNEL_OBJS="${MODULE_OBJS[@]}" 154 KERNEL_OBJS="${MODULE_OBJS[@]}"
155 # 155 #
156 #RTMP Protocol, depends on core/kernel, provides rtmp/htttp protocol features. 156 #RTMP Protocol, depends on core/kernel, provides rtmp/htttp protocol features.
157 -MODULE_ID="RTMP" 157 +MODULE_ID="PROTOCOL"
158 MODULE_DEPENDS=("CORE" "KERNEL") 158 MODULE_DEPENDS=("CORE" "KERNEL")
159 ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot}) 159 ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot})
160 MODULE_FILES=("srs_rtmp_amf0" "srs_rtmp_io" "srs_rtmp_stack" "srs_rtmp_sdk" 160 MODULE_FILES=("srs_rtmp_amf0" "srs_rtmp_io" "srs_rtmp_stack" "srs_rtmp_sdk"
@@ -166,7 +166,7 @@ RTMP_OBJS="${MODULE_OBJS[@]}" @@ -166,7 +166,7 @@ RTMP_OBJS="${MODULE_OBJS[@]}"
166 #App Module 166 #App Module
167 if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then 167 if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
168 MODULE_ID="APP" 168 MODULE_ID="APP"
169 - MODULE_DEPENDS=("CORE" "KERNEL" "RTMP") 169 + MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL")
170 ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${SRS_OBJS_DIR}) 170 ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${SRS_OBJS_DIR})
171 MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_rtmp_conn" "srs_app_st_socket" "srs_app_source" 171 MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_rtmp_conn" "srs_app_st_socket" "srs_app_source"
172 "srs_app_refer" "srs_app_hls" "srs_app_forward" "srs_app_encoder" 172 "srs_app_refer" "srs_app_hls" "srs_app_forward" "srs_app_encoder"
@@ -190,7 +190,7 @@ fi @@ -190,7 +190,7 @@ fi
190 # 190 #
191 #LIBS Module, build libsrs.a for static link. 191 #LIBS Module, build libsrs.a for static link.
192 MODULE_ID="LIBS" 192 MODULE_ID="LIBS"
193 -MODULE_DEPENDS=("CORE" "KERNEL" "RTMP") 193 +MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL")
194 ModuleLibIncs=(${SRS_OBJS_DIR}) 194 ModuleLibIncs=(${SRS_OBJS_DIR})
195 MODULE_FILES=("srs_librtmp" "srs_lib_simple_socket" "srs_lib_bandwidth") 195 MODULE_FILES=("srs_librtmp" "srs_lib_simple_socket" "srs_lib_bandwidth")
196 LIBS_INCS="src/libs"; MODULE_DIR=${LIBS_INCS} . auto/modules.sh 196 LIBS_INCS="src/libs"; MODULE_DIR=${LIBS_INCS} . auto/modules.sh
@@ -199,7 +199,7 @@ LIBS_OBJS="${MODULE_OBJS[@]}" @@ -199,7 +199,7 @@ LIBS_OBJS="${MODULE_OBJS[@]}"
199 #Main Module 199 #Main Module
200 if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then 200 if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
201 MODULE_ID="MAIN" 201 MODULE_ID="MAIN"
202 - MODULE_DEPENDS=("CORE" "KERNEL" "RTMP" "APP") 202 + MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL" "APP")
203 ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS_DIR} ${LibGperfRoot} ${LibHttpParserRoot}) 203 ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS_DIR} ${LibGperfRoot} ${LibHttpParserRoot})
204 MODULE_FILES=("srs_main_server" "srs_main_ingest_hls") 204 MODULE_FILES=("srs_main_server" "srs_main_ingest_hls")
205 # add each modules for main 205 # add each modules for main
@@ -257,7 +257,7 @@ if [ $SRS_UTEST = YES ]; then @@ -257,7 +257,7 @@ if [ $SRS_UTEST = YES ]; then
257 "srs_utest_reload") 257 "srs_utest_reload")
258 ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSTRoot} ${LibSSLRoot}) 258 ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSTRoot} ${LibSSLRoot})
259 ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile}) 259 ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile})
260 - MODULE_DEPENDS=("CORE" "KERNEL" "RTMP" "APP") 260 + MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL" "APP")
261 MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${RTMP_OBJS[@]} ${APP_OBJS[@]}" 261 MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${RTMP_OBJS[@]} ${APP_OBJS[@]}"
262 LINK_OPTIONS="-lpthread ${SrsLinkOptions}" MODULE_DIR="src/utest" APP_NAME="srs_utest" . auto/utest.sh 262 LINK_OPTIONS="-lpthread ${SrsLinkOptions}" MODULE_DIR="src/utest" APP_NAME="srs_utest" . auto/utest.sh
263 fi 263 fi