Merge r1766160 from trunk:

[apache] / libhttpd.dsp

diff --git a/libhttpd.dsp b/libhttpd.dsp
index a2c1bf7fea32027d4b30199e5c1c8adc5ca1e8d1..ae4b17bedeb5440a6773ee5b338397c7b3854f82 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,17 +44,25 @@ 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 /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
+# 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 /map /machine:I386 /base:@"os\win32\BaseAddr.ref",libhttpd
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"os\win32\BaseAddr.ref",libhttpd
+# 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
 
 !ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
 
@@ -68,18 +77,61 @@ LINK32=link.exe
 # 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" /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 /map /debug /machine:I386 /base:@"os\win32\BaseAddr.ref",libhttpd
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"os\win32\BaseAddr.ref",libhttpd
+# 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 /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 
 
@@ -87,36 +139,29 @@ LINK32=link.exe
 
 # Name "libhttpd - Win32 Release"
 # Name "libhttpd - Win32 Debug"
-# Begin Group "core"
+# Name "libhttpd - Win32 Lexical"
+# Begin Group "headers"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
 
-SOURCE=.\include\ap_config.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\ap_mmn.h
+SOURCE=.\include\ap_compat.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\ap_release.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\server\buildmark.c
+SOURCE=.\include\ap_config.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\config.c
+SOURCE=.\include\ap_expr.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\connection.c
+SOURCE=.\include\ap_mmn.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\core.c
+SOURCE=.\include\ap_release.h
 # End Source File
 # Begin Source File
 
@@ -156,68 +201,28 @@ SOURCE=.\include\httpd.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\log.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\os\win32\modules.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\os\win32\os.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\server\protocol.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\server\request.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\server\scoreboard.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\scoreboard.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\server\vhost.c
-# End Source File
-# End Group
-# Begin Group "generated"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\server\gen_test_char.exe
+SOURCE=.\os\win32\win32_config_layout.h
 
 !IF  "$(CFG)" == "libhttpd - Win32 Release"
 
 # PROP Ignore_Default_Tool 1
-USERDEP__WIN32=".\include\os.h"        
-# Begin Custom Build - Generating test_char.h
-InputPath=.\server\gen_test_char.exe
+# Begin Custom Build - Creating include/ap_config_layout.h
+InputPath=.\os\win32\win32_config_layout.h
+
+".\include\ap_config_layout.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       type .\os\win32\win32_config_layout.h > .\include\ap_config_layout.h
 
-".\server\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       .\server\gen_test_char.exe >.\server\test_char.h 
-       echo Generated test_char.h from gen_test_char.exe 
-       
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
-USERDEP__WIN32=".\include\os.h"        
-# Begin Custom Build - Generating test_char.h
-InputPath=.\server\gen_test_char.exe
+# Begin Custom Build - Creating include/ap_config_layout.h
+InputPath=.\os\win32\win32_config_layout.h
+
+".\include\ap_config_layout.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       type .\os\win32\win32_config_layout.h > .\include\ap_config_layout.h
 
-".\server\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       .\server\gen_test_char.exe >.\server\test_char.h 
-       echo Generated test_char.h from gen_test_char.exe 
-       
 # End Custom Build
 
 !ENDIF 
@@ -225,30 +230,28 @@ InputPath=.\server\gen_test_char.exe
 # 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 - Generating 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_cgi.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       type .\modules\generators\mod_cgi.h > .\include\mod_cgi.h
 
-".\include\mod_core.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       xcopy /y .\modules\http\mod_core.h .\include
-       echo Created mod_core.h
-       
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Generating 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_cgi.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       type .\modules\generators\mod_cgi.h > .\include\mod_cgi.h
 
-".\include\mod_core.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       xcopy /y .\modules\http\mod_core.h .\include
-       echo Created mod_core.h
-       
 # End Custom Build
 
 !ENDIF 
@@ -256,30 +259,32 @@ 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"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Generating mod_dav.h
+# Begin Custom Build - Creating include/mod_dav.h
 InputPath=.\modules\dav\main\mod_dav.h
 
 ".\include\mod_dav.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       xcopy /y .\modules\dav\main\mod_dav.h .\include
-       echo Created mod_dav.h
-       
+       type .\modules\dav\main\mod_dav.h > .\include\mod_dav.h
+
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Generating mod_dav.h
+# Begin Custom Build - Creating include/mod_dav.h
 InputPath=.\modules\dav\main\mod_dav.h
 
 ".\include\mod_dav.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       xcopy /y .\modules\dav\main\mod_dav.h .\include
-       echo Created mod_dav.h
-       
+       type .\modules\dav\main\mod_dav.h > .\include\mod_dav.h
+
 # End Custom Build
 
 !ENDIF 
@@ -287,30 +292,28 @@ InputPath=.\modules\dav\main\mod_dav.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\modules\proxy\mod_proxy.h
+SOURCE=.\modules\filters\mod_include.h
 
 !IF  "$(CFG)" == "libhttpd - Win32 Release"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Generating mod_proxy.h
-InputPath=.\modules\proxy\mod_proxy.h
+# Begin Custom Build - Creating include/mod_include.h
+InputPath=.\modules\filters\mod_include.h
+
+".\include\mod_include.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       type .\modules\filters\mod_include.h > .\include\mod_include.h
 
-".\include\mod_proxy.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       xcopy /y .\modules\proxy\mod_proxy.h .\include
-       echo Created mod_proxy.h
-       
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Generating mod_proxy.h
-InputPath=.\modules\proxy\mod_proxy.h
+# Begin Custom Build - Creating include/mod_include.h
+InputPath=.\modules\filters\mod_include.h
+
+".\include\mod_include.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       type .\modules\filters\mod_include.h > .\include\mod_include.h
 
-".\include\mod_proxy.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       xcopy /y .\modules\proxy\mod_proxy.h .\include
-       echo Created mod_proxy.h
-       
 # End Custom Build
 
 !ENDIF 
@@ -318,30 +321,28 @@ InputPath=.\modules\proxy\mod_proxy.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\mpm\winnt\mpm.h
+SOURCE=.\modules\proxy\mod_proxy.h
 
 !IF  "$(CFG)" == "libhttpd - Win32 Release"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Generating mpm.h
-InputPath=.\server\mpm\winnt\mpm.h
+# Begin Custom Build - Creating include/mod_proxy.h
+InputPath=.\modules\proxy\mod_proxy.h
+
+".\include\mod_proxy.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       type .\modules\proxy\mod_proxy.h > .\include\mod_proxy.h
 
-".\include\mpm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       xcopy /y .\server\mpm\winnt\mpm.h .\include
-       echo Created mpm.h
-       
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Generating mpm.h
-InputPath=.\server\mpm\winnt\mpm.h
+# Begin Custom Build - Creating include/mod_proxy.h
+InputPath=.\modules\proxy\mod_proxy.h
+
+".\include\mod_proxy.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       type .\modules\proxy\mod_proxy.h > .\include\mod_proxy.h
 
-".\include\mpm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       xcopy /y .\server\mpm\winnt\mpm.h .\include
-       echo Created mpm.h
-       
 # End Custom Build
 
 !ENDIF 
@@ -349,30 +350,28 @@ InputPath=.\server\mpm\winnt\mpm.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\mpm\winnt\mpm_default.h
+SOURCE=.\modules\core\mod_so.h
 
 !IF  "$(CFG)" == "libhttpd - Win32 Release"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Generating mpm_default.h
-InputPath=.\server\mpm\winnt\mpm_default.h
+# 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
 
-".\include\mpm_default.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       xcopy /y .\server\mpm\winnt\mpm_default.h .\include
-       echo Created mpm_default.h
-       
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Generating mpm_default.h
-InputPath=.\server\mpm\winnt\mpm_default.h
+# 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
 
-".\include\mpm_default.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       xcopy /y .\server\mpm\winnt\mpm_default.h .\include
-       echo Created mpm_default.h
-       
 # End Custom Build
 
 !ENDIF 
@@ -385,25 +384,23 @@ SOURCE=.\os\win32\os.h
 !IF  "$(CFG)" == "libhttpd - Win32 Release"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Generating os.h
+# Begin Custom Build - Creating include/os.h
 InputPath=.\os\win32\os.h
 
 ".\include\os.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       xcopy /y .\os\win32\os.h .\include
-       echo Created os.h
-       
+       type .\os\win32\os.h > .\include\os.h
+
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Generating os.h
+# Begin Custom Build - Creating include/os.h
 InputPath=.\os\win32\os.h
 
 ".\include\os.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       xcopy /y .\os\win32\os.h .\include
-       echo Created os.h
-       
+       type .\os\win32\os.h > .\include\os.h
+
 # End Custom Build
 
 !ENDIF 
@@ -419,10 +416,47 @@ SOURCE=.\server\test_char.h
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=.\server\buildmark.c
+# PROP Exclude_From_Build 1
+# 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
+
+SOURCE=.\server\connection.c
+# End Source File
+# Begin Source File
+
+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
@@ -431,7 +465,19 @@ SOURCE=.\modules\http\http_request.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\modules\http\mod_core.h
+SOURCE=.\server\log.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\protocol.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\request.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\vhost.c
 # End Source File
 # End Group
 # Begin Group "modules"
@@ -439,27 +485,35 @@ SOURCE=.\modules\http\mod_core.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\modules\mappers\mod_so.c
+SOURCE=.\modules\core\mod_so.c
 # End Source File
 # Begin Source File
 
 SOURCE=.\modules\arch\win32\mod_win32.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\os\win32\modules.c
+# End Source File
 # End Group
 # Begin Group "util"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\server\error_bucket.c
+SOURCE=.\include\ap_regex.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\rfc1413.c
+SOURCE=.\server\eoc_bucket.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\rfc1413.h
+SOURCE=.\server\eor_bucket.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\error_bucket.c
 # End Source File
 # Begin Source File
 
@@ -479,10 +533,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_cookies.h
+# 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
@@ -499,6 +593,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
@@ -511,6 +621,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
@@ -531,15 +645,19 @@ SOURCE=.\include\ap_listen.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\ap_mpm.h
+SOURCE=.\os\win32\ap_regkey.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\listen.c
+SOURCE=.\include\ap_regkey.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\mpm\winnt\mpm.h
+SOURCE=.\server\mpm\winnt\child.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\listen.c
 # End Source File
 # Begin Source File
 
@@ -552,10 +670,7 @@ SOURCE=.\include\mpm_common.h
 # Begin Source File
 
 SOURCE=.\server\mpm\winnt\mpm_default.h
-# End Source File
-# Begin Source File
 
-SOURCE=.\include\mpm_status.h
 # End Source File
 # Begin Source File
 
@@ -571,7 +686,15 @@ SOURCE=.\server\mpm\winnt\nt_eventlog.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\mpm\winnt\registry.c
+SOURCE=.\server\provider.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\scoreboard.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\scoreboard.h
 # End Source File
 # Begin Source File
 
@@ -580,36 +703,111 @@ SOURCE=.\server\mpm\winnt\service.c
 # End Group
 # Begin Source File
 
-SOURCE=.\build\win32\libhttpd.rc
+SOURCE=.\server\gen_test_char.exe
+
+!IF  "$(CFG)" == "libhttpd - Win32 Release"
+
+# 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
+
+!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
+
+# 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
+
+!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 Group "Generated Files"
+
+# 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 "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 "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