diff options
| author | Yann Ylavic <ylavic@apache.org> | 2015-09-29 11:12:59 +0200 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2015-09-29 11:12:59 +0200 |
| commit | 719890b9bdc09141834ea66a00c7ac3cdc3665e7 (patch) | |
| tree | 9bd4109467fd6156a4596c30432d8373f59534b5 /Makefile.win | |
| parent | had a couple different trains of thought mashed together (diff) | |
| download | apache2-719890b9bdc09141834ea66a00c7ac3cdc3665e7.tar.xz apache2-719890b9bdc09141834ea66a00c7ac3cdc3665e7.zip | |
Sync http2 stuff with 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705819 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.win')
| -rw-r--r-- | Makefile.win | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.win b/Makefile.win index a953f60fdb..5f6a791a0b 100644 --- a/Makefile.win +++ b/Makefile.win @@ -250,21 +250,21 @@ _trylua: _trynghttp2: !IF $(USEMAK) == 1 cd modules\http2 - $(MAKE) $(MAKEOPT) -f mod_h2.mak CFG="mod_h2 - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f mod_http2.mak CFG="mod_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. !ELSEIF $(USESLN) == 1 - devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_h2 + devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_http2 !ELSE @msdev $(TLP).dsw /USEENV /MAKE \ - "mod_h2 - Win32 $(LONG)" /NORECURSE $(CTARGET) + "mod_http2 - Win32 $(LONG)" /NORECURSE $(CTARGET) !ENDIF !ELSE -# NOT EXIST("srclib\lua") +# NOT EXIST("srclib\nghttp2") _trynghttp2: @echo ----- - @echo mod_h2 will not build unless nghttp2 is installed in srclib\nghttp2. + @echo mod_http2 will not build unless nghttp2 is installed in srclib\nghttp2. @echo Version 1.0 includes an lib\makefile.msvc that will satisfy this @echo requirement. @@ -539,7 +539,7 @@ _build: cd ..\.. !IF EXIST("srclib\nghttp2") cd modules\http2 - $(MAKE) $(MAKEOPT) -f mod_h2.mak CFG="mod_h2 - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f mod_http2.mak CFG="mod_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. !ENDIF cd modules\loggers @@ -829,7 +829,7 @@ _copybin: copy modules\generators\$(LONG)\mod_status.$(src_so) "$(inst_so)" <.y copy modules\http\$(LONG)\mod_mime.$(src_so) "$(inst_so)" <.y !IF EXIST("srclib\nghttp2") - copy modules\http2\$(LONG)\mod_h2.$(src_so) "$(inst_so)" <.y + copy modules\http2\$(LONG)\mod_http2.$(src_so) "$(inst_so)" <.y !IF "$(SHORT)" == "D" copy srclib\nghttp2\lib\MSVC_obj\nghttp2d.$(src_dll) "$(inst_dll)" <.y !ELSE |