httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gsm...@apache.org
Subject svn commit: r1705790 - in /httpd/httpd/branches/2.4.x: Apache-apr2.dsw Apache.dsw Makefile.win
Date Mon, 28 Sep 2015 23:34:59 GMT
Author: gsmith
Date: Mon Sep 28 23:34:58 2015
New Revision: 1705790

URL: http://svn.apache.org/viewvc?rev=1705790&view=rev
Log:
Follow up to r1705751 to pick up a few strays

Modified:
    httpd/httpd/branches/2.4.x/Apache-apr2.dsw
    httpd/httpd/branches/2.4.x/Apache.dsw
    httpd/httpd/branches/2.4.x/Makefile.win

Modified: httpd/httpd/branches/2.4.x/Apache-apr2.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/Apache-apr2.dsw?rev=1705790&r1=1705789&r2=1705790&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/Apache-apr2.dsw (original)
+++ httpd/httpd/branches/2.4.x/Apache-apr2.dsw Mon Sep 28 23:34:58 2015
@@ -1723,7 +1723,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_h2"=.\modules\http2\mod_h2.dsp - Package Owner=<4>
+Project: "mod_http2"=.\modules\http2\mod_http2.dsp - Package Owner=<4>
 
 Package=<5>
 {{{

Modified: httpd/httpd/branches/2.4.x/Apache.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/Apache.dsw?rev=1705790&r1=1705789&r2=1705790&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/Apache.dsw (original)
+++ httpd/httpd/branches/2.4.x/Apache.dsw Mon Sep 28 23:34:58 2015
@@ -2041,7 +2041,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_h2"=.\modules\http2\mod_h2.dsp - Package Owner=<4>
+Project: "mod_http2"=.\modules\http2\mod_http2.dsp - Package Owner=<4>
 
 Package=<5>
 {{{

Modified: httpd/httpd/branches/2.4.x/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/Makefile.win?rev=1705790&r1=1705789&r2=1705790&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/Makefile.win (original)
+++ httpd/httpd/branches/2.4.x/Makefile.win Mon Sep 28 23:34:58 2015
@@ -220,13 +220,13 @@ _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
@@ -234,7 +234,7 @@ _trynghttp2:
 
 _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.
 
@@ -508,7 +508,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
@@ -784,7 +784,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



Mime
View raw message