Mercurial > hg > nginx

comparison auto/make @ 6804:2c7a2d75938a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Configure: honor dependencies of dynamic modules. Dependencies of dynamic modules are added to NGX_ADDON_DEPS (and it is now used for dynamic modules) to be in line with what happens in case of static compilation. To avoid duplication, MAIL_DEPS and STREAM_DEPS are no longer passed to auto/module when these modules are compiled as dynamic ones. Mail and stream dependencies are handled explicitly via corresponding variables.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 21 Nov 2016 16:49:19 +0300
parents 0d2956dfc4e6
children 2d9ab7717e23
comparison
equal deleted inserted replaced
6803:8bd659ff4231 6804:2c7a2d75938a
154 154
155 155
156 ngx_all_srcs="$ngx_all_srcs $MISC_SRCS" 156 ngx_all_srcs="$ngx_all_srcs $MISC_SRCS"
157 157
158 158
159 if test -n "$NGX_ADDON_SRCS"; then 159 if test -n "$NGX_ADDON_SRCS$DYNAMIC_MODULES"; then
160 160
161 cat << END >> $NGX_MAKEFILE 161 cat << END >> $NGX_MAKEFILE
162 162
163 ADDON_DEPS = \$(CORE_DEPS) $NGX_ADDON_DEPS 163 ADDON_DEPS = \$(CORE_DEPS) $NGX_ADDON_DEPS
164 164
495 ngx_cc="\$(CC) $ngx_compile_opt $ngx_pic_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)" 495 ngx_cc="\$(CC) $ngx_compile_opt $ngx_pic_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)"
496 else 496 else
497 ngx_cc="\$(CC) $ngx_compile_opt $ngx_pic_opt \$(CFLAGS) \$(ALL_INCS)" 497 ngx_cc="\$(CC) $ngx_compile_opt $ngx_pic_opt \$(CFLAGS) \$(ALL_INCS)"
498 ngx_perl_cc="\$(CC) $ngx_compile_opt $ngx_pic_opt \$(NGX_PERL_CFLAGS)" 498 ngx_perl_cc="\$(CC) $ngx_compile_opt $ngx_pic_opt \$(NGX_PERL_CFLAGS)"
499 ngx_perl_cc="$ngx_perl_cc \$(ALL_INCS)" 499 ngx_perl_cc="$ngx_perl_cc \$(ALL_INCS)"
500 fi
501
502 ngx_obj_deps="\$(CORE_DEPS)"
503 if [ $HTTP != NO ]; then
504 ngx_obj_deps="$ngx_obj_deps \$(HTTP_DEPS)"
505 fi
506 if [ $MAIL != NO ]; then
507 ngx_obj_deps="$ngx_obj_deps \$(MAIL_DEPS)"
508 fi
509 if [ $STREAM != NO ]; then
510 ngx_obj_deps="$ngx_obj_deps \$(STREAM_DEPS)"
511 fi 500 fi
512 501
513 for ngx_module in $DYNAMIC_MODULES 502 for ngx_module in $DYNAMIC_MODULES
514 do 503 do
515 eval ngx_module_srcs="\$${ngx_module}_SRCS" 504 eval ngx_module_srcs="\$${ngx_module}_SRCS"
663 652
664 if [ $ngx_source = src/http/modules/perl/ngx_http_perl_module.c ]; then 653 if [ $ngx_source = src/http/modules/perl/ngx_http_perl_module.c ]; then
665 654
666 cat << END >> $NGX_MAKEFILE 655 cat << END >> $NGX_MAKEFILE
667 656
668 $ngx_obj: $ngx_obj_deps$ngx_cont$ngx_src 657 $ngx_obj: \$(ADDON_DEPS)$ngx_cont$ngx_src
669 $ngx_perl_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX 658 $ngx_perl_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX
670 659
671 END 660 END
672 else 661 else
673 662
674 cat << END >> $NGX_MAKEFILE 663 cat << END >> $NGX_MAKEFILE
675 664
676 $ngx_obj: $ngx_obj_deps$ngx_cont$ngx_src 665 $ngx_obj: \$(ADDON_DEPS)$ngx_cont$ngx_src
677 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX 666 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX
678 667
679 END 668 END
680 669
681 fi 670 fi