backport r1821195 from trunk and add util_debug.c to libhttpd.mak

http://mail-archives.apache.org/mod_mbox/httpd-dev/201801.mbox/%3C4C412873-869D-4A0C-89E6-397706EFA1F7@apachelounge.com%3E

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

diff --git a/libhttpd.dsp b/libhttpd.dsp
index 7fbc85e7b5d9cb37023df14af9af2b84b3d6842a..a1f7e92d4e3e114e394523972b2508eb9f63d82b 100644 (file)
--- a/libhttpd.dsp
+++ b/libhttpd.dsp
@@ -439,6 +439,10 @@ InputPath=.\os\win32\os.h
 
 SOURCE=.\server\test_char.h
 # End Source File
+# Begin Source File
+
+SOURCE=.\include\util_cookies.h
+# End Source File
 # End Group
 # Begin Group "httpd"
 
@@ -566,7 +570,7 @@ SOURCE=.\server\util_cookies.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\util_cookies.h
+SOURCE=.\server\util_debug.c
 # End Source File
 # Begin Source File
 

diff --git a/libhttpd.mak b/libhttpd.mak
index caabb552646b5d64853d18e59ef5ac4efa94c955..031c033e51194d5052c32da94e37d8e4f9a12574 100644 (file)
--- a/libhttpd.mak
+++ b/libhttpd.mak
@@ -85,6 +85,7 @@ CLEAN :
        -@erase "$(INTDIR)\util.obj"
        -@erase "$(INTDIR)\util_cfgtree.obj"
        -@erase "$(INTDIR)\util_cookies.obj"
+       -@erase "$(INTDIR)\util_debug.obj"
        -@erase "$(INTDIR)\util_expr_eval.obj"
        -@erase "$(INTDIR)\util_expr_parse.obj"
        -@erase "$(INTDIR)\util_expr_scan.obj"
@@ -176,6 +177,7 @@ LINK32_OBJS= \
        "$(INTDIR)\util.obj" \
        "$(INTDIR)\util_cfgtree.obj" \
        "$(INTDIR)\util_cookies.obj" \
+       "$(INTDIR)\util_debug.obj" \
        "$(INTDIR)\util_expr_eval.obj" \
        "$(INTDIR)\util_expr_scan.obj" \
        "$(INTDIR)\util_expr_parse.obj" \
@@ -281,6 +283,7 @@ CLEAN :
        -@erase "$(INTDIR)\util.obj"
        -@erase "$(INTDIR)\util_cfgtree.obj"
        -@erase "$(INTDIR)\util_cookies.obj"
+       -@erase "$(INTDIR)\util_debug.obj"
        -@erase "$(INTDIR)\util_expr_eval.obj"
        -@erase "$(INTDIR)\util_expr_parse.obj"
        -@erase "$(INTDIR)\util_expr_scan.obj"
@@ -379,6 +382,7 @@ LINK32_OBJS= \
        "$(INTDIR)\util.obj" \
        "$(INTDIR)\util_cfgtree.obj" \
        "$(INTDIR)\util_cookies.obj" \
+       "$(INTDIR)\util_debug.obj" \
        "$(INTDIR)\util_expr_eval.obj" \
        "$(INTDIR)\util_expr_scan.obj" \
        "$(INTDIR)\util_expr_parse.obj" \
@@ -484,6 +488,7 @@ CLEAN :
        -@erase "$(INTDIR)\util.obj"
        -@erase "$(INTDIR)\util_cfgtree.obj"
        -@erase "$(INTDIR)\util_cookies.obj"
+       -@erase "$(INTDIR)\util_debug.obj"
        -@erase "$(INTDIR)\util_expr_eval.obj"
        -@erase "$(INTDIR)\util_expr_parse.obj"
        -@erase "$(INTDIR)\util_expr_scan.obj"
@@ -577,6 +582,7 @@ LINK32_OBJS= \
        "$(INTDIR)\util.obj" \
        "$(INTDIR)\util_cfgtree.obj" \
        "$(INTDIR)\util_cookies.obj" \
+       "$(INTDIR)\util_debug.obj" \
        "$(INTDIR)\util_expr_eval.obj" \
        "$(INTDIR)\util_expr_scan.obj" \
        "$(INTDIR)\util_expr_parse.obj" \
@@ -1002,6 +1008,12 @@ SOURCE=.\server\util_cookies.c
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+SOURCE=.\server\util_debug.c
+
+"$(INTDIR)\util_debug.obj" : $(SOURCE) "$(INTDIR)" ".\include\os.h" ".\include\ap_config_layout.h"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 SOURCE=.\server\util_expr_eval.c
 
 "$(INTDIR)\util_expr_eval.obj" : $(SOURCE) "$(INTDIR)" ".\include\os.h" ".\include\ap_config_layout.h"