comparison auto/make @ 6382:392959224560

Dynamic modules: auto/module script. This script simplifies configuration of additional modules, including 3rd party ones. The script is extensible, and will be used to introduce dynamic linking of modules in upcoming changes. 3rd party module config scripts are called with ngx_module_link preset to "ADDON" - this allows config scripts to call auto/module without ngx_module_link explicitly defined, as well as testing if new interface is in place if compatibility with older nginx versions is desired. In collaboration with Ruslan Ermilov.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 04 Feb 2016 18:30:21 +0300
parents 257b51c37c5a
children 85dea406e18f
comparison
equal deleted inserted replaced
6381:c529555949b7 6382:392959224560
146 END 146 END
147 147
148 fi 148 fi
149 149
150 150
151 ngx_all_srcs="$ngx_all_srcs $NGX_MISC_SRCS" 151 ngx_all_srcs="$ngx_all_srcs $MISC_SRCS"
152 152
153 153
154 if test -n "$NGX_ADDON_SRCS"; then 154 if test -n "$NGX_ADDON_SRCS"; then
155 155
156 cat << END >> $NGX_MAKEFILE 156 cat << END >> $NGX_MAKEFILE
363 fi 363 fi
364 364
365 365
366 # the misc sources 366 # the misc sources
367 367
368 if test -n "$NGX_MISC_SRCS"; then 368 if test -n "$MISC_SRCS"; then
369 369
370 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)" 370 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)"
371 371
372 for ngx_src in $NGX_MISC_SRCS 372 for ngx_src in $MISC_SRCS
373 do 373 do
374 ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"` 374 ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"`
375 ngx_obj=`echo $ngx_src \ 375 ngx_obj=`echo $ngx_src \
376 | sed -e "s#^\(.*\.\)cpp\\$#$ngx_objs_dir\1$ngx_objext#g" \ 376 | sed -e "s#^\(.*\.\)cpp\\$#$ngx_objs_dir\1$ngx_objext#g" \
377 -e "s#^\(.*\.\)cc\\$#$ngx_objs_dir\1$ngx_objext#g" \ 377 -e "s#^\(.*\.\)cc\\$#$ngx_objs_dir\1$ngx_objext#g" \