comparison auto/make @ 370:9a242235a80a NGINX_0_6_29

nginx 0.6.29 *) Feature: the ngx_google_perftools_module. *) Bugfix: the ngx_http_perl_module could be not built on 64-bit platforms; bug appeared in 0.6.27.
author Igor Sysoev <http://sysoev.ru>
date Tue, 18 Mar 2008 00:00:00 +0300
parents f745bf973510
children
comparison
equal deleted inserted replaced
369:5906b8639a07 370:9a242235a80a
4 4
5 mkdir -p $NGX_OBJS/src/core $NGX_OBJS/src/event $NGX_OBJS/src/event/modules \ 5 mkdir -p $NGX_OBJS/src/core $NGX_OBJS/src/event $NGX_OBJS/src/event/modules \
6 $NGX_OBJS/src/os/unix $NGX_OBJS/src/os/win32 \ 6 $NGX_OBJS/src/os/unix $NGX_OBJS/src/os/win32 \
7 $NGX_OBJS/src/http $NGX_OBJS/src/http/modules \ 7 $NGX_OBJS/src/http $NGX_OBJS/src/http/modules \
8 $NGX_OBJS/src/http/modules/perl \ 8 $NGX_OBJS/src/http/modules/perl \
9 $NGX_OBJS/src/mail 9 $NGX_OBJS/src/mail \
10 $NGX_OBJS/src/misc
10 11
11 12
12 ngx_objs_dir=$NGX_OBJS$ngx_regex_dirsep 13 ngx_objs_dir=$NGX_OBJS$ngx_regex_dirsep
13 ngx_use_pch=`echo $NGX_USE_PCH | sed -e "s/\//$ngx_regex_dirsep/g"` 14 ngx_use_pch=`echo $NGX_USE_PCH | sed -e "s/\//$ngx_regex_dirsep/g"`
14 15
123 MAIL_INCS = $ngx_include_opt$ngx_incs 124 MAIL_INCS = $ngx_include_opt$ngx_incs
124 125
125 END 126 END
126 127
127 fi 128 fi
129
130
131 ngx_all_srcs="$ngx_all_srcs $NGX_MISC_SRCS"
128 132
129 133
130 if test -n "$NGX_ADDON_SRCS"; then 134 if test -n "$NGX_ADDON_SRCS"; then
131 135
132 cat << END >> $NGX_MAKEFILE 136 cat << END >> $NGX_MAKEFILE
307 done 311 done
308 312
309 fi 313 fi
310 314
311 315
316 # the misc sources
317
318 if test -n "$NGX_MISC_SRCS"; then
319
320 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)"
321
322 for ngx_src in $NGX_MISC_SRCS
323 do
324 ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"`
325 ngx_obj=`echo $ngx_src \
326 | sed -e "s#^\(.*\.\)cpp\\$#$ngx_objs_dir\1$ngx_objext#g" \
327 -e "s#^\(.*\.\)cc\\$#$ngx_objs_dir\1$ngx_objext#g" \
328 -e "s#^\(.*\.\)c\\$#$ngx_objs_dir\1$ngx_objext#g" \
329 -e "s#^\(.*\.\)S\\$#$ngx_objs_dir\1$ngx_objext#g"`
330
331 cat << END >> $NGX_MAKEFILE
332
333 $ngx_obj: \$(CORE_DEPS) $ngx_cont$ngx_src
334 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX
335
336 END
337 done
338
339 fi
340
341
312 # the addons sources 342 # the addons sources
313 343
314 if test -n "$NGX_ADDON_SRCS"; then 344 if test -n "$NGX_ADDON_SRCS"; then
315 345
316 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)" 346 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)"