From 0d7920c3df1d645b86c1ddb8dc3a4801d41797ff Mon Sep 17 00:00:00 2001 From: Gregg Lewis Smith Date: Thu, 28 Apr 2016 21:18:43 +0000 Subject: [PATCH] follow up to r1741419 since we have these build files now also git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1741517 13f79535-47bb-0310-9956-ffa450edef68 --- modules/http2/mod_http2.dep | 31 --------------------- modules/http2/mod_http2.mak | 54 +++++++------------------------------ 2 files changed, 9 insertions(+), 76 deletions(-) diff --git a/modules/http2/mod_http2.dep b/modules/http2/mod_http2.dep index c4f7c5fc34..6e1a2b1ef4 100644 --- a/modules/http2/mod_http2.dep +++ b/modules/http2/mod_http2.dep @@ -103,7 +103,6 @@ ".\h2.h"\ ".\h2_bucket_eoc.h"\ ".\h2_conn_io.h"\ - ".\h2_io.h"\ ".\h2_mplx.h"\ ".\h2_private.h"\ ".\h2_session.h"\ @@ -154,7 +153,6 @@ "..\..\srclib\apr\include\apr_want.h"\ ".\h2.h"\ ".\h2_bucket_eos.h"\ - ".\h2_io.h"\ ".\h2_mplx.h"\ ".\h2_private.h"\ ".\h2_stream.h"\ @@ -279,7 +277,6 @@ ".\h2_ctx.h"\ ".\h2_filter.h"\ ".\h2_h2.h"\ - ".\h2_io.h"\ ".\h2_mplx.h"\ ".\h2_private.h"\ ".\h2_session.h"\ @@ -453,7 +450,6 @@ ".\h2_conn_io.h"\ ".\h2_ctx.h"\ ".\h2_filter.h"\ - ".\h2_io.h"\ ".\h2_mplx.h"\ ".\h2_private.h"\ ".\h2_push.h"\ @@ -523,7 +519,6 @@ ".\h2_private.h"\ ".\h2_response.h"\ ".\h2_task.h"\ - ".\h2_task_output.h"\ ".\h2_util.h"\ @@ -584,7 +579,6 @@ ".\h2_conn_io.h"\ ".\h2_ctx.h"\ ".\h2_h2.h"\ - ".\h2_io.h"\ ".\h2_private.h"\ ".\h2_request.h"\ ".\h2_session.h"\ @@ -602,7 +596,6 @@ "..\..\srclib\apr\include\apr_pools.h"\ "..\..\srclib\apr\include\apr_thread_mutex.h"\ "..\..\srclib\apr\include\apr_want.h"\ - ".\h2_int_queue.h"\ ./h2_io.c : \ @@ -652,7 +645,6 @@ "..\..\srclib\apr\include\apr_want.h"\ ".\h2.h"\ ".\h2_h2.h"\ - ".\h2_io.h"\ ".\h2_mplx.h"\ ".\h2_private.h"\ ".\h2_request.h"\ @@ -704,7 +696,6 @@ "..\..\srclib\apr\include\apr_time.h"\ "..\..\srclib\apr\include\apr_user.h"\ "..\..\srclib\apr\include\apr_want.h"\ - ".\h2_io.h"\ ".\h2_io_set.h"\ ".\h2_private.h"\ @@ -758,9 +749,6 @@ ".\h2_conn.h"\ ".\h2_ctx.h"\ ".\h2_h2.h"\ - ".\h2_int_queue.h"\ - ".\h2_io.h"\ - ".\h2_io_set.h"\ ".\h2_mplx.h"\ ".\h2_ngn_shed.h"\ ".\h2_private.h"\ @@ -768,8 +756,6 @@ ".\h2_response.h"\ ".\h2_stream.h"\ ".\h2_task.h"\ - ".\h2_task_input.h"\ - ".\h2_task_output.h"\ ".\h2_util.h"\ ".\h2_worker.h"\ ".\h2_workers.h"\ @@ -825,15 +811,12 @@ ".\h2_conn.h"\ ".\h2_ctx.h"\ ".\h2_h2.h"\ - ".\h2_int_queue.h"\ - ".\h2_io.h"\ ".\h2_mplx.h"\ ".\h2_ngn_shed.h"\ ".\h2_private.h"\ ".\h2_request.h"\ ".\h2_response.h"\ ".\h2_task.h"\ - ".\h2_task_output.h"\ ".\h2_util.h"\ ".\mod_http2.h"\ @@ -884,7 +867,6 @@ ".\h2.h"\ ".\h2_conn_io.h"\ ".\h2_h2.h"\ - ".\h2_io.h"\ ".\h2_private.h"\ ".\h2_push.h"\ ".\h2_request.h"\ @@ -1068,7 +1050,6 @@ ".\h2_filter.h"\ ".\h2_from_h1.h"\ ".\h2_h2.h"\ - ".\h2_io.h"\ ".\h2_mplx.h"\ ".\h2_private.h"\ ".\h2_push.h"\ @@ -1132,7 +1113,6 @@ ".\h2_ctx.h"\ ".\h2_filter.h"\ ".\h2_h2.h"\ - ".\h2_io.h"\ ".\h2_mplx.h"\ ".\h2_private.h"\ ".\h2_push.h"\ @@ -1141,7 +1121,6 @@ ".\h2_session.h"\ ".\h2_stream.h"\ ".\h2_task.h"\ - ".\h2_task_input.h"\ ".\h2_util.h"\ @@ -1266,15 +1245,12 @@ ".\h2_ctx.h"\ ".\h2_from_h1.h"\ ".\h2_h2.h"\ - ".\h2_io.h"\ ".\h2_mplx.h"\ ".\h2_private.h"\ ".\h2_request.h"\ ".\h2_session.h"\ ".\h2_stream.h"\ ".\h2_task.h"\ - ".\h2_task_input.h"\ - ".\h2_task_output.h"\ ".\h2_worker.h"\ @@ -1324,14 +1300,12 @@ ".\h2.h"\ ".\h2_conn.h"\ ".\h2_conn_io.h"\ - ".\h2_io.h"\ ".\h2_mplx.h"\ ".\h2_private.h"\ ".\h2_request.h"\ ".\h2_session.h"\ ".\h2_stream.h"\ ".\h2_task.h"\ - ".\h2_task_input.h"\ ".\h2_util.h"\ @@ -1384,7 +1358,6 @@ ".\h2_conn.h"\ ".\h2_conn_io.h"\ ".\h2_from_h1.h"\ - ".\h2_io.h"\ ".\h2_mplx.h"\ ".\h2_private.h"\ ".\h2_request.h"\ @@ -1392,7 +1365,6 @@ ".\h2_session.h"\ ".\h2_stream.h"\ ".\h2_task.h"\ - ".\h2_task_output.h"\ ".\h2_util.h"\ @@ -1500,7 +1472,6 @@ ".\h2_conn.h"\ ".\h2_ctx.h"\ ".\h2_h2.h"\ - ".\h2_io.h"\ ".\h2_mplx.h"\ ".\h2_private.h"\ ".\h2_task.h"\ @@ -1560,7 +1531,6 @@ "..\..\srclib\apr\include\apr_user.h"\ "..\..\srclib\apr\include\apr_want.h"\ ".\h2.h"\ - ".\h2_io.h"\ ".\h2_mplx.h"\ ".\h2_private.h"\ ".\h2_task.h"\ @@ -1630,7 +1600,6 @@ ".\h2_ctx.h"\ ".\h2_filter.h"\ ".\h2_h2.h"\ - ".\h2_io.h"\ ".\h2_mplx.h"\ ".\h2_push.h"\ ".\h2_request.h"\ diff --git a/modules/http2/mod_http2.mak b/modules/http2/mod_http2.mak index adc565b410..7f8b30cc1c 100644 --- a/modules/http2/mod_http2.mak +++ b/modules/http2/mod_http2.mak @@ -50,6 +50,7 @@ CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" "libhttpd CLEAN : !ENDIF -@erase "$(INTDIR)\h2_alt_svc.obj" + -@erase "$(INTDIR)\h2_bucket_beam.obj" -@erase "$(INTDIR)\h2_bucket_eoc.obj" -@erase "$(INTDIR)\h2_bucket_eos.obj" -@erase "$(INTDIR)\h2_config.obj" @@ -59,9 +60,6 @@ CLEAN : -@erase "$(INTDIR)\h2_filter.obj" -@erase "$(INTDIR)\h2_from_h1.obj" -@erase "$(INTDIR)\h2_h2.obj" - -@erase "$(INTDIR)\h2_int_queue.obj" - -@erase "$(INTDIR)\h2_io.obj" - -@erase "$(INTDIR)\h2_io_set.obj" -@erase "$(INTDIR)\h2_mplx.obj" -@erase "$(INTDIR)\h2_ngn_shed.obj" -@erase "$(INTDIR)\h2_push.obj" @@ -71,8 +69,6 @@ CLEAN : -@erase "$(INTDIR)\h2_stream.obj" -@erase "$(INTDIR)\h2_switch.obj" -@erase "$(INTDIR)\h2_task.obj" - -@erase "$(INTDIR)\h2_task_input.obj" - -@erase "$(INTDIR)\h2_task_output.obj" -@erase "$(INTDIR)\h2_util.obj" -@erase "$(INTDIR)\h2_worker.obj" -@erase "$(INTDIR)\h2_workers.obj" @@ -133,6 +129,7 @@ LINK32=link.exe LINK32_FLAGS=kernel32.lib nghttp2.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_http2.pdb" /debug /out:"$(OUTDIR)\mod_http2.so" /implib:"$(OUTDIR)\mod_http2.lib" /libpath:"..\..\srclib\nghttp2\lib\MSVC_obj" /base:@..\..\os\win32\BaseAddr.ref,mod_http2.so /opt:ref LINK32_OBJS= \ "$(INTDIR)\h2_alt_svc.obj" \ + "$(INTDIR)\h2_bucket_beam.obj" \ "$(INTDIR)\h2_bucket_eoc.obj" \ "$(INTDIR)\h2_bucket_eos.obj" \ "$(INTDIR)\h2_config.obj" \ @@ -142,9 +139,6 @@ LINK32_OBJS= \ "$(INTDIR)\h2_filter.obj" \ "$(INTDIR)\h2_from_h1.obj" \ "$(INTDIR)\h2_h2.obj" \ - "$(INTDIR)\h2_int_queue.obj" \ - "$(INTDIR)\h2_io.obj" \ - "$(INTDIR)\h2_io_set.obj" \ "$(INTDIR)\h2_mplx.obj" \ "$(INTDIR)\h2_ngn_shed.obj" \ "$(INTDIR)\h2_push.obj" \ @@ -154,8 +148,6 @@ LINK32_OBJS= \ "$(INTDIR)\h2_stream.obj" \ "$(INTDIR)\h2_switch.obj" \ "$(INTDIR)\h2_task.obj" \ - "$(INTDIR)\h2_task_input.obj" \ - "$(INTDIR)\h2_task_output.obj" \ "$(INTDIR)\h2_util.obj" \ "$(INTDIR)\h2_worker.obj" \ "$(INTDIR)\h2_workers.obj" \ @@ -208,6 +200,7 @@ CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" "libhttpd - W CLEAN : !ENDIF -@erase "$(INTDIR)\h2_alt_svc.obj" + -@erase "$(INTDIR)\h2_bucket_beam.obj" -@erase "$(INTDIR)\h2_bucket_eoc.obj" -@erase "$(INTDIR)\h2_bucket_eos.obj" -@erase "$(INTDIR)\h2_config.obj" @@ -217,9 +210,6 @@ CLEAN : -@erase "$(INTDIR)\h2_filter.obj" -@erase "$(INTDIR)\h2_from_h1.obj" -@erase "$(INTDIR)\h2_h2.obj" - -@erase "$(INTDIR)\h2_int_queue.obj" - -@erase "$(INTDIR)\h2_io.obj" - -@erase "$(INTDIR)\h2_io_set.obj" -@erase "$(INTDIR)\h2_mplx.obj" -@erase "$(INTDIR)\h2_ngn_shed.obj" -@erase "$(INTDIR)\h2_push.obj" @@ -229,8 +219,6 @@ CLEAN : -@erase "$(INTDIR)\h2_stream.obj" -@erase "$(INTDIR)\h2_switch.obj" -@erase "$(INTDIR)\h2_task.obj" - -@erase "$(INTDIR)\h2_task_input.obj" - -@erase "$(INTDIR)\h2_task_output.obj" -@erase "$(INTDIR)\h2_util.obj" -@erase "$(INTDIR)\h2_worker.obj" -@erase "$(INTDIR)\h2_workers.obj" @@ -291,6 +279,7 @@ LINK32=link.exe LINK32_FLAGS=kernel32.lib nghttp2d.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_http2.pdb" /debug /out:"$(OUTDIR)\mod_http2.so" /implib:"$(OUTDIR)\mod_http2.lib" /libpath:"..\..\srclib\nghttp2\lib\MSVC_obj" /base:@..\..\os\win32\BaseAddr.ref,mod_http2.so LINK32_OBJS= \ "$(INTDIR)\h2_alt_svc.obj" \ + "$(INTDIR)\h2_bucket_beam.obj" \ "$(INTDIR)\h2_bucket_eoc.obj" \ "$(INTDIR)\h2_bucket_eos.obj" \ "$(INTDIR)\h2_config.obj" \ @@ -300,9 +289,6 @@ LINK32_OBJS= \ "$(INTDIR)\h2_filter.obj" \ "$(INTDIR)\h2_from_h1.obj" \ "$(INTDIR)\h2_h2.obj" \ - "$(INTDIR)\h2_int_queue.obj" \ - "$(INTDIR)\h2_io.obj" \ - "$(INTDIR)\h2_io_set.obj" \ "$(INTDIR)\h2_mplx.obj" \ "$(INTDIR)\h2_ngn_shed.obj" \ "$(INTDIR)\h2_push.obj" \ @@ -312,8 +298,6 @@ LINK32_OBJS= \ "$(INTDIR)\h2_stream.obj" \ "$(INTDIR)\h2_switch.obj" \ "$(INTDIR)\h2_task.obj" \ - "$(INTDIR)\h2_task_input.obj" \ - "$(INTDIR)\h2_task_output.obj" \ "$(INTDIR)\h2_util.obj" \ "$(INTDIR)\h2_worker.obj" \ "$(INTDIR)\h2_workers.obj" \ @@ -438,6 +422,11 @@ SOURCE=./h2_alt_svc.c "$(INTDIR)\h2_alt_svc.obj" : $(SOURCE) "$(INTDIR)" +SOURCE=./h2_bucket_beam.c + +"$(INTDIR)/h2_bucket_beam.obj" : $(SOURCE) "$(INTDIR)" + + SOURCE=./h2_bucket_eoc.c "$(INTDIR)\h2_bucket_eoc.obj" : $(SOURCE) "$(INTDIR)" @@ -483,21 +472,6 @@ SOURCE=./h2_h2.c "$(INTDIR)\h2_h2.obj" : $(SOURCE) "$(INTDIR)" -SOURCE=./h2_int_queue.c - -"$(INTDIR)\h2_int_queue.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=./h2_io.c - -"$(INTDIR)\h2_io.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=./h2_io_set.c - -"$(INTDIR)\h2_io_set.obj" : $(SOURCE) "$(INTDIR)" - - SOURCE=./h2_mplx.c "$(INTDIR)\h2_mplx.obj" : $(SOURCE) "$(INTDIR)" @@ -543,16 +517,6 @@ SOURCE=./h2_task.c "$(INTDIR)\h2_task.obj" : $(SOURCE) "$(INTDIR)" -SOURCE=./h2_task_input.c - -"$(INTDIR)\h2_task_input.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=./h2_task_output.c - -"$(INTDIR)\h2_task_output.obj" : $(SOURCE) "$(INTDIR)" - - SOURCE=./h2_util.c "$(INTDIR)\h2_util.obj" : $(SOURCE) "$(INTDIR)" -- 2.40.0