Mercurial > hg > nginx
annotate auto/make @ 9274:46ecad404a29 default tip
Mail: reset imap tag to empty after authentication attempt.
We need to reset the imap tag to empty after an authentication attempt
completes, otherwise if the next line parsed is incomplete with no tag
(e.g. empty line) then we use the "tag" from the previous buffer which
is now definitely wrong and has been partially overwritten with the most
recently read data (e.g. CRLF).
An example before this patch:
S: * OK IMAP4 ready
C: foobar login a b
S: foobar NO Incorrect username or password.
C:
S:
S: obar BAD invalid command
Then with this patch:
S: * OK IMAP4 ready
C: foobar login a b
S: foobar NO Incorrect username or password.
C:
S: * BAD invalid command
| author | Rob Mueller <robm@fastmailteam.com> |
|---|---|
| date | Wed, 15 May 2024 10:06:00 +0300 |
| parents | be269f1fc230 |
| children |
| 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 |
| 4412 | 3 # Copyright (C) Nginx, Inc. |
|
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
|
4 |
|
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
5 |
| 2827 | 6 echo "creating $NGX_MAKEFILE" |
| 7 | |
| 469 | 8 mkdir -p $NGX_OBJS/src/core $NGX_OBJS/src/event $NGX_OBJS/src/event/modules \ |
|
8858
be269f1fc230
Configure: ordered directories.
Ruslan Ermilov <ru@nginx.com>
parents:
8673
diff
changeset
|
9 $NGX_OBJS/src/event/quic \ |
| 469 | 10 $NGX_OBJS/src/os/unix $NGX_OBJS/src/os/win32 \ |
| 8215 | 11 $NGX_OBJS/src/http $NGX_OBJS/src/http/v2 $NGX_OBJS/src/http/v3 \ |
| 12 $NGX_OBJS/src/http/modules $NGX_OBJS/src/http/modules/perl \ | |
| 1949 | 13 $NGX_OBJS/src/mail \ |
| 6115 | 14 $NGX_OBJS/src/stream \ |
|
8858
be269f1fc230
Configure: ordered directories.
Ruslan Ermilov <ru@nginx.com>
parents:
8673
diff
changeset
|
15 $NGX_OBJS/src/misc |
|
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
16 |
|
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
17 |
| 455 | 18 ngx_objs_dir=$NGX_OBJS$ngx_regex_dirsep |
| 19 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
|
20 |
|
7c7183b3ea8b
nginx-0.0.2-2004-03-05-11:34:24 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
21 |
| 467 | 22 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
|
23 |
| 455 | 24 CC = $CC |
| 25 CFLAGS = $CFLAGS | |
| 26 CPP = $CPP | |
| 27 LINK = $LINK | |
|
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
28 |
| 455 | 29 END |
|
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
30 |
|
2825
bb05c0834c8c
remove BMAKE (build make): a cc compiler should use own make
Igor Sysoev <igor@sysoev.ru>
parents:
1949
diff
changeset
|
31 |
| 681 | 32 if test -n "$NGX_PERL_CFLAGS"; then |
| 33 echo NGX_PERL_CFLAGS = $NGX_PERL_CFLAGS >> $NGX_MAKEFILE | |
| 34 echo NGX_PM_CFLAGS = $NGX_PM_CFLAGS >> $NGX_MAKEFILE | |
|
6700
0d2956dfc4e6
Perl: pass additional linker options to perl module.
Konstantin Pavlov <thresh@nginx.com>
parents:
6425
diff
changeset
|
35 echo NGX_PM_LDFLAGS = $NGX_PM_LDFLAGS >> $NGX_MAKEFILE |
| 681 | 36 fi |
| 37 | |
|
280
7c7183b3ea8b
nginx-0.0.2-2004-03-05-11:34:24 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
38 |
| 489 | 39 # ALL_INCS, required by the addons and by OpenWatcom C precompiled headers |
| 455 | 40 |
|
6118
1bdfceda86a9
Fixed building --with-stream when precompiled headers are used.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6115
diff
changeset
|
41 ngx_incs=`echo $CORE_INCS $NGX_OBJS $HTTP_INCS $MAIL_INCS $STREAM_INCS\ |
| 455 | 42 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont$ngx_include_opt\1/g" \ |
| 43 -e "s/\//$ngx_regex_dirsep/g"` | |
| 44 | |
| 45 cat << END >> $NGX_MAKEFILE | |
| 46 | |
| 47 ALL_INCS = $ngx_include_opt$ngx_incs | |
| 48 | |
| 49 END | |
| 50 | |
| 51 | |
| 52 ngx_all_srcs="$CORE_SRCS" | |
| 53 | |
| 54 | |
|
6164
4e5dda15f18f
Fixed misspellings of the word "dependencies".
Ruslan Ermilov <ru@nginx.com>
parents:
6118
diff
changeset
|
55 # the core dependencies and include paths |
| 455 | 56 |
| 467 | 57 ngx_deps=`echo $CORE_DEPS $NGX_AUTO_CONFIG_H $NGX_PCH \ |
| 455 | 58 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \ |
| 59 -e "s/\//$ngx_regex_dirsep/g"` | |
| 60 | |
| 469 | 61 ngx_incs=`echo $CORE_INCS $NGX_OBJS \ |
| 455 | 62 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont$ngx_include_opt\1/g" \ |
| 63 -e "s/\//$ngx_regex_dirsep/g"` | |
| 64 | |
| 65 cat << END >> $NGX_MAKEFILE | |
| 66 | |
| 67 CORE_DEPS = $ngx_deps | |
| 68 | |
| 69 | |
| 70 CORE_INCS = $ngx_include_opt$ngx_incs | |
| 71 | |
| 72 END | |
| 73 | |
| 74 | |
|
6164
4e5dda15f18f
Fixed misspellings of the word "dependencies".
Ruslan Ermilov <ru@nginx.com>
parents:
6118
diff
changeset
|
75 # the http dependencies and include paths |
| 455 | 76 |
| 77 if [ $HTTP = YES ]; then | |
| 78 | |
| 79 ngx_all_srcs="$ngx_all_srcs $HTTP_SRCS" | |
| 80 | |
| 81 ngx_deps=`echo $HTTP_DEPS \ | |
| 82 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \ | |
| 83 -e "s/\//$ngx_regex_dirsep/g"` | |
| 84 | |
| 85 ngx_incs=`echo $HTTP_INCS \ | |
| 86 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont$ngx_include_opt\1/g" \ | |
| 87 -e "s/\//$ngx_regex_dirsep/g"` | |
| 88 | |
| 89 cat << END >> $NGX_MAKEFILE | |
| 90 | |
| 91 HTTP_DEPS = $ngx_deps | |
| 92 | |
| 93 | |
| 94 HTTP_INCS = $ngx_include_opt$ngx_incs | |
| 95 | |
| 96 END | |
| 97 | |
| 98 fi | |
| 99 | |
| 100 | |
|
6164
4e5dda15f18f
Fixed misspellings of the word "dependencies".
Ruslan Ermilov <ru@nginx.com>
parents:
6118
diff
changeset
|
101 # the mail dependencies and include paths |
| 455 | 102 |
| 6383 | 103 if [ $MAIL != NO ]; then |
|
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
104 |
| 6383 | 105 if [ $MAIL = YES ]; then |
| 106 ngx_all_srcs="$ngx_all_srcs $MAIL_SRCS" | |
| 107 fi | |
|
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
108 |
| 1136 | 109 ngx_deps=`echo $MAIL_DEPS \ |
| 455 | 110 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \ |
| 111 -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
|
112 |
| 1136 | 113 ngx_incs=`echo $MAIL_INCS \ |
| 455 | 114 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont$ngx_include_opt\1/g" \ |
| 115 -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
|
116 |
| 455 | 117 cat << END >> $NGX_MAKEFILE |
| 118 | |
| 1136 | 119 MAIL_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
|
120 |
|
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
121 |
| 1136 | 122 MAIL_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
|
123 |
| 455 | 124 END |
|
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
125 |
|
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
126 fi |
|
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
127 |
|
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
128 |
|
6164
4e5dda15f18f
Fixed misspellings of the word "dependencies".
Ruslan Ermilov <ru@nginx.com>
parents:
6118
diff
changeset
|
129 # the stream dependencies and include paths |
| 6115 | 130 |
| 6383 | 131 if [ $STREAM != NO ]; then |
| 6115 | 132 |
| 6383 | 133 if [ $STREAM = YES ]; then |
| 134 ngx_all_srcs="$ngx_all_srcs $STREAM_SRCS" | |
| 135 fi | |
| 6115 | 136 |
| 137 ngx_deps=`echo $STREAM_DEPS \ | |
| 138 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \ | |
| 139 -e "s/\//$ngx_regex_dirsep/g"` | |
| 140 | |
| 141 ngx_incs=`echo $STREAM_INCS \ | |
| 142 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont$ngx_include_opt\1/g" \ | |
| 143 -e "s/\//$ngx_regex_dirsep/g"` | |
| 144 | |
| 145 cat << END >> $NGX_MAKEFILE | |
| 146 | |
| 147 STREAM_DEPS = $ngx_deps | |
| 148 | |
| 149 | |
| 150 STREAM_INCS = $ngx_include_opt$ngx_incs | |
| 151 | |
| 152 END | |
| 153 | |
| 154 fi | |
| 155 | |
| 156 | |
|
6382
392959224560
Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6246
diff
changeset
|
157 ngx_all_srcs="$ngx_all_srcs $MISC_SRCS" |
| 1949 | 158 |
| 159 | |
|
6804
2c7a2d75938a
Configure: honor dependencies of dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6700
diff
changeset
|
160 if test -n "$NGX_ADDON_SRCS$DYNAMIC_MODULES"; then |
| 489 | 161 |
| 162 cat << END >> $NGX_MAKEFILE | |
| 163 | |
| 541 | 164 ADDON_DEPS = \$(CORE_DEPS) $NGX_ADDON_DEPS |
| 489 | 165 |
| 166 END | |
| 167 | |
| 168 fi | |
| 169 | |
| 170 | |
|
280
7c7183b3ea8b
nginx-0.0.2-2004-03-05-11:34:24 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
171 # nginx |
|
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
172 |
| 455 | 173 ngx_all_srcs=`echo $ngx_all_srcs | sed -e "s/\//$ngx_regex_dirsep/g"` |
| 489 | 174 |
| 175 for ngx_src in $NGX_ADDON_SRCS | |
| 176 do | |
| 177 ngx_obj="addon/`basename \`dirname $ngx_src\``" | |
| 178 | |
| 179 test -d $NGX_OBJS/$ngx_obj || mkdir -p $NGX_OBJS/$ngx_obj | |
| 180 | |
| 181 ngx_obj=`echo $ngx_obj/\`basename $ngx_src\` \ | |
| 182 | sed -e "s/\//$ngx_regex_dirsep/g"` | |
| 183 | |
| 184 ngx_all_srcs="$ngx_all_srcs $ngx_obj" | |
| 185 done | |
|
278
0ba4821f4460
nginx-0.0.2-2004-03-04-10:04:55 import
Igor Sysoev <igor@sysoev.ru>
parents:
267
diff
changeset
|
186 |
| 455 | 187 ngx_all_objs=`echo $ngx_all_srcs \ |
| 665 | 188 | sed -e "s#\([^ ]*\.\)cpp#$NGX_OBJS\/\1$ngx_objext#g" \ |
| 189 -e "s#\([^ ]*\.\)cc#$NGX_OBJS\/\1$ngx_objext#g" \ | |
| 190 -e "s#\([^ ]*\.\)c#$NGX_OBJS\/\1$ngx_objext#g" \ | |
| 191 -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
|
192 |
| 489 | 193 ngx_modules_c=`echo $NGX_MODULES_C | sed -e "s/\//$ngx_regex_dirsep/g"` |
| 194 | |
| 455 | 195 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
|
196 |
| 461 | 197 |
| 198 if test -n "$NGX_RES"; then | |
| 199 ngx_res=$NGX_RES | |
| 200 else | |
| 201 ngx_res="$NGX_RC $NGX_ICONS" | |
| 202 ngx_rcc=`echo $NGX_RCC | sed -e "s/\//$ngx_regex_dirsep/g"` | |
| 203 fi | |
| 204 | |
| 205 ngx_deps=`echo $ngx_all_objs $ngx_modules_obj $ngx_res $LINK_DEPS \ | |
| 455 | 206 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \ |
| 207 -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
|
208 |
| 455 | 209 ngx_objs=`echo $ngx_all_objs $ngx_modules_obj \ |
| 573 | 210 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_long_regex_cont\1/g" \ |
| 455 | 211 -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
|
212 |
| 6383 | 213 ngx_libs= |
| 667 | 214 if test -n "$NGX_LD_OPT$CORE_LIBS"; then |
| 215 ngx_libs=`echo $NGX_LD_OPT $CORE_LIBS \ | |
| 216 | sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_long_regex_cont/"` | |
| 217 fi | |
|
278
0ba4821f4460
nginx-0.0.2-2004-03-04-10:04:55 import
Igor Sysoev <igor@sysoev.ru>
parents:
267
diff
changeset
|
218 |
| 455 | 219 ngx_link=${CORE_LINK:+`echo $CORE_LINK \ |
| 573 | 220 | 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
|
221 |
| 6383 | 222 ngx_main_link=${MAIN_LINK:+`echo $MAIN_LINK \ |
| 223 | sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_long_regex_cont/"`} | |
| 224 | |
| 461 | 225 |
| 455 | 226 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
|
227 |
|
6408
cfc3cfa434ec
Configure: added "build" target.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6383
diff
changeset
|
228 build: binary modules manpage |
|
cfc3cfa434ec
Configure: added "build" target.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6383
diff
changeset
|
229 |
| 6424 | 230 binary: $NGX_OBJS${ngx_dirsep}nginx$ngx_binext |
|
6408
cfc3cfa434ec
Configure: added "build" target.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6383
diff
changeset
|
231 |
| 6424 | 232 $NGX_OBJS${ngx_dirsep}nginx$ngx_binext: $ngx_deps$ngx_spacer |
|
7450
2d9ab7717e23
Configure: added explicit ngx_binext to the linker output argument.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6804
diff
changeset
|
233 \$(LINK) $ngx_long_start$ngx_binout$NGX_OBJS${ngx_dirsep}nginx$ngx_binext$ngx_long_cont$ngx_objs$ngx_libs$ngx_link$ngx_main_link |
| 461 | 234 $ngx_rcc |
| 6424 | 235 $ngx_long_end |
| 6383 | 236 |
| 237 modules: | |
| 455 | 238 END |
|
280
7c7183b3ea8b
nginx-0.0.2-2004-03-05-11:34:24 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
239 |
|
7c7183b3ea8b
nginx-0.0.2-2004-03-05-11:34:24 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
240 |
|
7c7183b3ea8b
nginx-0.0.2-2004-03-05-11:34:24 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
241 # ngx_modules.c |
|
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
242 |
| 455 | 243 if test -n "$NGX_PCH"; then |
| 244 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
|
245 else |
| 455 | 246 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
|
247 fi |
|
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
248 |
| 455 | 249 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
|
250 |
| 455 | 251 $ngx_modules_obj: \$(CORE_DEPS)$ngx_cont$ngx_modules_c |
| 561 | 252 $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
|
253 |
| 455 | 254 END |
| 255 | |
| 256 | |
| 257 # the core sources | |
| 258 | |
| 259 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
|
260 do |
| 455 | 261 ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"` |
| 262 ngx_obj=`echo $ngx_src \ | |
| 665 | 263 | sed -e "s#^\(.*\.\)cpp\\$#$ngx_objs_dir\1$ngx_objext#g" \ |
| 264 -e "s#^\(.*\.\)cc\\$#$ngx_objs_dir\1$ngx_objext#g" \ | |
| 265 -e "s#^\(.*\.\)c\\$#$ngx_objs_dir\1$ngx_objext#g" \ | |
| 266 -e "s#^\(.*\.\)S\\$#$ngx_objs_dir\1$ngx_objext#g"` | |
| 455 | 267 |
| 268 cat << END >> $NGX_MAKEFILE | |
| 269 | |
| 270 $ngx_obj: \$(CORE_DEPS)$ngx_cont$ngx_src | |
| 561 | 271 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX |
| 455 | 272 |
| 273 END | |
| 274 | |
|
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
275 done |
|
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
276 |
|
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
277 |
| 455 | 278 # 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
|
279 |
|
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
280 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
|
281 |
| 455 | 282 if test -n "$NGX_PCH"; then |
| 283 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
|
284 else |
| 455 | 285 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) \$(CORE_INCS) \$(HTTP_INCS)" |
| 6419 | 286 ngx_perl_cc="\$(CC) $ngx_compile_opt \$(NGX_PERL_CFLAGS)" |
| 681 | 287 ngx_perl_cc="$ngx_perl_cc \$(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
|
288 fi |
|
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
281
diff
changeset
|
289 |
| 681 | 290 for ngx_source 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
|
291 do |
| 681 | 292 ngx_src=`echo $ngx_source | sed -e "s/\//$ngx_regex_dirsep/g"` |
| 455 | 293 ngx_obj=`echo $ngx_src \ |
| 665 | 294 | sed -e "s#^\(.*\.\)cpp\\$#$ngx_objs_dir\1$ngx_objext#g" \ |
| 295 -e "s#^\(.*\.\)cc\\$#$ngx_objs_dir\1$ngx_objext#g" \ | |
| 296 -e "s#^\(.*\.\)c\\$#$ngx_objs_dir\1$ngx_objext#g" \ | |
| 297 -e "s#^\(.*\.\)S\\$#$ngx_objs_dir\1$ngx_objext#g"` | |
| 455 | 298 |
| 681 | 299 if [ $ngx_source = src/http/modules/perl/ngx_http_perl_module.c ]; then |
| 300 | |
| 301 cat << END >> $NGX_MAKEFILE | |
| 302 | |
| 303 $ngx_obj: \$(CORE_DEPS) \$(HTTP_DEPS)$ngx_cont$ngx_src | |
| 304 $ngx_perl_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX | |
| 305 | |
| 306 END | |
| 307 else | |
| 308 | |
| 309 cat << END >> $NGX_MAKEFILE | |
| 455 | 310 |
| 311 $ngx_obj: \$(CORE_DEPS) \$(HTTP_DEPS)$ngx_cont$ngx_src | |
| 561 | 312 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX |
| 455 | 313 |
| 314 END | |
| 681 | 315 |
| 316 fi | |
| 7741 | 317 done |
|
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
318 |
|
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
281
diff
changeset
|
319 fi |
|
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
320 |
|
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
321 |
| 1136 | 322 # the mail sources |
|
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
323 |
| 1136 | 324 if [ $MAIL = YES ]; then |
|
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
325 |
| 455 | 326 if test -n "$NGX_PCH"; then |
| 327 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
|
328 else |
| 1136 | 329 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) \$(CORE_INCS) \$(MAIL_INCS)" |
|
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
330 fi |
|
280
7c7183b3ea8b
nginx-0.0.2-2004-03-05-11:34:24 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
331 |
| 1136 | 332 for ngx_src in $MAIL_SRCS |
|
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
333 do |
| 455 | 334 ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"` |
| 335 ngx_obj=`echo $ngx_src \ | |
| 665 | 336 | sed -e "s#^\(.*\.\)cpp\\$#$ngx_objs_dir\1$ngx_objext#g" \ |
| 337 -e "s#^\(.*\.\)cc\\$#$ngx_objs_dir\1$ngx_objext#g" \ | |
| 338 -e "s#^\(.*\.\)c\\$#$ngx_objs_dir\1$ngx_objext#g" \ | |
| 339 -e "s#^\(.*\.\)S\\$#$ngx_objs_dir\1$ngx_objext#g"` | |
| 455 | 340 |
| 341 cat << END >> $NGX_MAKEFILE | |
| 342 | |
| 1136 | 343 $ngx_obj: \$(CORE_DEPS) \$(MAIL_DEPS)$ngx_cont$ngx_src |
| 561 | 344 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX |
| 455 | 345 |
| 346 END | |
| 7741 | 347 done |
| 455 | 348 |
| 489 | 349 fi |
| 350 | |
| 351 | |
| 6115 | 352 # the stream sources |
| 353 | |
| 354 if [ $STREAM = YES ]; then | |
| 355 | |
| 356 if test -n "$NGX_PCH"; then | |
| 357 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)" | |
| 358 else | |
| 359 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) \$(CORE_INCS) \$(STREAM_INCS)" | |
| 360 fi | |
| 361 | |
| 362 for ngx_src in $STREAM_SRCS | |
| 363 do | |
| 364 ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"` | |
| 365 ngx_obj=`echo $ngx_src \ | |
| 366 | sed -e "s#^\(.*\.\)cpp\\$#$ngx_objs_dir\1$ngx_objext#g" \ | |
| 367 -e "s#^\(.*\.\)cc\\$#$ngx_objs_dir\1$ngx_objext#g" \ | |
| 368 -e "s#^\(.*\.\)c\\$#$ngx_objs_dir\1$ngx_objext#g" \ | |
| 369 -e "s#^\(.*\.\)S\\$#$ngx_objs_dir\1$ngx_objext#g"` | |
| 370 | |
| 371 cat << END >> $NGX_MAKEFILE | |
| 372 | |
| 373 $ngx_obj: \$(CORE_DEPS) \$(STREAM_DEPS)$ngx_cont$ngx_src | |
| 374 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX | |
| 375 | |
| 376 END | |
| 7741 | 377 done |
| 6115 | 378 |
| 379 fi | |
| 380 | |
| 381 | |
| 1949 | 382 # the misc sources |
| 383 | |
|
6382
392959224560
Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6246
diff
changeset
|
384 if test -n "$MISC_SRCS"; then |
| 1949 | 385 |
| 386 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)" | |
| 387 | |
|
6382
392959224560
Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6246
diff
changeset
|
388 for ngx_src in $MISC_SRCS |
| 1949 | 389 do |
| 390 ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"` | |
| 391 ngx_obj=`echo $ngx_src \ | |
| 392 | sed -e "s#^\(.*\.\)cpp\\$#$ngx_objs_dir\1$ngx_objext#g" \ | |
| 393 -e "s#^\(.*\.\)cc\\$#$ngx_objs_dir\1$ngx_objext#g" \ | |
| 394 -e "s#^\(.*\.\)c\\$#$ngx_objs_dir\1$ngx_objext#g" \ | |
| 395 -e "s#^\(.*\.\)S\\$#$ngx_objs_dir\1$ngx_objext#g"` | |
| 396 | |
| 397 cat << END >> $NGX_MAKEFILE | |
| 398 | |
| 399 $ngx_obj: \$(CORE_DEPS) $ngx_cont$ngx_src | |
| 400 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX | |
| 401 | |
| 402 END | |
| 7741 | 403 done |
| 1949 | 404 |
| 405 fi | |
| 406 | |
| 407 | |
| 489 | 408 # the addons sources |
| 409 | |
| 410 if test -n "$NGX_ADDON_SRCS"; then | |
| 411 | |
| 412 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)" | |
| 413 | |
| 414 for ngx_src in $NGX_ADDON_SRCS | |
| 415 do | |
| 416 ngx_obj="addon/`basename \`dirname $ngx_src\``" | |
| 417 | |
| 418 ngx_obj=`echo $ngx_obj/\`basename $ngx_src\` \ | |
| 419 | sed -e "s/\//$ngx_regex_dirsep/g"` | |
| 420 | |
| 421 ngx_obj=`echo $ngx_obj \ | |
| 665 | 422 | sed -e "s#^\(.*\.\)cpp\\$#$ngx_objs_dir\1$ngx_objext#g" \ |
| 423 -e "s#^\(.*\.\)cc\\$#$ngx_objs_dir\1$ngx_objext#g" \ | |
| 424 -e "s#^\(.*\.\)c\\$#$ngx_objs_dir\1$ngx_objext#g" \ | |
| 425 -e "s#^\(.*\.\)S\\$#$ngx_objs_dir\1$ngx_objext#g"` | |
| 489 | 426 |
| 427 ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"` | |
| 428 | |
| 429 cat << END >> $NGX_MAKEFILE | |
| 430 | |
| 431 $ngx_obj: \$(ADDON_DEPS)$ngx_cont$ngx_src | |
| 561 | 432 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX |
| 489 | 433 |
| 434 END | |
| 7741 | 435 done |
|
417
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
436 |
|
0526206251f6
nginx-0.0.10-2004-09-07-19:29:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
437 fi |
|
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
281
diff
changeset
|
438 |
|
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
281
diff
changeset
|
439 |
| 593 | 440 # the addons config.make |
| 441 | |
|
6416
35487ea55cb6
Dynamic modules: make sure to call config.make for dynamic addons.
Ruslan Ermilov <ru@nginx.com>
parents:
6408
diff
changeset
|
442 if test -n "$NGX_ADDONS$DYNAMIC_ADDONS"; then |
| 593 | 443 |
|
6416
35487ea55cb6
Dynamic modules: make sure to call config.make for dynamic addons.
Ruslan Ermilov <ru@nginx.com>
parents:
6408
diff
changeset
|
444 for ngx_addon_dir in $NGX_ADDONS $DYNAMIC_ADDONS |
| 593 | 445 do |
| 446 if test -f $ngx_addon_dir/config.make; then | |
| 447 . $ngx_addon_dir/config.make | |
| 448 fi | |
| 449 done | |
| 450 fi | |
| 451 | |
| 452 | |
| 461 | 453 # Win32 resource file |
| 454 | |
| 455 if test -n "$NGX_RES"; then | |
| 456 | |
| 457 ngx_res=`echo "$NGX_RES: $NGX_RC $NGX_ICONS" \ | |
| 458 | sed -e "s/\//$ngx_regex_dirsep/g"` | |
| 459 ngx_rcc=`echo $NGX_RCC | sed -e "s/\//$ngx_regex_dirsep/g"` | |
| 460 | |
| 461 cat << END >> $NGX_MAKEFILE | |
| 462 | |
| 463 $ngx_res | |
| 464 $ngx_rcc | |
| 465 | |
| 466 END | |
| 467 | |
| 468 fi | |
| 469 | |
| 470 | |
| 455 | 471 # 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
|
472 |
| 455 | 473 if test -n "$NGX_PCH"; then |
| 469 | 474 echo "#include <ngx_config.h>" > $NGX_OBJS/ngx_pch.c |
| 455 | 475 |
| 469 | 476 ngx_pch="src/core/ngx_config.h $OS_CONFIG $NGX_OBJS/ngx_auto_config.h" |
| 455 | 477 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
|
478 |
| 455 | 479 ngx_src="\$(CC) \$(CFLAGS) $NGX_BUILD_PCH $ngx_compile_opt \$(ALL_INCS)" |
| 469 | 480 ngx_src="$ngx_src $ngx_objout$NGX_OBJS/ngx_pch.obj $NGX_OBJS/ngx_pch.c" |
| 455 | 481 ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"` |
| 482 | |
| 483 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
|
484 |
| 455 | 485 $ngx_pch |
| 486 $ngx_src | |
| 487 | |
| 488 END | |
| 489 | |
|
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
281
diff
changeset
|
490 fi |
| 6383 | 491 |
| 492 | |
| 493 # dynamic modules | |
| 494 | |
| 495 if test -n "$NGX_PCH"; then | |
| 496 ngx_cc="\$(CC) $ngx_compile_opt $ngx_pic_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)" | |
| 497 else | |
| 498 ngx_cc="\$(CC) $ngx_compile_opt $ngx_pic_opt \$(CFLAGS) \$(ALL_INCS)" | |
| 6419 | 499 ngx_perl_cc="\$(CC) $ngx_compile_opt $ngx_pic_opt \$(NGX_PERL_CFLAGS)" |
| 500 ngx_perl_cc="$ngx_perl_cc \$(ALL_INCS)" | |
| 6383 | 501 fi |
| 502 | |
| 503 for ngx_module in $DYNAMIC_MODULES | |
| 504 do | |
| 505 eval ngx_module_srcs="\$${ngx_module}_SRCS" | |
|
7743
4b1299b1856a
Configure: shared sources for addon modules.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7741
diff
changeset
|
506 eval ngx_module_shrd="\$${ngx_module}_SHRD" |
| 6383 | 507 eval eval ngx_module_libs="\\\"\$${ngx_module}_LIBS\\\"" |
| 508 | |
| 509 eval ngx_module_modules="\$${ngx_module}_MODULES" | |
| 510 eval ngx_module_order="\$${ngx_module}_ORDER" | |
| 511 | |
| 512 ngx_modules_c=$NGX_OBJS/${ngx_module}_modules.c | |
| 513 | |
| 514 cat << END > $ngx_modules_c | |
| 515 | |
| 516 #include <ngx_config.h> | |
| 517 #include <ngx_core.h> | |
| 518 | |
| 519 END | |
| 520 | |
| 521 for mod in $ngx_module_modules | |
| 522 do | |
| 523 echo "extern ngx_module_t $mod;" >> $ngx_modules_c | |
| 524 done | |
| 525 | |
| 526 echo >> $ngx_modules_c | |
| 527 echo 'ngx_module_t *ngx_modules[] = {' >> $ngx_modules_c | |
| 528 | |
| 529 for mod in $ngx_module_modules | |
| 530 do | |
| 531 echo " &$mod," >> $ngx_modules_c | |
| 532 done | |
| 533 | |
| 534 cat << END >> $ngx_modules_c | |
| 535 NULL | |
| 536 }; | |
| 537 | |
| 538 END | |
| 539 | |
| 540 echo 'char *ngx_module_names[] = {' >> $ngx_modules_c | |
| 541 | |
| 542 for mod in $ngx_module_modules | |
| 543 do | |
| 544 echo " \"$mod\"," >> $ngx_modules_c | |
| 545 done | |
| 546 | |
| 547 cat << END >> $ngx_modules_c | |
| 548 NULL | |
| 549 }; | |
| 550 | |
| 551 END | |
| 552 | |
| 553 echo 'char *ngx_module_order[] = {' >> $ngx_modules_c | |
| 554 | |
| 555 for mod in $ngx_module_order | |
| 556 do | |
| 557 echo " \"$mod\"," >> $ngx_modules_c | |
| 558 done | |
| 559 | |
| 560 cat << END >> $ngx_modules_c | |
| 561 NULL | |
| 562 }; | |
| 563 | |
| 564 END | |
| 565 | |
| 566 ngx_modules_c=`echo $ngx_modules_c | sed -e "s/\//$ngx_regex_dirsep/g"` | |
| 567 | |
| 568 ngx_modules_obj=`echo $ngx_modules_c \ | |
| 569 | sed -e "s/\(.*\.\)c/\1$ngx_objext/"` | |
| 570 | |
| 571 ngx_module_objs= | |
|
7743
4b1299b1856a
Configure: shared sources for addon modules.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7741
diff
changeset
|
572 for ngx_src in $ngx_module_srcs $ngx_module_shrd |
| 6383 | 573 do |
| 574 case "$ngx_src" in | |
| 575 src/*) | |
| 576 ngx_obj=$ngx_src | |
| 577 ;; | |
| 578 *) | |
| 579 ngx_obj="addon/`basename \`dirname $ngx_src\``" | |
| 580 mkdir -p $NGX_OBJS/$ngx_obj | |
| 581 ngx_obj="$ngx_obj/`basename $ngx_src`" | |
| 582 ;; | |
| 583 esac | |
| 584 | |
| 585 ngx_module_objs="$ngx_module_objs $ngx_obj" | |
| 586 done | |
| 587 | |
| 588 ngx_module_objs=`echo $ngx_module_objs \ | |
| 589 | sed -e "s#\([^ ]*\.\)cpp#$NGX_OBJS\/\1$ngx_objext#g" \ | |
| 590 -e "s#\([^ ]*\.\)cc#$NGX_OBJS\/\1$ngx_objext#g" \ | |
| 591 -e "s#\([^ ]*\.\)c#$NGX_OBJS\/\1$ngx_objext#g" \ | |
| 592 -e "s#\([^ ]*\.\)S#$NGX_OBJS\/\1$ngx_objext#g"` | |
| 593 | |
| 594 ngx_deps=`echo $ngx_module_objs $ngx_modules_obj $LINK_DEPS \ | |
| 595 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \ | |
| 596 -e "s/\//$ngx_regex_dirsep/g"` | |
| 597 | |
| 598 ngx_objs=`echo $ngx_module_objs $ngx_modules_obj \ | |
| 599 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_long_regex_cont\1/g" \ | |
| 600 -e "s/\//$ngx_regex_dirsep/g"` | |
| 601 | |
| 6424 | 602 ngx_obj=$NGX_OBJS$ngx_dirsep$ngx_module$ngx_modext |
| 6383 | 603 |
| 604 if [ "$NGX_PLATFORM" = win32 ]; then | |
| 605 ngx_module_libs="$CORE_LIBS $ngx_module_libs" | |
| 606 fi | |
| 607 | |
| 608 ngx_libs= | |
| 609 if test -n "$NGX_LD_OPT$ngx_module_libs"; then | |
| 610 ngx_libs=`echo $NGX_LD_OPT $ngx_module_libs \ | |
| 611 | sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_long_regex_cont/"` | |
| 612 fi | |
| 613 | |
| 614 ngx_link=${CORE_LINK:+`echo $CORE_LINK \ | |
| 615 | sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_long_regex_cont/"`} | |
| 616 | |
| 617 ngx_module_link=${MODULE_LINK:+`echo $MODULE_LINK \ | |
| 618 | sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_long_regex_cont/"`} | |
| 619 | |
| 620 | |
| 621 cat << END >> $NGX_MAKEFILE | |
| 622 | |
| 623 modules: $ngx_obj | |
| 624 | |
| 625 $ngx_obj: $ngx_deps$ngx_spacer | |
| 626 \$(LINK) $ngx_long_start$ngx_binout$ngx_obj$ngx_long_cont$ngx_objs$ngx_libs$ngx_link$ngx_module_link | |
| 627 $ngx_long_end | |
| 628 | |
| 629 $ngx_modules_obj: \$(CORE_DEPS)$ngx_cont$ngx_modules_c | |
| 630 $ngx_cc$ngx_tab$ngx_objout$ngx_modules_obj$ngx_tab$ngx_modules_c$NGX_AUX | |
| 631 | |
| 632 END | |
| 633 | |
| 6419 | 634 for ngx_source in $ngx_module_srcs |
| 6383 | 635 do |
| 6419 | 636 case "$ngx_source" in |
| 6383 | 637 src/*) |
| 6419 | 638 ngx_obj=`echo $ngx_source | sed -e "s/\//$ngx_regex_dirsep/g"` |
| 6383 | 639 ;; |
| 640 *) | |
| 6419 | 641 ngx_obj="addon/`basename \`dirname $ngx_source\``" |
| 642 ngx_obj=`echo $ngx_obj/\`basename $ngx_source\` \ | |
| 6383 | 643 | sed -e "s/\//$ngx_regex_dirsep/g"` |
| 644 ;; | |
| 645 esac | |
| 646 | |
| 647 ngx_obj=`echo $ngx_obj \ | |
| 648 | sed -e "s#^\(.*\.\)cpp\\$#$ngx_objs_dir\1$ngx_objext#g" \ | |
| 649 -e "s#^\(.*\.\)cc\\$#$ngx_objs_dir\1$ngx_objext#g" \ | |
| 650 -e "s#^\(.*\.\)c\\$#$ngx_objs_dir\1$ngx_objext#g" \ | |
| 651 -e "s#^\(.*\.\)S\\$#$ngx_objs_dir\1$ngx_objext#g"` | |
| 652 | |
| 6419 | 653 ngx_src=`echo $ngx_source | sed -e "s/\//$ngx_regex_dirsep/g"` |
| 654 | |
| 655 if [ $ngx_source = src/http/modules/perl/ngx_http_perl_module.c ]; then | |
| 656 | |
| 657 cat << END >> $NGX_MAKEFILE | |
| 6383 | 658 |
|
6804
2c7a2d75938a
Configure: honor dependencies of dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6700
diff
changeset
|
659 $ngx_obj: \$(ADDON_DEPS)$ngx_cont$ngx_src |
| 6419 | 660 $ngx_perl_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX |
| 661 | |
| 662 END | |
| 663 else | |
| 664 | |
| 665 cat << END >> $NGX_MAKEFILE | |
| 6383 | 666 |
|
6804
2c7a2d75938a
Configure: honor dependencies of dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6700
diff
changeset
|
667 $ngx_obj: \$(ADDON_DEPS)$ngx_cont$ngx_src |
| 6383 | 668 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX |
| 669 | |
| 670 END | |
| 671 | |
| 6419 | 672 fi |
| 6383 | 673 done |
| 674 done |