# HG changeset patch # User Igor Sysoev # Date 1241980508 0 # Node ID bb05c0834c8c6501874277877d732fd19c3fc17c # Parent d106509491b58d59d9dffb8791e3baa86a48ea16 remove BMAKE (build make): a cc compiler should use own make diff --git a/auto/cc/msvc b/auto/cc/msvc --- 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 --- 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=' ' diff --git a/auto/make b/auto/make --- a/auto/make +++ b/auto/make @@ -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