diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-05-10 18:35:08 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-05-10 18:35:08 +0000 |
| commit | 98c4dd7c60b518c2a9e292a2b17ac1860c03ded8 (patch) | |
| tree | 53ce742c2a3c1fc757bebb85b71fcb69784a52c6 | |
| parent | dbebf0bdbc6ca9c996058b76ad89cf4d4441f7b4 (diff) | |
| download | nginx-98c4dd7c60b518c2a9e292a2b17ac1860c03ded8.tar.gz nginx-98c4dd7c60b518c2a9e292a2b17ac1860c03ded8.tar.bz2 | |
remove BMAKE (build make): a cc compiler should use own make
| -rw-r--r-- | auto/cc/msvc | 19 | ||||
| -rw-r--r-- | auto/cc/owc | 6 | ||||
| -rw-r--r-- | auto/make | 12 |
3 files changed, 11 insertions, 26 deletions
diff --git a/auto/cc/msvc b/auto/cc/msvc index d002bec38..11c4682cf 100644 --- a/auto/cc/msvc +++ b/auto/cc/msvc @@ -124,25 +124,14 @@ ngx_binout="-Fe" ngx_objext="obj" ngx_binext=".exe" -if [ "$BMAKE" = nmake ]; then - # MS nmake - - ngx_long_start='@<< +ngx_long_start='@<< ' - ngx_long_end='<<' - ngx_long_regex_cont=' \ +ngx_long_end='<<' +ngx_long_regex_cont=' \ ' - ngx_long_cont=' +ngx_long_cont=' ' -else - # Borland make - - ngx_long_start='@&&| - ' - ngx_long_end='|' -fi - # MSVC understand / in path #ngx_regex_dirsep='\\' #ngx_dirsep="\\" diff --git a/auto/cc/owc b/auto/cc/owc index 1a5fa210b..bd0cd40c2 100644 --- a/auto/cc/owc +++ b/auto/cc/owc @@ -87,3 +87,9 @@ ngx_binext=".exe" ngx_regex_dirsep='\\' ngx_dirsep="\\" + +ngx_regex_cont=' ' +ngx_long_regex_cont=' ' +ngx_cont=' ' +ngx_long_cont=' ' +ngx_tab=' ' @@ -23,22 +23,12 @@ LINK = $LINK END + if test -n "$NGX_PERL_CFLAGS"; then echo NGX_PERL_CFLAGS = $NGX_PERL_CFLAGS >> $NGX_MAKEFILE echo NGX_PM_CFLAGS = $NGX_PM_CFLAGS >> $NGX_MAKEFILE fi -if [ "$BMAKE" = wmake ]; then - echo MAKE = wmake >> $NGX_MAKEFILE - - ngx_regex_cont=' ' - ngx_long_regex_cont=' ' - ngx_cont=' ' - ngx_long_cont=' ' - ngx_tab=' ' - -fi - # ALL_INCS, required by the addons and by OpenWatcom C precompiled headers |