diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2010-01-21 05:56:18 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2010-01-21 05:56:18 +0000 |
| commit | a9d3d06a543d4446abe8fc7b0bcc2648a019399f (patch) | |
| tree | 5d5edea63d2acc13f19f12c37b1ba9e1fb11e0cf /Makefile.win | |
| parent | 3560f2e01526672460eb4107c049dfd17dc18f95 (diff) | |
| download | httpd-a9d3d06a543d4446abe8fc7b0bcc2648a019399f.tar.gz | |
Add mod_serf to the win32 build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@901539 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.win')
| -rw-r--r-- | Makefile.win | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Makefile.win b/Makefile.win index 1da0bab7f5..23910fec5c 100644 --- a/Makefile.win +++ b/Makefile.win @@ -129,11 +129,17 @@ _tryzlib: cd modules\filters $(MAKE) $(MAKEOPT) -f mod_deflate.mak CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. + cd modules\proxy + $(MAKE) $(MAKEOPT) -f mod_serf.mak CFG="mod_serf - Win32 $(LONG)" RECURSE=0 $(CTARGET) + cd ..\.. !ELSEIF $(USESLN) == 1 devenv Apache.sln /useenv $(CTARGET) $(LONG) /project mod_deflate + devenv Apache.sln /useenv $(CTARGET) $(LONG) /project mod_serf !ELSE @msdev Apache.dsw /USEENV /MAKE \ "mod_deflate - Win32 $(LONG)" /NORECURSE $(CTARGET) + @msdev Apache.dsw /USEENV /MAKE \ + "mod_serf - Win32 $(LONG)" /NORECURSE $(CTARGET) !ENDIF !ELSE @@ -141,7 +147,7 @@ _tryzlib: _tryzlib: @echo ----- - @echo mod_deflate will not build unless zlib is installed in srclib\zlib. + @echo mod_deflate and mod_serf will not build unless zlib is built in srclib\zlib. @echo Version 1.2.1 and later available from http://www.gzip.org/zlib/ @echo built w/ nmake -f win32/Makefile.msc will satisfy this requirement. @@ -460,6 +466,9 @@ _build: $(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) $(MAKE) $(MAKEOPT) -f mod_proxy_scgi.mak CFG="mod_proxy_scgi - Win32 $(LONG)" RECURSE=0 $(CTARGET) +!IF EXIST("srclib\zlib") + $(MAKE) $(MAKEOPT) -f mod_serf.mak CFG="mod_serf - Win32 $(LONG)" RECURSE=0 $(CTARGET) +!ENDIF cd ..\.. cd modules\proxy\balancers $(MAKE) $(MAKEOPT) -f mod_lbmethod_bybusyness.mak CFG="mod_lbmethod_bybusyness - Win32 $(LONG)" RECURSE=0 $(CTARGET) |