Update Win32 command line makefiles for r1889793

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1889869 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/libhttpd.mak b/libhttpd.mak
index 031c033e51194d5052c32da94e37d8e4f9a12574..b8872ce2ba7a8eec450f9139d4bb7206ad0e3e8b 100644 (file)
--- a/libhttpd.mak
+++ b/libhttpd.mak
@@ -82,6 +82,7 @@ CLEAN :
        -@erase "$(INTDIR)\request.obj"
        -@erase "$(INTDIR)\scoreboard.obj"
        -@erase "$(INTDIR)\service.obj"
+       -@erase "$(INTDIR)\ssl.obj"
        -@erase "$(INTDIR)\util.obj"
        -@erase "$(INTDIR)\util_cfgtree.obj"
        -@erase "$(INTDIR)\util_cookies.obj"
@@ -200,6 +201,7 @@ LINK32_OBJS= \
        "$(INTDIR)\provider.obj" \
        "$(INTDIR)\scoreboard.obj" \
        "$(INTDIR)\service.obj" \
+       "$(INTDIR)\ssl.obj" \
        "$(INTDIR)\libhttpd.res" \
        ".\srclib\apr\Release\libapr-1.lib" \
        ".\srclib\apr-iconv\Release\libapriconv-1.lib" \
@@ -280,6 +282,7 @@ CLEAN :
        -@erase "$(INTDIR)\request.obj"
        -@erase "$(INTDIR)\scoreboard.obj"
        -@erase "$(INTDIR)\service.obj"
+       -@erase "$(INTDIR)\ssl.obj"
        -@erase "$(INTDIR)\util.obj"
        -@erase "$(INTDIR)\util_cfgtree.obj"
        -@erase "$(INTDIR)\util_cookies.obj"
@@ -405,6 +408,7 @@ LINK32_OBJS= \
        "$(INTDIR)\provider.obj" \
        "$(INTDIR)\scoreboard.obj" \
        "$(INTDIR)\service.obj" \
+       "$(INTDIR)\ssl.obj" \
        "$(INTDIR)\libhttpd.res" \
        ".\srclib\apr\Debug\libapr-1.lib" \
        ".\srclib\apr-iconv\Debug\libapriconv-1.lib" \
@@ -485,6 +489,7 @@ CLEAN :
        -@erase "$(INTDIR)\request.obj"
        -@erase "$(INTDIR)\scoreboard.obj"
        -@erase "$(INTDIR)\service.obj"
+       -@erase "$(INTDIR)\ssl.obj"
        -@erase "$(INTDIR)\util.obj"
        -@erase "$(INTDIR)\util_cfgtree.obj"
        -@erase "$(INTDIR)\util_cookies.obj"
@@ -605,6 +610,7 @@ LINK32_OBJS= \
        "$(INTDIR)\provider.obj" \
        "$(INTDIR)\scoreboard.obj" \
        "$(INTDIR)\service.obj" \
+       "$(INTDIR)\ssl.obj" \
        "$(INTDIR)\libhttpd.res"
 
 "$(OUTDIR)\libhttpd.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -1146,6 +1152,12 @@ SOURCE=.\server\mpm\winnt\service.c
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+SOURCE=.\server\ssl.c
+
+"$(INTDIR)\ssl.obj" : $(SOURCE) "$(INTDIR)" ".\include\os.h" ".\include\ap_config_layout.h"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 SOURCE=.\server\util_expr_parse.y
 
 !IF  "$(CFG)" == "libhttpd - Win32 Release"

diff --git a/modules/md/mod_md.mak b/modules/md/mod_md.mak
index b39d36507ef3aaee18cb88e004429966dcd38b1c..30b3730a55e1cdcf682f4e96ac308a908572488b 100644 (file)
--- a/modules/md/mod_md.mak
+++ b/modules/md/mod_md.mak
@@ -65,11 +65,11 @@ CLEAN :
        -@erase "$(INTDIR)\md_acme_authz.obj"\r
        -@erase "$(INTDIR)\md_acme_drive.obj"\r
        -@erase "$(INTDIR)\md_acme_order.obj"\r
-       -@erase "$(INTDIR)\md_acmev1_drive.obj"\r
        -@erase "$(INTDIR)\md_acmev2_drive.obj"\r
        -@erase "$(INTDIR)\md_core.obj"\r
        -@erase "$(INTDIR)\md_crypt.obj"\r
        -@erase "$(INTDIR)\md_curl.obj"\r
+       -@erase "$(INTDIR)\md_event.obj"\r
        -@erase "$(INTDIR)\md_http.obj"\r
        -@erase "$(INTDIR)\md_json.obj"\r
        -@erase "$(INTDIR)\md_jws.obj"\r
@@ -152,6 +152,7 @@ LINK32_OBJS= \
        "$(INTDIR)\md_core.obj" \\r
        "$(INTDIR)\md_crypt.obj" \\r
        "$(INTDIR)\md_curl.obj" \\r
+       "$(INTDIR)\md_event.obj" \\r
        "$(INTDIR)\md_http.obj" \\r
        "$(INTDIR)\md_json.obj" \\r
        "$(INTDIR)\md_jws.obj" \\r
@@ -169,7 +170,6 @@ LINK32_OBJS= \
        "$(INTDIR)\md_acme_authz.obj" \\r
        "$(INTDIR)\md_acme_drive.obj" \\r
        "$(INTDIR)\md_acme_order.obj" \\r
-       "$(INTDIR)\md_acmev1_drive.obj" \\r
        "$(INTDIR)\md_acmev2_drive.obj" \\r
        "$(INTDIR)\mod_md.res" \\r
        "..\..\srclib\apr\Release\libapr-1.lib" \\r
@@ -224,11 +224,11 @@ CLEAN :
        -@erase "$(INTDIR)\md_acme_authz.obj"\r
        -@erase "$(INTDIR)\md_acme_drive.obj"\r
        -@erase "$(INTDIR)\md_acme_order.obj"\r
-       -@erase "$(INTDIR)\md_acmev1_drive.obj"\r
        -@erase "$(INTDIR)\md_acmev2_drive.obj"\r
        -@erase "$(INTDIR)\md_core.obj"\r
        -@erase "$(INTDIR)\md_crypt.obj"\r
        -@erase "$(INTDIR)\md_curl.obj"\r
+       -@erase "$(INTDIR)\md_event.obj"\r
        -@erase "$(INTDIR)\md_http.obj"\r
        -@erase "$(INTDIR)\md_json.obj"\r
        -@erase "$(INTDIR)\md_jws.obj"\r
@@ -311,6 +311,7 @@ LINK32_OBJS= \
        "$(INTDIR)\md_core.obj" \\r
        "$(INTDIR)\md_crypt.obj" \\r
        "$(INTDIR)\md_curl.obj" \\r
+       "$(INTDIR)\md_event.obj" \\r
        "$(INTDIR)\md_http.obj" \\r
        "$(INTDIR)\md_json.obj" \\r
        "$(INTDIR)\md_jws.obj" \\r
@@ -328,7 +329,6 @@ LINK32_OBJS= \
        "$(INTDIR)\md_acme_authz.obj" \\r
        "$(INTDIR)\md_acme_drive.obj" \\r
        "$(INTDIR)\md_acme_order.obj" \\r
-       "$(INTDIR)\md_acmev1_drive.obj" \\r
        "$(INTDIR)\md_acmev2_drive.obj" \\r
        "$(INTDIR)\mod_md.res" \\r
        "..\..\srclib\apr\Debug\libapr-1.lib" \\r
@@ -490,11 +490,6 @@ SOURCE=./md_acme_order.c
 "$(INTDIR)\md_acme_order.obj" : $(SOURCE) "$(INTDIR)"\r
 \r
 \r
-SOURCE=./md_acmev1_drive.c\r
-\r
-"$(INTDIR)\md_acmev1_drive.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
 SOURCE=./md_acmev2_drive.c\r
 \r
 "$(INTDIR)\md_acmev2_drive.obj" : $(SOURCE) "$(INTDIR)"\r
@@ -515,6 +510,11 @@ SOURCE=./md_curl.c
 "$(INTDIR)\md_curl.obj" : $(SOURCE) "$(INTDIR)"\r
 \r
 \r
+SOURCE=./md_event.c\r
+\r
+"$(INTDIR)\md_event.obj" : $(SOURCE) "$(INTDIR)"\r
+\r
+\r
 SOURCE=./md_http.c\r
 \r
 "$(INTDIR)\md_http.obj" : $(SOURCE) "$(INTDIR)"\r