Axe a previously axed reference to an unused build-time

[apache] / Makefile.win

diff --git a/Makefile.win b/Makefile.win
index 9408a24ec47154da3de965b4ee22dc3f3c238e3b..96e7a9f4a81b314bd93bccd73d02997fb670910f 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -19,7 +19,7 @@
 #
 # For example;
 #
-#   nmake /f Makefile.win PORT=80 INSTDIR="d:\Program Files\Apache" installr
+#   nmake -f Makefile.win PORT=80 INSTDIR="d:\Program Files\Apache" installr
 #
 # Be aware that certain awk's will not accept backslahed names,
 # so the server root should be given in forward slashes (quoted),
@@ -33,10 +33,10 @@ CTARGET=/build
 
 !IF !EXIST("srclib\apr") || !EXIST("srclib\apr-util") || !EXIST("srclib\apr-iconv")
 !MESSAGE Please check out or download and unpack the Apache Portability Runtime
-!MESSAGE sources (apr, apr-iconv and apr-util) into your $(INSTDIR)\srclib dir.
+!MESSAGE sources (apr, apr-iconv and apr-util) into your srclib dir.
 !MESSAGE Apache cannot build without these libraries!
 !MESSAGE 
-!ERROR Need $(INSTDIR)\srclib\  apr, apr-iconv and apr-util
+!ERROR Need srclib\  apr, apr-iconv and apr-util
 !ENDIF
 
 # Note; _tryssl: is only used by the msvc developer studio environment to 'fix up'
@@ -119,18 +119,18 @@ PORT=80
 !MESSAGE SERVERNAME = $(SERVERNAME)
 !MESSAGE PORT       = $(PORT)
 !MESSAGE
-!MESSAGE To change these options use 'nmake /f Makefile.win [option=value]'
-!MESSAGE Example: nmake /f Makefile.win PORT=8080
+!MESSAGE To change these options use 'nmake -f Makefile.win [option=value]'
+!MESSAGE Example: nmake -f Makefile.win PORT=8080
 !MESSAGE
 !MESSAGE
 !ENDIF
 
 !IFNDEF MAKEOPT
 # Only default the behavior if MAKEOPT= is omitted
-!IF "($MAKE)" == "NMAKE"
+!IFDEF _NMAKE_VER
 # Microsoft NMake options
 MAKEOPT=-nologo
-!ELSEIF "($MAKE)" == "make"
+!ELSEIF "$(MAKE)" == "make"
 # Borland make options?  Not really supported (yet)
 MAKEOPT=-s -N
 !ENDIF
@@ -178,21 +178,18 @@ _build:
         $(MAKE) $(MAKEOPT) -f apriconv.mak  CFG="apriconv - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f libapriconv.mak  CFG="libapriconv - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 !IF "$(CTARGET)" == "CLEAN"
-       $(MAKE) $(MAKEOPT) /f build\modules.mk.win clean \
+       $(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \
                BUILD_MODE=$(LONG) BIND_MODE=shared API_SOURCE=.
 !ELSE
        cd ccs
-       $(MAKE) /nologo /f Makefile.win all \
+       $(MAKE) $(MAKEOPT) -f Makefile.win all \
                BUILD_MODE=$(LONG) BIND_MODE=shared
        cd ..\ces
-       $(MAKE) /nologo /f Makefile.win all \
+       $(MAKE) $(MAKEOPT) -f Makefile.win all \
                BUILD_MODE=$(LONG) BIND_MODE=shared
        cd ..
 !ENDIF
        cd ..\..
-       cd srclib\apr-util\uri
-        $(MAKE) $(MAKEOPT) -f gen_uri_delims.mak  CFG="gen_uri_delims - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-       cd ..\..\..
        cd srclib\apr-util\xml\expat\lib
         $(MAKE) $(MAKEOPT) -f xml.mak             CFG="xml - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..\..
@@ -212,6 +209,9 @@ _build:
        cd modules\ldap
         $(MAKE) $(MAKEOPT) -f mod_ldap.mak        CFG="mod_ldap - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
+       cd modules\database
+        $(MAKE) $(MAKEOPT) -f mod_dbd.mak         CFG="mod_dbd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+       cd ..\..
        cd modules\aaa
         $(MAKE) $(MAKEOPT) -f mod_auth_basic.mak  CFG="mod_auth_basic - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_auth_digest.mak CFG="mod_auth_digest - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -236,9 +236,6 @@ _build:
         $(MAKE) $(MAKEOPT) -f mod_mem_cache.mak   CFG="mod_mem_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_disk_cache.mak  CFG="mod_disk_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
-       cd modules\database
-        $(MAKE) $(MAKEOPT) -f mod_dbd.mak         CFG="mod_dbd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-       cd ..\..
        cd modules\dav\main
         $(MAKE) $(MAKEOPT) -f mod_dav.mak         CFG="mod_dav - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..\..
@@ -252,10 +249,10 @@ _build:
        cd modules\experimental
        cd ..\..
        cd modules\filters
+        $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 !IF EXIST("srclib\zlib")
         $(MAKE) $(MAKEOPT) -f mod_deflate.mak     CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 !ENDIF
-        $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_ext_filter.mak  CFG="mod_ext_filter - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_include.mak     CFG="mod_include - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
@@ -360,7 +357,7 @@ _build:
                "BuildBin - Win32 $(LONG)" $(CTARGET)
 !IF "$(CTARGET)" == "/CLEAN"
        @cd srclib\apr-iconv
-       @$(MAKE) $(MAKEOPT) /f build\modules.mk.win clean \
+       @$(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \
                BUILD_MODE=$(LONG) BIND_MODE=shared API_SOURCE=.
        @cd ..\..
 !ENDIF