Update mergeinfo only: r1735891 was merged to 2.4.x in r1787728.

[apache] / libhttpd.dsp

diff --git a/libhttpd.dsp b/libhttpd.dsp
index 6f517591318638fc2e8aa0897de134490888de02..a1f7e92d4e3e114e394523972b2508eb9f63d82b 100644 (file)
--- a/libhttpd.dsp
+++ b/libhttpd.dsp
@@ -19,6 +19,7 @@ CFG=libhttpd - Win32 Release
 !MESSAGE 
 !MESSAGE "libhttpd - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "libhttpd - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libhttpd - Win32 Lexical" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -43,30 +44,24 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd_cl" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd_cl" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /fo"Release/libhttpd.res" /i "./include" /i "./srclib/apr/include" /d "NDEBUG" /d BIN_NAME="libhttpd.dll" /d LONG_NAME="Apache HTTP Server Core"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib "Release\buildmark.obj" /nologo /subsystem:windows /dll /debug /debugtype:both /machine:I386 /pdbtype:sept /base:@"os\win32\BaseAddr.ref",libhttpd.dll
-# Begin Custom Build - Extracting .dbg symbols from $(InputPath)
-InputPath=.\Release\libhttpd.dll
-SOURCE="$(InputPath)"
-
-".\Release\libhttpd.dbr" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       rebase -q -p -i "./os/win32/BaseAddr.ref" -x ".\Release" $(InputPath)
-       echo rebased > ".\Release\libhttpd.dbr"
-
-# End Custom Build
+# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll
+# ADD LINK32 pcre.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib "Release\buildmark.obj" /nologo /subsystem:windows /dll /debug /libpath:"./srclib/pcre" /base:@"os\win32\BaseAddr.ref",libhttpd.dll /opt:ref
 # Begin Special Build Tool
+TargetPath=.\Release\libhttpd.dll
 SOURCE="$(InputPath)"
 PreLink_Desc=Compiling buildmark
-PreLink_Cmds=cl.exe /nologo /MD /W3 /O2 /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd" /FD /c server\buildmark.c /Fo"Release\buildmark.obj"
+PreLink_Cmds=cl.exe /nologo /MD /W3 /O2 /Oy- /Zi /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd" /FD /c server\buildmark.c /Fo"Release\buildmark.obj"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
@@ -82,30 +77,69 @@ PreLink_Cmds=cl.exe /nologo /MD /W3 /O2 /I "./include" /I "./srclib/apr/include"
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd_cl" /FD /c
+# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd_cl" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /fo"Debug/libhttpd.res" /i "./include" /i "./srclib/apr/include" /d "_DEBUG" /d BIN_NAME="libhttpd.dll" /d LONG_NAME="Apache HTTP Server Core"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib "Debug\buildmark.obj" /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /base:@"os\win32\BaseAddr.ref",libhttpd.dll
+# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug
+# ADD LINK32 pcred.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib "Debug\buildmark.obj" /nologo /subsystem:windows /dll /incremental:no /debug /libpath:"./srclib/pcre" /base:@"os\win32\BaseAddr.ref",libhttpd.dll
 # Begin Special Build Tool
+TargetPath=.\Debug\libhttpd.dll
 SOURCE="$(InputPath)"
 PreLink_Desc=Compiling buildmark
-PreLink_Cmds=cl.exe /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd" /FD /c server\buildmark.c /Fo"Debug\buildmark.obj"
+PreLink_Cmds=cl.exe /nologo /MDd /W3 /EHsc /Zi /Od /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd" /FD /c server\buildmark.c /Fo"Debug\buildmark.obj"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
 # End Special Build Tool
 
+!ELSEIF  "$(CFG)" == "libhttpd - Win32 Lexical"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd_cl" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /fo"Release/libhttpd.res" /i "./include" /i "./srclib/apr/include" /d "NDEBUG" /d BIN_NAME="libhttpd.dll" /d LONG_NAME="Apache HTTP Server Core"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll
+# ADD LINK32 pcre.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib "Release\buildmark.obj" /nologo /subsystem:windows /dll /debug /libpath:"./srclib/pcre" /base:@"os\win32\BaseAddr.ref",libhttpd.dll /opt:ref
+# Begin Special Build Tool
+TargetPath=.\Release\libhttpd.dll
+SOURCE="$(InputPath)"
+PreLink_Desc=Compiling buildmark
+PreLink_Cmds=cl.exe /nologo /MD /W3 /O2 /Oy- /Zi /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd" /FD /c server\buildmark.c /Fo"Release\buildmark.obj"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+
 !ENDIF 
 
 # Begin Target
 
 # Name "libhttpd - Win32 Release"
 # Name "libhttpd - Win32 Debug"
+# Name "libhttpd - Win32 Lexical"
 # Begin Group "headers"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -119,6 +153,10 @@ SOURCE=.\include\ap_config.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\include\ap_expr.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\include\ap_mmn.h
 # End Source File
 # Begin Source File
@@ -163,27 +201,27 @@ SOURCE=.\include\httpd.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\modules\generators\mod_cgi.h
+SOURCE=.\os\win32\win32_config_layout.h
 
 !IF  "$(CFG)" == "libhttpd - Win32 Release"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/mod_cgi.h
-InputPath=.\modules\generators\mod_cgi.h
+# Begin Custom Build - Creating include/ap_config_layout.h
+InputPath=.\os\win32\win32_config_layout.h
 
-".\include\mod_cgi.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       type .\modules\generators\mod_cgi.h > .\include\mod_cgi.h
+".\include\ap_config_layout.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       type .\os\win32\win32_config_layout.h > .\include\ap_config_layout.h
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/mod_cgi.h
-InputPath=.\modules\generators\mod_cgi.h
+# Begin Custom Build - Creating include/ap_config_layout.h
+InputPath=.\os\win32\win32_config_layout.h
 
-".\include\mod_cgi.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       type .\modules\generators\mod_cgi.h > .\include\mod_cgi.h
+".\include\ap_config_layout.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       type .\os\win32\win32_config_layout.h > .\include\ap_config_layout.h
 
 # End Custom Build
 
@@ -192,27 +230,27 @@ InputPath=.\modules\generators\mod_cgi.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\modules\http\mod_core.h
+SOURCE=.\modules\generators\mod_cgi.h
 
 !IF  "$(CFG)" == "libhttpd - Win32 Release"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/mod_core.h
-InputPath=.\modules\http\mod_core.h
+# Begin Custom Build - Creating include/mod_cgi.h
+InputPath=.\modules\generators\mod_cgi.h
 
-".\include\mod_core.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       type .\modules\http\mod_core.h > .\include\mod_core.h
+".\include\mod_cgi.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       type .\modules\generators\mod_cgi.h > .\include\mod_cgi.h
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/mod_core.h
-InputPath=.\modules\http\mod_core.h
+# Begin Custom Build - Creating include/mod_cgi.h
+InputPath=.\modules\generators\mod_cgi.h
 
-".\include\mod_core.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       type .\modules\http\mod_core.h > .\include\mod_core.h
+".\include\mod_cgi.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       type .\modules\generators\mod_cgi.h > .\include\mod_cgi.h
 
 # End Custom Build
 
@@ -221,6 +259,10 @@ InputPath=.\modules\http\mod_core.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\include\mod_core.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\modules\dav\main\mod_dav.h
 
 !IF  "$(CFG)" == "libhttpd - Win32 Release"
@@ -308,6 +350,64 @@ InputPath=.\modules\proxy\mod_proxy.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\modules\core\mod_so.h
+
+!IF  "$(CFG)" == "libhttpd - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating include/mod_so.h
+InputPath=.\modules\core\mod_so.h
+
+".\include\mod_so.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       type .\modules\core\mod_so.h > .\include\mod_so.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating include/mod_so.h
+InputPath=.\modules\core\mod_so.h
+
+".\include\mod_so.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       type .\modules\core\mod_so.h > .\include\mod_so.h
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\modules\core\mod_watchdog.h
+
+!IF  "$(CFG)" == "libhttpd - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating include/mod_watchdog.h
+InputPath=.\modules\core\mod_watchdog.h
+
+".\include\mod_watchdog.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       type .\modules\core\mod_watchdog.h > .\include\mod_watchdog.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating include/mod_watchdog.h
+InputPath=.\modules\core\mod_watchdog.h
+
+".\include\mod_watchdog.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       type .\modules\core\mod_watchdog.h > .\include\mod_watchdog.h
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\os\win32\os.h
 
 !IF  "$(CFG)" == "libhttpd - Win32 Release"
@@ -339,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"
 
@@ -350,6 +454,14 @@ SOURCE=.\server\buildmark.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\modules\http\byterange_filter.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\modules\http\chunk_filter.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\server\config.c
 # End Source File
 # Begin Source File
@@ -362,10 +474,22 @@ SOURCE=.\server\core.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\server\core_filters.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\modules\http\http_core.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\modules\http\http_etag.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\modules\http\http_filters.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\modules\http\http_protocol.c
 # End Source File
 # Begin Source File
@@ -394,7 +518,7 @@ SOURCE=.\server\vhost.c
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\modules\mappers\mod_so.c
+SOURCE=.\modules\core\mod_so.c
 # End Source File
 # Begin Source File
 
@@ -410,6 +534,18 @@ SOURCE=.\os\win32\modules.c
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=.\include\ap_regex.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\eoc_bucket.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\eor_bucket.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\server\error_bucket.c
 # End Source File
 # Begin Source File
@@ -430,10 +566,50 @@ SOURCE=.\include\util_charset.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\server\util_cookies.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\util_debug.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\include\util_ebcdic.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\server\util_expr_private.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\util_expr_eval.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\util_expr_scan.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\util_expr_scan.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\util_expr_parse.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\util_expr_parse.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\util_fcgi.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\util_fcgi.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\server\util_filter.c
 # End Source File
 # Begin Source File
@@ -450,6 +626,22 @@ SOURCE=.\include\util_md5.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\server\util_mutex.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\util_mutex.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\util_pcre.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\util_regex.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\server\util_script.c
 # End Source File
 # Begin Source File
@@ -462,6 +654,10 @@ SOURCE=.\server\util_time.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\include\util_varbuf.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\os\win32\util_win32.c
 # End Source File
 # Begin Source File
@@ -482,10 +678,6 @@ SOURCE=.\include\ap_listen.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\ap_mpm.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\os\win32\ap_regkey.c
 # End Source File
 # Begin Source File
@@ -502,35 +694,6 @@ SOURCE=.\server\listen.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\mpm\winnt\mpm.h
-
-!IF  "$(CFG)" == "libhttpd - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/mpm.h
-InputPath=.\server\mpm\winnt\mpm.h
-
-".\include\mpm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       type .\server\mpm\winnt\mpm.h > .\include\mpm.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/mpm.h
-InputPath=.\server\mpm\winnt\mpm.h
-
-".\include\mpm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       type .\server\mpm\winnt\mpm.h > .\include\mpm.h
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
 SOURCE=.\server\mpm_common.c
 # End Source File
 # Begin Source File
@@ -541,30 +704,6 @@ SOURCE=.\include\mpm_common.h
 
 SOURCE=.\server\mpm\winnt\mpm_default.h
 
-!IF  "$(CFG)" == "libhttpd - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/mpm_default.h
-InputPath=.\server\mpm\winnt\mpm_default.h
-
-".\include\mpm_default.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       type .\server\mpm\winnt\mpm_default.h > .\include\mpm_default.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/mpm_default.h
-InputPath=.\server\mpm\winnt\mpm_default.h
-
-".\include\mpm_default.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       type .\server\mpm\winnt\mpm_default.h > .\include\mpm_default.h
-
-# End Custom Build
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
@@ -623,41 +762,85 @@ InputPath=.\server\gen_test_char.exe
 
 # End Custom Build
 
+!ELSEIF  "$(CFG)" == "libhttpd - Win32 Lexical"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__GEN_T=".\include\os.h"
+# Begin Custom Build - Generating test_char.h from gen_test_char.exe
+InputPath=.\server\gen_test_char.exe
+
+".\server\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       .\server\gen_test_char.exe >.\server\test_char.h
+
+# End Custom Build
+
 !ENDIF 
 
 # End Source File
-# Begin Source File
+# Begin Group "Generated Files"
 
-SOURCE=.\build\win32\libhttpd.rc
-# End Source File
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\build\win32\win32ver.awk
+SOURCE=.\server\util_expr_parse.y
 
 !IF  "$(CFG)" == "libhttpd - Win32 Release"
 
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "libhttpd - Win32 Lexical"
+
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=.\build\win32\win32ver.awk
+# Begin Custom Build - Generating util_expr_parse.c/.h from util_expr_parse.y
+InputPath=.\server\util_expr_parse.y
 
-".\build\win32\libhttpd.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       awk -f ./build/win32/win32ver.awk libhttpd.dll "Apache HTTP Server Core"  ./include/ap_release.h > .\build\win32\libhttpd.rc
+BuildCmds= \
+       bison -pap_expr_yy --defines=.\server\util_expr_parse.h -o .\server\util_expr_parse.c .\server\util_expr_parse.y
 
+".\server\util_expr_parse.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+".\server\util_expr_parse.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
 # End Custom Build
 
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\util_expr_scan.l
+
+!IF  "$(CFG)" == "libhttpd - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
 !ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
 
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "libhttpd - Win32 Lexical"
+
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=.\build\win32\win32ver.awk
+# Begin Custom Build - Generating util_expr_scan.c from util_expr_scan.l
+InputPath=.\server\util_expr_scan.l
 
-".\build\win32\libhttpd.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       awk -f ./build/win32/win32ver.awk libhttpd.dll "Apache HTTP Server Core"  ./include/ap_release.h > .\build\win32\libhttpd.rc
+".\server\util_expr_scan.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       flex -Pap_expr_yy -o .\server\util_expr_scan.c .\server\util_expr_scan.l
 
 # End Custom Build
 
-!ENDIF 
+!ENDIF
+
+# End Source File
+# End Group
+# Begin Source File
 
+SOURCE=.\build\win32\httpd.rc
 # End Source File
 # End Target
 # End Project