remove BMAKE (build make): a cc compiler should use own make

diff --git a/auto/cc/msvc b/auto/cc/msvc
index d002bec38def4c646aae7764e1e80a739888d452..11c4682cf4b319e57969b5835ab3b57dec248a7b 100644 (file)
--- 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 1a5fa210b9ca7b8d5b19f1ba42eec7857fe06117..bd0cd40c20f289e80cd0d0997ef0c6e6266dc143 100644 (file)
--- 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
index 2c827a3111c178866a20eca4a0814762f48d6652..d14bf6174c17723a3681348cbc8cf11009c92432 100644 (file)
--- 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