- Cleans up the garbled output.
- Fixes a few grammatical errors and incorrect path information.
- Removes building from .mak files.
Is building browse information from the command line useful?
It doesn't build as it is, and from what I know the only real benefit
of browse info is when it's used in conjunction with the IDE.
Shane
Index: Makefile.win
===================================================================
RCS file: /home/cvspublic/httpd-2.0/Makefile.win,v
retrieving revision 1.108
diff -u -r1.108 Makefile.win
--- Makefile.win 13 Jul 2002 06:01:10 -0000 1.108
+++ Makefile.win 18 Jul 2002 18:08:42 -0000
@@ -25,7 +25,7 @@
# so the server root should be given in forward slashes (quoted),
# preferably with the drive designation!
-default: _apacher
+default: _apacher
!IF ("$(CTARGET)" == "") && EXIST("Apache.sln")
CTARGET=/build
@@ -58,18 +58,11 @@
!ENDIF
_tryssl:
-!IF EXIST("modules\ssl\mod_ssl.mak")
- cd modules\ssl
- $(MAKE) $(MAKEOPT) -f mod_ssl.mak CFG="mod_ssl - Win32 $(LONG)" RECURSE=0
.\$(LONG)\mod_ssl.so
- cd ..\..
- cd support
- $(MAKE) $(MAKEOPT) -f abs.mak CFG="abs - Win32 $(LONG)" RECURSE=0
.\$(LONG)\abs.exe
- cd ..
-!ELSEIF EXIST("Apache.sln")
+!IF EXIST("Apache.sln")
devenv Apache.sln /useenv $(CTARGET) $(LONG) /project mod_ssl
devenv Apache.sln /useenv $(CTARGET) $(LONG) /project abs
!ELSE
- msdev Apache.dsw /USEENV /MAKE \
+ @msdev Apache.dsw /USEENV /MAKE \
"mod_ssl - Win32 $(LONG)" \
"abs - Win32 $(LONG)" /NORECURSE $(CTARGET)
!ENDIF
@@ -78,24 +71,21 @@
# NOT EXIST("srclib\openssl")
_tryssl:
- echo mod_ssl and ab/ssl will not build without openssl
- echo installed in $(INSTDIR)\srclib\openssl. They must be precompiled
- echo using the ms/ntdll.mak file, see srclib\openssl\INSTALL.W32.
- echo The most recent version confirmed to build with mod_ssl and ab
- echo was 0.9.6c available from http://www.openssl.org/
+ @echo -----
+ @echo mod_ssl and ab/ssl will not build unless openssl is installed
+ @echo in srclib\openssl. They must be precompiled using the
+ @echo ms/ntdll.mak file, see srclib\openssl\INSTALL.W32. The most
+ @echo recent version confirmed to build with mod_ssl and ab is 0.9.6c.
+ @echo Available from http://www.openssl.org/
!ENDIF
!IF EXIST("srclib\zlib")
_tryzlib:
-!IF EXIST("modules\filters\mod_deflate.mak")
- cd modules\filters
- $(MAKE) $(MAKEOPT) -f mod_deflate.mak CFG="mod_deflate - Win32 $(LONG)"
RECURSE=0 .\$(LONG)\mod_deflate.so
- cd ..\..
-!ELSEIF EXIST("Apache.sln")
+!IF EXIST("Apache.sln")
devenv Apache.sln /useenv $(CTARGET) $(LONG) /project mod_deflate
!ELSE
- msdev Apache.dsw /USEENV /MAKE \
+ @msdev Apache.dsw /USEENV /MAKE \
"mod_deflate - Win32 $(LONG)" /NORECURSE $(CTARGET)
!ENDIF
@@ -103,25 +93,33 @@
# NOT EXIST("srclib\zlib")
_tryzlib:
- echo mod_deflate will not build without zlib installed in
- echo $(INSTDIR)\srclib\zlib.
- echo Zlib needs not be built, we compile the sources directly.
+ @echo -----
+ @echo mod_deflate will not build unless zlib is installed in srclib\zlib.
+ @echo zlib does not need to be built, we compile the sources directly.
+ @echo Available from http://www.gzip.org/zlib/
!ENDIF
!IF "$(INSTDIR)" == ""
INSTDIR=\Apache2
-!MESSAGE INSTDIR not specified, installing to default $(INSTDIR)
-!ENDIF
+!ENDIF
+!IF "$(SERVERNAME)" == ""
+SERVERNAME=localhost
+!ENDIF
!IF "$(PORT)" == ""
PORT=80
-!MESSAGE PORT not specified, using default $(PORT)
-!MESSAGE To change this use $(MAKE) -f makefile.win PORT=8080 installr
!ENDIF
-!IF "$(SERVERNAME)" == ""
-SERVERNAME=localhost
-!MESSAGE SERVERNAME not specified, using default $(SERVERNAME)
-!MESSAGE To change this use $(MAKE) -f makefile.win PORT=www.example.com installr
+
+!IF "$(LONG)" == ""
+!MESSAGE
+!MESSAGE INSTDIR = $(INSTDIR)
+!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
+!MESSAGE
!ENDIF
!IFNDEF MAKEOPT
@@ -143,148 +141,23 @@
cd ..
_apacher:
- $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release _build
+ @$(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release _build
_apached:
- $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=D LONG=Debug _build
+ @$(MAKE) $(MAKEOPT) -f Makefile.win SHORT=D LONG=Debug _build
installr:
- $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release _build _install
+ @$(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release _build _install
installd:
- $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=D LONG=Debug _build _install
+ @$(MAKE) $(MAKEOPT) -f Makefile.win SHORT=D LONG=Debug _build _install
clean: _cleanr _cleand
-if exist Browse\. rd /s Browse < << > nul
y
<<
-!IF EXIST("Apache.mak")
-
-_cleanr:
- $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release CTARGET=CLEAN _build
-
-_cleand:
- $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=D LONG=Debug CTARGET=CLEAN _build
-
-_build:
- echo Building Win32 $(LONG) targets ($(SHORT) suffixes)
- cd srclib\apr
- $(MAKE) $(MAKEOPT) -f apr.mak CFG="apr - Win32 $(LONG)" RECURSE=0
$(CTARGET)
- $(MAKE) $(MAKEOPT) -f libapr.mak CFG="libapr - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- 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 ..\..\..
- $(MAKE) $(MAKEOPT) -f aprutil.mak CFG="aprutil - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f libaprutil.mak CFG="libaprutil - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- cd ..\..
- cd srclib\pcre
- $(MAKE) $(MAKEOPT) -f dftables.mak CFG="dftables - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f pcre.mak CFG="pcre - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f pcreposix.mak CFG="pcreposix - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- cd ..\..
- cd server
- $(MAKE) $(MAKEOPT) -f gen_test_char.mak CFG="gen_test_char - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- cd ..
- $(MAKE) $(MAKEOPT) -f libhttpd.mak CFG="libhttpd - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f Apache.mak CFG="Apache - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- cd modules\aaa
- $(MAKE) $(MAKEOPT) -f mod_access.mak CFG="mod_access - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_auth.mak CFG="mod_auth - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_auth_anon.mak CFG="mod_auth_anon - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_auth_dbm.mak CFG="mod_auth_dbm - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_auth_digest.mak CFG="mod_auth_digest - Win32
$(LONG)" RECURSE=0 $(CTARGET)
- cd ..\..
- cd modules\arch\win32
- $(MAKE) $(MAKEOPT) -f mod_isapi.mak CFG="mod_isapi - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- cd ..\..\..
- cd modules\cache
- $(MAKE) $(MAKEOPT) -f mod_file_cache.mak CFG="mod_file_cache - 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 ..\..\..
- cd modules\dav\fs
- $(MAKE) $(MAKEOPT) -f mod_dav_fs.mak CFG="mod_dav_fs - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- cd ..\..\..
- cd modules\experimental
- $(MAKE) $(MAKEOPT) -f mod_cache.mak CFG="mod_cache - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(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)
- $(MAKE) $(MAKEOPT) -f mod_ext_filter.mak CFG="mod_ext_filter - Win32
$(LONG)" RECURSE=0 $(CTARGET)
- cd ..\..
- cd modules\filters
-!IF EXIST("srclib\zlib")
- $(MAKE) $(MAKEOPT) -f mod_deflate.mak CFG="mod_deflate - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
-!ENDIF
- $(MAKE) $(MAKEOPT) -f mod_include.mak CFG="mod_include - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- cd ..\..
- cd modules\generators
- $(MAKE) $(MAKEOPT) -f mod_asis.mak CFG="mod_asis - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_autoindex.mak CFG="mod_autoindex - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_cgi.mak CFG="mod_cgi - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_info.mak CFG="mod_info - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_status.mak CFG="mod_status - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- cd ..\..
- cd modules\http
- $(MAKE) $(MAKEOPT) -f mod_mime.mak CFG="mod_mime - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- cd ..\..
- cd modules\loggers
- $(MAKE) $(MAKEOPT) -f mod_log_config.mak CFG="mod_log_config - Win32
$(LONG)" RECURSE=0 $(CTARGET)
- cd ..\..
- cd modules\mappers
- $(MAKE) $(MAKEOPT) -f mod_actions.mak CFG="mod_actions - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_alias.mak CFG="mod_alias - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_dir.mak CFG="mod_dir - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_imap.mak CFG="mod_imap - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_negotiation.mak CFG="mod_negotiation - Win32
$(LONG)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_rewrite.mak CFG="mod_rewrite - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_speling.mak CFG="mod_speling - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_userdir.mak CFG="mod_userdir - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_vhost_alias.mak CFG="mod_vhost_alias - Win32
$(LONG)" RECURSE=0 $(CTARGET)
- cd ..\..
- cd modules\metadata
- $(MAKE) $(MAKEOPT) -f mod_cern_meta.mak CFG="mod_cern_meta - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_env.mak CFG="mod_env - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_expires.mak CFG="mod_expires - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_headers.mak CFG="mod_headers - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_mime_magic.mak CFG="mod_mime_magic - Win32
$(LONG)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_setenvif.mak CFG="mod_setenvif - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_unique_id.mak CFG="mod_unique_id - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_usertrack.mak CFG="mod_usertrack - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- cd ..\..
- cd modules\proxy
- $(MAKE) $(MAKEOPT) -f mod_proxy.mak CFG="mod_proxy - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_proxy_connect.mak CFG="mod_proxy_connect - Win32
$(LONG)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_proxy_ftp.mak CFG="mod_proxy_ftp - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_proxy_http.mak CFG="mod_proxy_http - Win32
$(LONG)" RECURSE=0 $(CTARGET)
- cd ..\..
-!IF EXIST("srclib\openssl")
- cd modules\ssl
- $(MAKE) $(MAKEOPT) -f mod_ssl.mak CFG="mod_ssl - Win32 $(LONG)"
RECURSE=0 $(CTARGET) .\$(LONG)\mod_ssl.so
- cd ..\..
- cd support
- $(MAKE) $(MAKEOPT) -f abs.mak CFG="abs - Win32 $(LONG)" RECURSE=0
$(CTARGET)
- cd ..
-!ENDIF
- cd support
- $(MAKE) $(MAKEOPT) -f ab.mak CFG="ab - Win32 $(LONG)" RECURSE=0
$(CTARGET)
- $(MAKE) $(MAKEOPT) -f htdbm.mak CFG="htdbm - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f htdigest.mak CFG="htdigest - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f htpasswd.mak CFG="htpasswd - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f logresolve.mak CFG="logresolve - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f rotatelogs.mak CFG="rotatelogs - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- cd ..
- cd support\win32
- $(MAKE) $(MAKEOPT) -f ApacheMonitor.mak CFG="ApacheMonitor - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f wintty.mak CFG="wintty - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- cd ..\..
-
-!ELSEIF EXIST("Apache.sln")
+!IF EXIST("Apache.sln")
_cleanr:
$(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release CTARGET="/clean" _build
@@ -306,22 +179,22 @@
!ELSE
_cleanr:
- $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release CTARGET="/CLEAN" _build
+ @$(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release CTARGET="/CLEAN"
+_build
_cleand:
- $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=D LONG=Debug CTARGET="/CLEAN" _build
+ @$(MAKE) $(MAKEOPT) -f Makefile.win SHORT=D LONG=Debug CTARGET="/CLEAN"
+_build
_build:
- echo Building Win32 $(LONG) targets ($(SHORT) suffixes)
- msdev Apache.dsw /USEENV /MAKE \
+ @echo Building Win32 $(LONG) targets ($(SHORT) suffixes)
+ @msdev Apache.dsw /USEENV /MAKE \
"BuildBin - Win32 $(LONG)" $(CTARGET)
!IF EXIST("srclib\openssl")
- msdev Apache.dsw /USEENV /MAKE \
+ @msdev Apache.dsw /USEENV /MAKE \
"mod_ssl - Win32 $(LONG)" \
"abs - Win32 $(LONG)" /NORECURSE $(CTARGET)
!ENDIF
!IF EXIST("srclib\zlib")
- msdev Apache.dsw /USEENV /MAKE \
+ @msdev Apache.dsw /USEENV /MAKE \
"mod_deflate - Win32 $(LONG)" /NORECURSE $(CTARGET)
!ENDIF
