comparison auto/make @ 8647:507da0d3b070 quic

Merged with the default branch.
author Sergey Kandaurov <pluknet@nginx.com>
date Tue, 24 Nov 2020 17:19:40 +0000
parents 38c0898b6df7 4b1299b1856a
children 046c951e393a
comparison
equal deleted inserted replaced
8646:4bf332873a83 8647:507da0d3b070
311 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX 311 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX
312 312
313 END 313 END
314 314
315 fi 315 fi
316 done 316 done
317 317
318 fi 318 fi
319 319
320 320
321 # the mail sources 321 # the mail sources
341 341
342 $ngx_obj: \$(CORE_DEPS) \$(MAIL_DEPS)$ngx_cont$ngx_src 342 $ngx_obj: \$(CORE_DEPS) \$(MAIL_DEPS)$ngx_cont$ngx_src
343 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX 343 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX
344 344
345 END 345 END
346 done 346 done
347 347
348 fi 348 fi
349 349
350 350
351 # the stream sources 351 # the stream sources
371 371
372 $ngx_obj: \$(CORE_DEPS) \$(STREAM_DEPS)$ngx_cont$ngx_src 372 $ngx_obj: \$(CORE_DEPS) \$(STREAM_DEPS)$ngx_cont$ngx_src
373 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX 373 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX
374 374
375 END 375 END
376 done 376 done
377 377
378 fi 378 fi
379 379
380 380
381 # the misc sources 381 # the misc sources
397 397
398 $ngx_obj: \$(CORE_DEPS) $ngx_cont$ngx_src 398 $ngx_obj: \$(CORE_DEPS) $ngx_cont$ngx_src
399 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX 399 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX
400 400
401 END 401 END
402 done 402 done
403 403
404 fi 404 fi
405 405
406 406
407 # the addons sources 407 # the addons sources
429 429
430 $ngx_obj: \$(ADDON_DEPS)$ngx_cont$ngx_src 430 $ngx_obj: \$(ADDON_DEPS)$ngx_cont$ngx_src
431 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX 431 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX
432 432
433 END 433 END
434 done 434 done
435 435
436 fi 436 fi
437 437
438 438
439 # the addons config.make 439 # the addons config.make
500 fi 500 fi
501 501
502 for ngx_module in $DYNAMIC_MODULES 502 for ngx_module in $DYNAMIC_MODULES
503 do 503 do
504 eval ngx_module_srcs="\$${ngx_module}_SRCS" 504 eval ngx_module_srcs="\$${ngx_module}_SRCS"
505 eval ngx_module_shrd="\$${ngx_module}_SHRD"
505 eval eval ngx_module_libs="\\\"\$${ngx_module}_LIBS\\\"" 506 eval eval ngx_module_libs="\\\"\$${ngx_module}_LIBS\\\""
506 507
507 eval ngx_module_modules="\$${ngx_module}_MODULES" 508 eval ngx_module_modules="\$${ngx_module}_MODULES"
508 eval ngx_module_order="\$${ngx_module}_ORDER" 509 eval ngx_module_order="\$${ngx_module}_ORDER"
509 510
565 566
566 ngx_modules_obj=`echo $ngx_modules_c \ 567 ngx_modules_obj=`echo $ngx_modules_c \
567 | sed -e "s/\(.*\.\)c/\1$ngx_objext/"` 568 | sed -e "s/\(.*\.\)c/\1$ngx_objext/"`
568 569
569 ngx_module_objs= 570 ngx_module_objs=
570 for ngx_src in $ngx_module_srcs 571 for ngx_src in $ngx_module_srcs $ngx_module_shrd
571 do 572 do
572 case "$ngx_src" in 573 case "$ngx_src" in
573 src/*) 574 src/*)
574 ngx_obj=$ngx_src 575 ngx_obj=$ngx_src
575 ;; 576 ;;