Renamed VC 4.2 makefiles.

2 files changed, 83 insertions, 20 deletions

diff --git a/apps/JAWS/server/jaws.mak b/apps/JAWS/server/jaws4.mak
index 71b6a070580..4dcc5d9d72e 100644
--- a/apps/JAWS/server/jaws.mak
+++ b/apps/JAWS/server/jaws4.mak
@@ -13,7 +13,7 @@ CFG=jaws - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE on this makefile

 !MESSAGE by defining the macro CFG on the command line.  For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "jaws.mak" CFG="jaws - Win32 Debug"

+!MESSAGE NMAKE /f "jaws4.mak" CFG="jaws - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

@@ -69,7 +69,7 @@ CLEAN :
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

 # ADD CPP /nologo /MDd /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "ACE_NLOGGING" /YX /c

 CPP_PROJ=/nologo /MDd /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D\

- "_CONSOLE" /D "ACE_NLOGGING" /Fp"$(INTDIR)/jaws.pch" /YX /Fo"$(INTDIR)/" /c 

+ "_CONSOLE" /D "ACE_NLOGGING" /Fp"$(INTDIR)/jaws4.pch" /YX /Fo"$(INTDIR)/" /c 

 CPP_OBJS=.\Release/

 CPP_SBRS=.\.

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

@@ -77,7 +77,7 @@ CPP_SBRS=.\.
 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/jaws.bsc" 

+BSC32_FLAGS=/nologo /o"$(OUTDIR)/jaws4.bsc" 

 BSC32_SBRS= \

 	

 LINK32=link.exe

@@ -118,7 +118,7 @@ LINK32_OBJS= \
 OUTDIR=.

 INTDIR=.\Debug

 

-ALL : "$(OUTDIR)\jaws.exe"

+ALL : "$(OUTDIR)\jaws4.exe"

 

 CLEAN : 

 	-@erase "$(INTDIR)\HTTP_Config.obj"

@@ -132,9 +132,9 @@ CLEAN :
 	-@erase "$(INTDIR)\Parse_Headers.obj"

 	-@erase "$(INTDIR)\vc40.idb"

 	-@erase "$(INTDIR)\vc40.pdb"

-	-@erase "$(OUTDIR)\jaws.exe"

-	-@erase "$(OUTDIR)\jaws.ilk"

-	-@erase "$(OUTDIR)\jaws.pdb"

+	-@erase "$(OUTDIR)\jaws4.exe"

+	-@erase "$(OUTDIR)\jaws4.ilk"

+	-@erase "$(OUTDIR)\jaws4.pdb"

 

 "$(INTDIR)" :

     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

@@ -142,7 +142,7 @@ CLEAN :
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

 CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D\

- "_CONSOLE" /Fp"$(INTDIR)/jaws.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

+ "_CONSOLE" /Fp"$(INTDIR)/jaws4.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

 CPP_OBJS=.\Debug/

 CPP_SBRS=.\.

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -150,7 +150,7 @@ CPP_SBRS=.\.
 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/jaws.bsc" 

+BSC32_FLAGS=/nologo /o"$(OUTDIR)/jaws4.bsc" 

 BSC32_SBRS= \

 	

 LINK32=link.exe

@@ -159,7 +159,7 @@ LINK32=link.exe
 LINK32_FLAGS=wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib\

  winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\

  uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\

- /pdb:"$(OUTDIR)/jaws.pdb" /debug /machine:I386 /out:"$(OUTDIR)/jaws.exe" 

+ /pdb:"$(OUTDIR)/jaws4.pdb" /debug /machine:I386 /out:"$(OUTDIR)/jaws4.exe" 

 LINK32_OBJS= \

 	"$(INTDIR)\HTTP_Config.obj" \

 	"$(INTDIR)\HTTP_Handler.obj" \

@@ -171,7 +171,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\main.obj" \

 	"$(INTDIR)\Parse_Headers.obj"

 

-"$(OUTDIR)\jaws.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

+"$(OUTDIR)\jaws4.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

     $(LINK32) @<<

   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

@@ -234,6 +234,8 @@ DEP_CPP_MAIN_=\
 	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

+	{$(INCLUDE)}"\ace\Basic_Types.h"\

+	{$(INCLUDE)}"\ace\Basic_Types.i"\

 	{$(INCLUDE)}"\ace\config-win32-common.h"\

 	{$(INCLUDE)}"\ace\config.h"\

 	{$(INCLUDE)}"\ace\Containers.cpp"\

@@ -251,9 +253,11 @@ DEP_CPP_MAIN_=\
 	{$(INCLUDE)}"\ace\Handle_Set.i"\

 	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

 	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

+	{$(INCLUDE)}"\ace\inc_user_config.h"\

 	{$(INCLUDE)}"\ace\INET_Addr.h"\

 	{$(INCLUDE)}"\ace\INET_Addr.i"\

 	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

+	{$(INCLUDE)}"\ace\iosfwd.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.i"\

 	{$(INCLUDE)}"\ace\LOCK_SOCK_Acceptor.h"\

@@ -311,13 +315,13 @@ DEP_CPP_MAIN_=\
 	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

 	{$(INCLUDE)}"\ace\SString.h"\

 	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

 	{$(INCLUDE)}"\ace\Strategies.h"\

 	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

 	{$(INCLUDE)}"\ace\Strategies_T.h"\

 	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

 	{$(INCLUDE)}"\ace\Stream_Modules.h"\

 	{$(INCLUDE)}"\ace\Stream_Modules.i"\

+	{$(INCLUDE)}"\ace\streams.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

@@ -332,6 +336,7 @@ DEP_CPP_MAIN_=\
 	{$(INCLUDE)}"\ace\Synch_T.cpp"\

 	{$(INCLUDE)}"\ace\Synch_T.h"\

 	{$(INCLUDE)}"\ace\Synch_T.i"\

+	{$(INCLUDE)}"\ace\sys_conf.h"\

 	{$(INCLUDE)}"\ace\Task.h"\

 	{$(INCLUDE)}"\ace\Task.i"\

 	{$(INCLUDE)}"\ace\Task_T.cpp"\

@@ -351,6 +356,8 @@ DEP_CPP_MAIN_=\
 	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

 	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

+	{$(INCLUDE)}"\sys\stat.h"\

+	{$(INCLUDE)}"\sys\types.h"\

 	

 

 "$(INTDIR)\main.obj" : $(SOURCE) $(DEP_CPP_MAIN_) "$(INTDIR)"

@@ -370,10 +377,14 @@ DEP_CPP_HTTP_=\
 	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

+	{$(INCLUDE)}"\ace\Basic_Types.h"\

+	{$(INCLUDE)}"\ace\Basic_Types.i"\

 	{$(INCLUDE)}"\ace\config-win32-common.h"\

 	{$(INCLUDE)}"\ace\config.h"\

 	{$(INCLUDE)}"\ace\Event_Handler.h"\

 	{$(INCLUDE)}"\ace\Event_Handler.i"\

+	{$(INCLUDE)}"\ace\inc_user_config.h"\

+	{$(INCLUDE)}"\ace\iosfwd.h"\

 	{$(INCLUDE)}"\ace\Log_Msg.h"\

 	{$(INCLUDE)}"\ace\Log_Priority.h"\

 	{$(INCLUDE)}"\ace\Log_Record.h"\

@@ -387,7 +398,7 @@ DEP_CPP_HTTP_=\
 	{$(INCLUDE)}"\ace\OS.i"\

 	{$(INCLUDE)}"\ace\SString.h"\

 	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

+	{$(INCLUDE)}"\ace\streams.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

@@ -397,11 +408,14 @@ DEP_CPP_HTTP_=\
 	{$(INCLUDE)}"\ace\Synch_T.cpp"\

 	{$(INCLUDE)}"\ace\Synch_T.h"\

 	{$(INCLUDE)}"\ace\Synch_T.i"\

+	{$(INCLUDE)}"\ace\sys_conf.h"\

 	{$(INCLUDE)}"\ace\Thread.h"\

 	{$(INCLUDE)}"\ace\Thread.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\Version.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

+	{$(INCLUDE)}"\sys\stat.h"\

+	{$(INCLUDE)}"\sys\types.h"\

 	

 

 "$(INTDIR)\HTTP_Helpers.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)"

@@ -428,6 +442,8 @@ DEP_CPP_HTTP_H=\
 	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

+	{$(INCLUDE)}"\ace\Basic_Types.h"\

+	{$(INCLUDE)}"\ace\Basic_Types.i"\

 	{$(INCLUDE)}"\ace\config-win32-common.h"\

 	{$(INCLUDE)}"\ace\config.h"\

 	{$(INCLUDE)}"\ace\Containers.cpp"\

@@ -443,6 +459,8 @@ DEP_CPP_HTTP_H=\
 	{$(INCLUDE)}"\ace\Handle_Set.i"\

 	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

 	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

+	{$(INCLUDE)}"\ace\inc_user_config.h"\

+	{$(INCLUDE)}"\ace\iosfwd.h"\

 	{$(INCLUDE)}"\ace\Log_Msg.h"\

 	{$(INCLUDE)}"\ace\Log_Priority.h"\

 	{$(INCLUDE)}"\ace\Log_Record.h"\

@@ -478,7 +496,7 @@ DEP_CPP_HTTP_H=\
 	{$(INCLUDE)}"\ace\Signal.i"\

 	{$(INCLUDE)}"\ace\SString.h"\

 	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

+	{$(INCLUDE)}"\ace\streams.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

@@ -489,6 +507,7 @@ DEP_CPP_HTTP_H=\
 	{$(INCLUDE)}"\ace\Synch_T.cpp"\

 	{$(INCLUDE)}"\ace\Synch_T.h"\

 	{$(INCLUDE)}"\ace\Synch_T.i"\

+	{$(INCLUDE)}"\ace\sys_conf.h"\

 	{$(INCLUDE)}"\ace\Thread.h"\

 	{$(INCLUDE)}"\ace\Thread.i"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

@@ -498,6 +517,8 @@ DEP_CPP_HTTP_H=\
 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\Version.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

+	{$(INCLUDE)}"\sys\stat.h"\

+	{$(INCLUDE)}"\sys\types.h"\

 	

 

 "$(INTDIR)\HTTP_Handler.obj" : $(SOURCE) $(DEP_CPP_HTTP_H) "$(INTDIR)"

@@ -522,6 +543,8 @@ DEP_CPP_IO_CP=\
 	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

+	{$(INCLUDE)}"\ace\Basic_Types.h"\

+	{$(INCLUDE)}"\ace\Basic_Types.i"\

 	{$(INCLUDE)}"\ace\config-win32-common.h"\

 	{$(INCLUDE)}"\ace\config.h"\

 	{$(INCLUDE)}"\ace\Containers.cpp"\

@@ -537,8 +560,10 @@ DEP_CPP_IO_CP=\
 	{$(INCLUDE)}"\ace\Handle_Set.i"\

 	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

 	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

+	{$(INCLUDE)}"\ace\inc_user_config.h"\

 	{$(INCLUDE)}"\ace\INET_Addr.h"\

 	{$(INCLUDE)}"\ace\INET_Addr.i"\

+	{$(INCLUDE)}"\ace\iosfwd.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.i"\

 	{$(INCLUDE)}"\ace\Log_Msg.h"\

@@ -582,7 +607,7 @@ DEP_CPP_IO_CP=\
 	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

 	{$(INCLUDE)}"\ace\SString.h"\

 	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

+	{$(INCLUDE)}"\ace\streams.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

@@ -593,6 +618,7 @@ DEP_CPP_IO_CP=\
 	{$(INCLUDE)}"\ace\Synch_T.cpp"\

 	{$(INCLUDE)}"\ace\Synch_T.h"\

 	{$(INCLUDE)}"\ace\Synch_T.i"\

+	{$(INCLUDE)}"\ace\sys_conf.h"\

 	{$(INCLUDE)}"\ace\Thread.h"\

 	{$(INCLUDE)}"\ace\Thread.i"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

@@ -602,6 +628,8 @@ DEP_CPP_IO_CP=\
 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\Version.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

+	{$(INCLUDE)}"\sys\stat.h"\

+	{$(INCLUDE)}"\sys\types.h"\

 	

 

 "$(INTDIR)\IO.obj" : $(SOURCE) $(DEP_CPP_IO_CP) "$(INTDIR)"

@@ -624,6 +652,8 @@ DEP_CPP_HTTP_R=\
 	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

+	{$(INCLUDE)}"\ace\Basic_Types.h"\

+	{$(INCLUDE)}"\ace\Basic_Types.i"\

 	{$(INCLUDE)}"\ace\config-win32-common.h"\

 	{$(INCLUDE)}"\ace\config.h"\

 	{$(INCLUDE)}"\ace\Containers.cpp"\

@@ -634,6 +664,8 @@ DEP_CPP_HTTP_R=\
 	{$(INCLUDE)}"\ace\Free_List.cpp"\

 	{$(INCLUDE)}"\ace\Free_List.h"\

 	{$(INCLUDE)}"\ace\Free_List.i"\

+	{$(INCLUDE)}"\ace\inc_user_config.h"\

+	{$(INCLUDE)}"\ace\iosfwd.h"\

 	{$(INCLUDE)}"\ace\Log_Msg.h"\

 	{$(INCLUDE)}"\ace\Log_Priority.h"\

 	{$(INCLUDE)}"\ace\Log_Record.h"\

@@ -660,7 +692,7 @@ DEP_CPP_HTTP_R=\
 	{$(INCLUDE)}"\ace\Signal.i"\

 	{$(INCLUDE)}"\ace\SString.h"\

 	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

+	{$(INCLUDE)}"\ace\streams.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

@@ -670,11 +702,14 @@ DEP_CPP_HTTP_R=\
 	{$(INCLUDE)}"\ace\Synch_T.cpp"\

 	{$(INCLUDE)}"\ace\Synch_T.h"\

 	{$(INCLUDE)}"\ace\Synch_T.i"\

+	{$(INCLUDE)}"\ace\sys_conf.h"\

 	{$(INCLUDE)}"\ace\Thread.h"\

 	{$(INCLUDE)}"\ace\Thread.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\Version.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

+	{$(INCLUDE)}"\sys\stat.h"\

+	{$(INCLUDE)}"\sys\types.h"\

 	

 

 "$(INTDIR)\HTTP_Request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)"

@@ -710,6 +745,8 @@ DEP_CPP_HTTP_S=\
 	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

+	{$(INCLUDE)}"\ace\Basic_Types.h"\

+	{$(INCLUDE)}"\ace\Basic_Types.i"\

 	{$(INCLUDE)}"\ace\config-win32-common.h"\

 	{$(INCLUDE)}"\ace\config.h"\

 	{$(INCLUDE)}"\ace\Containers.cpp"\

@@ -730,9 +767,11 @@ DEP_CPP_HTTP_S=\
 	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

 	{$(INCLUDE)}"\ace\High_Res_Timer.h"\

 	{$(INCLUDE)}"\ace\High_Res_Timer.i"\

+	{$(INCLUDE)}"\ace\inc_user_config.h"\

 	{$(INCLUDE)}"\ace\INET_Addr.h"\

 	{$(INCLUDE)}"\ace\INET_Addr.i"\

 	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

+	{$(INCLUDE)}"\ace\iosfwd.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.i"\

 	{$(INCLUDE)}"\ace\LOCK_SOCK_Acceptor.h"\

@@ -792,13 +831,13 @@ DEP_CPP_HTTP_S=\
 	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

 	{$(INCLUDE)}"\ace\SString.h"\

 	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

 	{$(INCLUDE)}"\ace\Strategies.h"\

 	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

 	{$(INCLUDE)}"\ace\Strategies_T.h"\

 	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

 	{$(INCLUDE)}"\ace\Stream_Modules.h"\

 	{$(INCLUDE)}"\ace\Stream_Modules.i"\

+	{$(INCLUDE)}"\ace\streams.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

@@ -813,6 +852,7 @@ DEP_CPP_HTTP_S=\
 	{$(INCLUDE)}"\ace\Synch_T.cpp"\

 	{$(INCLUDE)}"\ace\Synch_T.h"\

 	{$(INCLUDE)}"\ace\Synch_T.i"\

+	{$(INCLUDE)}"\ace\sys_conf.h"\

 	{$(INCLUDE)}"\ace\Task.h"\

 	{$(INCLUDE)}"\ace\Task.i"\

 	{$(INCLUDE)}"\ace\Task_T.cpp"\

@@ -841,6 +881,8 @@ DEP_CPP_HTTP_S=\
 	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

 	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

+	{$(INCLUDE)}"\sys\stat.h"\

+	{$(INCLUDE)}"\sys\types.h"\

 	

 

 "$(INTDIR)\HTTP_Server.obj" : $(SOURCE) $(DEP_CPP_HTTP_S) "$(INTDIR)"

@@ -859,8 +901,12 @@ DEP_CPP_HTTP_C=\
 	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

+	{$(INCLUDE)}"\ace\Basic_Types.h"\

+	{$(INCLUDE)}"\ace\Basic_Types.i"\

 	{$(INCLUDE)}"\ace\config-win32-common.h"\

 	{$(INCLUDE)}"\ace\config.h"\

+	{$(INCLUDE)}"\ace\inc_user_config.h"\

+	{$(INCLUDE)}"\ace\iosfwd.h"\

 	{$(INCLUDE)}"\ace\Log_Msg.h"\

 	{$(INCLUDE)}"\ace\Log_Priority.h"\

 	{$(INCLUDE)}"\ace\Log_Record.h"\

@@ -874,10 +920,13 @@ DEP_CPP_HTTP_C=\
 	{$(INCLUDE)}"\ace\OS.i"\

 	{$(INCLUDE)}"\ace\SString.h"\

 	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

+	{$(INCLUDE)}"\ace\streams.h"\

+	{$(INCLUDE)}"\ace\sys_conf.h"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\Version.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

+	{$(INCLUDE)}"\sys\stat.h"\

+	{$(INCLUDE)}"\sys\types.h"\

 	

 

 "$(INTDIR)\HTTP_Config.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)"

@@ -904,10 +953,14 @@ DEP_CPP_HTTP_RE=\
 	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

+	{$(INCLUDE)}"\ace\Basic_Types.h"\

+	{$(INCLUDE)}"\ace\Basic_Types.i"\

 	{$(INCLUDE)}"\ace\config-win32-common.h"\

 	{$(INCLUDE)}"\ace\config.h"\

 	{$(INCLUDE)}"\ace\Event_Handler.h"\

 	{$(INCLUDE)}"\ace\Event_Handler.i"\

+	{$(INCLUDE)}"\ace\inc_user_config.h"\

+	{$(INCLUDE)}"\ace\iosfwd.h"\

 	{$(INCLUDE)}"\ace\Log_Msg.h"\

 	{$(INCLUDE)}"\ace\Log_Priority.h"\

 	{$(INCLUDE)}"\ace\Log_Record.h"\

@@ -925,7 +978,7 @@ DEP_CPP_HTTP_RE=\
 	{$(INCLUDE)}"\ace\Process.i"\

 	{$(INCLUDE)}"\ace\SString.h"\

 	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

+	{$(INCLUDE)}"\ace\streams.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

@@ -935,11 +988,14 @@ DEP_CPP_HTTP_RE=\
 	{$(INCLUDE)}"\ace\Synch_T.cpp"\

 	{$(INCLUDE)}"\ace\Synch_T.h"\

 	{$(INCLUDE)}"\ace\Synch_T.i"\

+	{$(INCLUDE)}"\ace\sys_conf.h"\

 	{$(INCLUDE)}"\ace\Thread.h"\

 	{$(INCLUDE)}"\ace\Thread.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\Version.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

+	{$(INCLUDE)}"\sys\stat.h"\

+	{$(INCLUDE)}"\sys\types.h"\

 	

 

 "$(INTDIR)\HTTP_Response.obj" : $(SOURCE) $(DEP_CPP_HTTP_RE) "$(INTDIR)"

@@ -958,8 +1014,12 @@ DEP_CPP_PARSE=\
 	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

+	{$(INCLUDE)}"\ace\Basic_Types.h"\

+	{$(INCLUDE)}"\ace\Basic_Types.i"\

 	{$(INCLUDE)}"\ace\config-win32-common.h"\

 	{$(INCLUDE)}"\ace\config.h"\

+	{$(INCLUDE)}"\ace\inc_user_config.h"\

+	{$(INCLUDE)}"\ace\iosfwd.h"\

 	{$(INCLUDE)}"\ace\Log_Msg.h"\

 	{$(INCLUDE)}"\ace\Log_Priority.h"\

 	{$(INCLUDE)}"\ace\Log_Record.h"\

@@ -973,10 +1033,13 @@ DEP_CPP_PARSE=\
 	{$(INCLUDE)}"\ace\OS.i"\

 	{$(INCLUDE)}"\ace\SString.h"\

 	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

+	{$(INCLUDE)}"\ace\streams.h"\

+	{$(INCLUDE)}"\ace\sys_conf.h"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\Version.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

+	{$(INCLUDE)}"\sys\stat.h"\

+	{$(INCLUDE)}"\sys\types.h"\

 	

 

 "$(INTDIR)\Parse_Headers.obj" : $(SOURCE) $(DEP_CPP_PARSE) "$(INTDIR)"

diff --git a/apps/JAWS/server/jaws.mdp b/apps/JAWS/server/jaws4.mdp
index c47b690503e..8741fedb12c 100644
--- a/apps/JAWS/server/jaws.mdp
+++ b/apps/JAWS/server/jaws4.mdp