Mercurial > hg > nginx-quic
annotate auto/make @ 573:58475592100c release-0.3.8
nginx-0.3.8-RELEASE import
*) Security: nginx now checks URI got from a backend in
"X-Accel-Redirect" header line or in SSI file for the "/../" paths
and zeroes.
*) Change: nginx now does not treat the empty user name in the
"Authorization" header line as valid one.
*) Feature: the "ssl_session_timeout" directives of the
ngx_http_ssl_module and ngx_imap_ssl_module.
*) Feature: the "auth_http_header" directive of the
ngx_imap_auth_http_module.
*) Feature: the "add_header" directive.
*) Feature: the ngx_http_realip_module.
*) Feature: the new variables to use in the "log_format" directive:
$bytes_sent, $apache_bytes_sent, $status, $time_gmt, $uri,
$request_time, $request_length, $upstream_status,
$upstream_response_time, $gzip_ratio, $uid_got, $uid_set,
$connection, $pipe, and $msec. The parameters in the "%name" form
will be canceled soon.
*) Change: now the false variable values in the "if" directive are the
empty string "" and string starting with "0".
*) Bugfix: while using proxied or FastCGI-server nginx may leave
connections and temporary files with client requests in open state.
*) Bugfix: the worker processes did not flush the buffered logs on
graceful exit.
*) Bugfix: if the request URI was changes by the "rewrite" directive
and the request was proxied in location given by regular expression,
then the incorrect request was transferred to backend; the bug had
appeared in 0.2.6.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" header.
*) Bugfix: nginx may stop to accept requests if the "rtsig" method and
several worker processes were used.
*) Bugfix: the "\"" and "\'" escape symbols were incorrectly handled in
SSI commands.
*) Bugfix: if the response was ended just after the SSI command and
gzipping was used, then the response did not transferred complete or
did not transferred at all.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 09 Nov 2005 17:25:55 +0000 |
parents | e48ebafc6939 |
children | 425af804d968 |
rev | line source |
---|---|
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
417
diff
changeset
|
1 |
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
417
diff
changeset
|
2 # Copyright (C) Igor Sysoev |
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
417
diff
changeset
|
3 |
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
4 |
469 | 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 \ | |
7 $NGX_OBJS/src/http $NGX_OBJS/src/http/modules \ | |
8 $NGX_OBJS/src/http/modules/proxy \ | |
9 $NGX_OBJS/src/imap | |
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
10 |
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
11 |
455 | 12 ngx_objs_dir=$NGX_OBJS$ngx_regex_dirsep |
13 ngx_use_pch=`echo $NGX_USE_PCH | sed -e "s/\//$ngx_regex_dirsep/g"` | |
280
7c7183b3ea8b
nginx-0.0.2-2004-03-05-11:34:24 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
14 |
7c7183b3ea8b
nginx-0.0.2-2004-03-05-11:34:24 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
15 |
467 | 16 cat << END > $NGX_MAKEFILE |
280
7c7183b3ea8b
nginx-0.0.2-2004-03-05-11:34:24 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
17 |
455 | 18 CC = $CC |
19 CFLAGS = $CFLAGS | |
20 CPP = $CPP | |
21 LINK = $LINK | |
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
22 |
455 | 23 END |
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
24 |
455 | 25 if [ "$CC" = wcl386 ]; then |
26 echo MAKE = wmake >> $NGX_MAKEFILE | |
280
7c7183b3ea8b
nginx-0.0.2-2004-03-05-11:34:24 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
27 |
455 | 28 ngx_regex_cont=' ' |
573 | 29 ngx_long_regex_cont=' ' |
455 | 30 ngx_cont=' ' |
573 | 31 ngx_long_cont=' ' |
455 | 32 ngx_tab=' ' |
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
33 |
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
34 fi |
280
7c7183b3ea8b
nginx-0.0.2-2004-03-05-11:34:24 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
35 |
7c7183b3ea8b
nginx-0.0.2-2004-03-05-11:34:24 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
36 |
489 | 37 # ALL_INCS, required by the addons and by OpenWatcom C precompiled headers |
455 | 38 |
469 | 39 ngx_incs=`echo $CORE_INCS $NGX_OBJS $HTTP_INCS $IMAP_INCS\ |
455 | 40 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont$ngx_include_opt\1/g" \ |
41 -e "s/\//$ngx_regex_dirsep/g"` | |
42 | |
43 cat << END >> $NGX_MAKEFILE | |
44 | |
45 ALL_INCS = $ngx_include_opt$ngx_incs | |
46 | |
47 END | |
48 | |
49 | |
50 ngx_all_srcs="$CORE_SRCS" | |
51 | |
52 | |
53 # the core dependences and include pathes | |
54 | |
467 | 55 ngx_deps=`echo $CORE_DEPS $NGX_AUTO_CONFIG_H $NGX_PCH \ |
455 | 56 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \ |
57 -e "s/\//$ngx_regex_dirsep/g"` | |
58 | |
469 | 59 ngx_incs=`echo $CORE_INCS $NGX_OBJS \ |
455 | 60 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont$ngx_include_opt\1/g" \ |
61 -e "s/\//$ngx_regex_dirsep/g"` | |
62 | |
63 cat << END >> $NGX_MAKEFILE | |
64 | |
65 CORE_DEPS = $ngx_deps | |
66 | |
67 | |
68 CORE_INCS = $ngx_include_opt$ngx_incs | |
69 | |
70 END | |
71 | |
72 | |
73 # the http dependences and include pathes | |
74 | |
75 if [ $HTTP = YES ]; then | |
76 | |
77 ngx_all_srcs="$ngx_all_srcs $HTTP_SRCS" | |
78 | |
79 ngx_deps=`echo $HTTP_DEPS \ | |
80 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \ | |
81 -e "s/\//$ngx_regex_dirsep/g"` | |
82 | |
83 ngx_incs=`echo $HTTP_INCS \ | |
84 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont$ngx_include_opt\1/g" \ | |
85 -e "s/\//$ngx_regex_dirsep/g"` | |
86 | |
87 cat << END >> $NGX_MAKEFILE | |
88 | |
89 HTTP_DEPS = $ngx_deps | |
90 | |
91 | |
92 HTTP_INCS = $ngx_include_opt$ngx_incs | |
93 | |
94 END | |
95 | |
96 fi | |
97 | |
98 | |
99 # the imap dependences and include pathes | |
100 | |
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
101 if [ $IMAP = YES ]; then |
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
102 |
455 | 103 ngx_all_srcs="$ngx_all_srcs $IMAP_SRCS" |
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
104 |
455 | 105 ngx_deps=`echo $IMAP_DEPS \ |
106 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \ | |
107 -e "s/\//$ngx_regex_dirsep/g"` | |
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
108 |
455 | 109 ngx_incs=`echo $IMAP_INCS \ |
110 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont$ngx_include_opt\1/g" \ | |
111 -e "s/\//$ngx_regex_dirsep/g"` | |
280
7c7183b3ea8b
nginx-0.0.2-2004-03-05-11:34:24 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
112 |
455 | 113 cat << END >> $NGX_MAKEFILE |
114 | |
115 IMAP_DEPS = $ngx_deps | |
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
116 |
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
117 |
455 | 118 IMAP_INCS = $ngx_include_opt$ngx_incs |
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
119 |
455 | 120 END |
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
121 |
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
122 fi |
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
123 |
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
124 |
489 | 125 if test -n "$NGX_ADDON_SRCS"; then |
126 | |
127 cat << END >> $NGX_MAKEFILE | |
128 | |
541 | 129 ADDON_DEPS = \$(CORE_DEPS) $NGX_ADDON_DEPS |
489 | 130 |
131 END | |
132 | |
133 fi | |
134 | |
135 | |
280
7c7183b3ea8b
nginx-0.0.2-2004-03-05-11:34:24 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
136 # nginx |
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
137 |
455 | 138 ngx_all_srcs=`echo $ngx_all_srcs | sed -e "s/\//$ngx_regex_dirsep/g"` |
489 | 139 |
140 for ngx_src in $NGX_ADDON_SRCS | |
141 do | |
142 ngx_obj="addon/`basename \`dirname $ngx_src\``" | |
143 | |
144 test -d $NGX_OBJS/$ngx_obj || mkdir -p $NGX_OBJS/$ngx_obj | |
145 | |
146 ngx_obj=`echo $ngx_obj/\`basename $ngx_src\` \ | |
147 | sed -e "s/\//$ngx_regex_dirsep/g"` | |
148 | |
149 ngx_all_srcs="$ngx_all_srcs $ngx_obj" | |
150 done | |
278
0ba4821f4460
nginx-0.0.2-2004-03-04-10:04:55 import
Igor Sysoev <igor@sysoev.ru>
parents:
267
diff
changeset
|
151 |
455 | 152 ngx_all_objs=`echo $ngx_all_srcs \ |
153 | sed -e "s/\([^ ]*\.\)cpp/$NGX_OBJS\/\1$ngx_objext/g" \ | |
154 -e "s/\([^ ]*\.\)cc/$NGX_OBJS\/\1$ngx_objext/g" \ | |
155 -e "s/\([^ ]*\.\)c/$NGX_OBJS\/\1$ngx_objext/g" \ | |
156 -e "s/\([^ ]*\.\)S/$NGX_OBJS\/\1$ngx_objext/g"` | |
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
157 |
489 | 158 ngx_modules_c=`echo $NGX_MODULES_C | sed -e "s/\//$ngx_regex_dirsep/g"` |
159 | |
455 | 160 ngx_modules_obj=`echo $ngx_modules_c | sed -e "s/\(.*\.\)c/\1$ngx_objext/"` |
278
0ba4821f4460
nginx-0.0.2-2004-03-04-10:04:55 import
Igor Sysoev <igor@sysoev.ru>
parents:
267
diff
changeset
|
161 |
461 | 162 |
163 if test -n "$NGX_RES"; then | |
164 ngx_res=$NGX_RES | |
165 else | |
166 ngx_res="$NGX_RC $NGX_ICONS" | |
167 ngx_rcc=`echo $NGX_RCC | sed -e "s/\//$ngx_regex_dirsep/g"` | |
168 fi | |
169 | |
170 ngx_deps=`echo $ngx_all_objs $ngx_modules_obj $ngx_res $LINK_DEPS \ | |
455 | 171 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \ |
172 -e "s/\//$ngx_regex_dirsep/g"` | |
280
7c7183b3ea8b
nginx-0.0.2-2004-03-05-11:34:24 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
173 |
455 | 174 ngx_objs=`echo $ngx_all_objs $ngx_modules_obj \ |
573 | 175 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_long_regex_cont\1/g" \ |
455 | 176 -e "s/\//$ngx_regex_dirsep/g"` |
280
7c7183b3ea8b
nginx-0.0.2-2004-03-05-11:34:24 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
177 |
455 | 178 ngx_libs=${CORE_LIBS:+`echo $NGX_LD_OPT $CORE_LIBS \ |
573 | 179 | sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_long_regex_cont/"`} |
278
0ba4821f4460
nginx-0.0.2-2004-03-04-10:04:55 import
Igor Sysoev <igor@sysoev.ru>
parents:
267
diff
changeset
|
180 |
455 | 181 ngx_link=${CORE_LINK:+`echo $CORE_LINK \ |
573 | 182 | sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_long_regex_cont/"`} |
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
183 |
461 | 184 |
455 | 185 cat << END >> $NGX_MAKEFILE |
280
7c7183b3ea8b
nginx-0.0.2-2004-03-05-11:34:24 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
186 |
455 | 187 $NGX_OBJS${ngx_dirsep}nginx${ngx_binext}: $ngx_deps$ngx_spacer |
573 | 188 \$(LINK) ${ngx_long_start}${ngx_binout}$NGX_OBJS${ngx_dirsep}nginx$ngx_long_cont$ngx_objs$ngx_libs$ngx_link |
461 | 189 $ngx_rcc |
573 | 190 ${ngx_long_end} |
455 | 191 END |
280
7c7183b3ea8b
nginx-0.0.2-2004-03-05-11:34:24 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
192 |
7c7183b3ea8b
nginx-0.0.2-2004-03-05-11:34:24 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
193 |
7c7183b3ea8b
nginx-0.0.2-2004-03-05-11:34:24 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
194 # ngx_modules.c |
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
195 |
455 | 196 if test -n "$NGX_PCH"; then |
197 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)" | |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
281
diff
changeset
|
198 else |
455 | 199 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) \$(CORE_INCS)" |
280
7c7183b3ea8b
nginx-0.0.2-2004-03-05-11:34:24 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
200 fi |
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
201 |
455 | 202 cat << END >> $NGX_MAKEFILE |
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
203 |
455 | 204 $ngx_modules_obj: \$(CORE_DEPS)$ngx_cont$ngx_modules_c |
561 | 205 $ngx_cc$ngx_tab$ngx_objout$ngx_modules_obj$ngx_tab$ngx_modules_c$NGX_AUX |
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
206 |
455 | 207 END |
208 | |
209 | |
210 # the core sources | |
211 | |
212 for ngx_src in $CORE_SRCS | |
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
213 do |
455 | 214 ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"` |
215 ngx_obj=`echo $ngx_src \ | |
216 | sed -e "s/^\(.*\.\)cpp$/$ngx_objs_dir\1$ngx_objext/g" \ | |
217 -e "s/^\(.*\.\)cc$/$ngx_objs_dir\1$ngx_objext/g" \ | |
218 -e "s/^\(.*\.\)c$/$ngx_objs_dir\1$ngx_objext/g" \ | |
219 -e "s/^\(.*\.\)S$/$ngx_objs_dir\1$ngx_objext/g"` | |
220 | |
221 cat << END >> $NGX_MAKEFILE | |
222 | |
223 $ngx_obj: \$(CORE_DEPS)$ngx_cont$ngx_src | |
561 | 224 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX |
455 | 225 |
226 END | |
227 | |
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
228 done |
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
229 |
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
230 |
455 | 231 # the http sources |
280
7c7183b3ea8b
nginx-0.0.2-2004-03-05-11:34:24 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
232 |
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
233 if [ $HTTP = YES ]; then |
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
234 |
455 | 235 if test -n "$NGX_PCH"; then |
236 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)" | |
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
237 else |
455 | 238 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) \$(CORE_INCS) \$(HTTP_INCS)" |
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
239 fi |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
281
diff
changeset
|
240 |
455 | 241 for ngx_src in $HTTP_SRCS |
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
242 do |
455 | 243 ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"` |
244 ngx_obj=`echo $ngx_src \ | |
245 | sed -e "s/^\(.*\.\)cpp$/$ngx_objs_dir\1$ngx_objext/g" \ | |
246 -e "s/^\(.*\.\)cc$/$ngx_objs_dir\1$ngx_objext/g" \ | |
247 -e "s/^\(.*\.\)c$/$ngx_objs_dir\1$ngx_objext/g" \ | |
248 -e "s/^\(.*\.\)S$/$ngx_objs_dir\1$ngx_objext/g"` | |
249 | |
250 cat << END >> $NGX_MAKEFILE | |
251 | |
252 $ngx_obj: \$(CORE_DEPS) \$(HTTP_DEPS)$ngx_cont$ngx_src | |
561 | 253 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX |
455 | 254 |
255 END | |
256 done | |
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
257 |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
281
diff
changeset
|
258 fi |
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
259 |
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
260 |
455 | 261 # the imap sources |
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
262 |
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
263 if [ $IMAP = YES ]; then |
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
264 |
455 | 265 if test -n "$NGX_PCH"; then |
266 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)" | |
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
267 else |
455 | 268 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) \$(CORE_INCS) \$(IMAP_INCS)" |
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
269 fi |
280
7c7183b3ea8b
nginx-0.0.2-2004-03-05-11:34:24 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
270 |
455 | 271 for ngx_src in $IMAP_SRCS |
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
272 do |
455 | 273 ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"` |
274 ngx_obj=`echo $ngx_src \ | |
275 | sed -e "s/^\(.*\.\)cpp$/$ngx_objs_dir\1$ngx_objext/g" \ | |
276 -e "s/^\(.*\.\)cc$/$ngx_objs_dir\1$ngx_objext/g" \ | |
277 -e "s/^\(.*\.\)c$/$ngx_objs_dir\1$ngx_objext/g" \ | |
278 -e "s/^\(.*\.\)S$/$ngx_objs_dir\1$ngx_objext/g"` | |
279 | |
280 cat << END >> $NGX_MAKEFILE | |
281 | |
282 $ngx_obj: \$(CORE_DEPS) \$(IMAP_DEPS)$ngx_cont$ngx_src | |
561 | 283 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX |
455 | 284 |
285 END | |
489 | 286 done |
455 | 287 |
489 | 288 fi |
289 | |
290 | |
291 # the addons sources | |
292 | |
293 if test -n "$NGX_ADDON_SRCS"; then | |
294 | |
295 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)" | |
296 | |
297 for ngx_src in $NGX_ADDON_SRCS | |
298 do | |
299 ngx_obj="addon/`basename \`dirname $ngx_src\``" | |
300 | |
301 ngx_obj=`echo $ngx_obj/\`basename $ngx_src\` \ | |
302 | sed -e "s/\//$ngx_regex_dirsep/g"` | |
303 | |
304 ngx_obj=`echo $ngx_obj \ | |
305 | sed -e "s/^\(.*\.\)cpp$/$ngx_objs_dir\1$ngx_objext/g" \ | |
306 -e "s/^\(.*\.\)cc$/$ngx_objs_dir\1$ngx_objext/g" \ | |
307 -e "s/^\(.*\.\)c$/$ngx_objs_dir\1$ngx_objext/g" \ | |
308 -e "s/^\(.*\.\)S$/$ngx_objs_dir\1$ngx_objext/g"` | |
309 | |
310 ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"` | |
311 | |
312 cat << END >> $NGX_MAKEFILE | |
313 | |
314 $ngx_obj: \$(ADDON_DEPS)$ngx_cont$ngx_src | |
561 | 315 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX |
489 | 316 |
317 END | |
455 | 318 done |
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
319 |
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
320 fi |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
281
diff
changeset
|
321 |
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
281
diff
changeset
|
322 |
461 | 323 # Win32 resource file |
324 | |
325 if test -n "$NGX_RES"; then | |
326 | |
327 ngx_res=`echo "$NGX_RES: $NGX_RC $NGX_ICONS" \ | |
328 | sed -e "s/\//$ngx_regex_dirsep/g"` | |
329 ngx_rcc=`echo $NGX_RCC | sed -e "s/\//$ngx_regex_dirsep/g"` | |
330 | |
331 cat << END >> $NGX_MAKEFILE | |
332 | |
333 $ngx_res | |
334 $ngx_rcc | |
335 | |
336 END | |
337 | |
338 fi | |
339 | |
340 | |
455 | 341 # the precompiled headers |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
281
diff
changeset
|
342 |
455 | 343 if test -n "$NGX_PCH"; then |
469 | 344 echo "#include <ngx_config.h>" > $NGX_OBJS/ngx_pch.c |
455 | 345 |
469 | 346 ngx_pch="src/core/ngx_config.h $OS_CONFIG $NGX_OBJS/ngx_auto_config.h" |
455 | 347 ngx_pch=`echo "$NGX_PCH: $ngx_pch" | sed -e "s/\//$ngx_regex_dirsep/g"` |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
281
diff
changeset
|
348 |
455 | 349 ngx_src="\$(CC) \$(CFLAGS) $NGX_BUILD_PCH $ngx_compile_opt \$(ALL_INCS)" |
469 | 350 ngx_src="$ngx_src $ngx_objout$NGX_OBJS/ngx_pch.obj $NGX_OBJS/ngx_pch.c" |
455 | 351 ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"` |
352 | |
353 cat << END >> $NGX_MAKEFILE | |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
281
diff
changeset
|
354 |
455 | 355 $ngx_pch |
356 $ngx_src | |
357 | |
358 END | |
359 | |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
281
diff
changeset
|
360 fi |