*** empty log message ***

7 files changed, 49 insertions, 81 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index ee81b380407..124dd11cf31 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,15 @@
+Sun Jan 17 15:41:12 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+        * TAO/TAOACE_Static.dsw: Removed outdated project files.
+
+        * TAO/TAO_IDL/tao_idl.dsp:
+        * TAO/TAO_IDL/tao_idl_static.dsp:
+        * TAO/orbsvcs/orbsvcs/orbsvcs.dsp:
+        * TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp:
+        * TAO/tao/TAO.dsp:
+        * TAO/tao/TAO_Static.dsp: Rearranged the intermediate directory
+	  for DLL/LIB build to avoid confusing the build utility in VC.
+
 Sun Jan 17 15:34:17 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 	* orbsvcs/tests/EC_Multiple/EC_Multiple.cpp (wait_until_ready):
@@ -19,39 +31,39 @@ Sat Jan 16 22:54:14 1999  Ossama Othman  <othman@macarena.cs.wustl.edu>
 
 Sat Jan 16 11:49:45 1999  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* TAO_IDL/util/utl_global.cpp (add_to_included_idl_files): 
+	* TAO_IDL/util/utl_global.cpp (add_to_included_idl_files):
 	  Change line 515 from: this->n_included_idl_files_ += INCREMENT;
-	  to: this->n_allocated_idl_files_ += INCREMENT; 
+	  to: this->n_allocated_idl_files_ += INCREMENT;
 	  so that tao_idl won't crash when including 64 or more files.
 	  Thanks to Tommy Andreasen <tommy.andreasen@radiometer.dk>
 	  for reporting this.
 
 Fri Jan 15 19:11:10 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* examples/Simple/time/Time_Client_i.cpp:	
+	* examples/Simple/time/Time_Client_i.cpp:
 	* examples/Simple/time/Time_Client_i.h:
 	Added permissions for these files.
 
 Fri Jan 15 18:43:02 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* examples/Simple/time/Time_Client_i.cpp:	
+	* examples/Simple/time/Time_Client_i.cpp:
 	* examples/Simple/time/Time_Client_i.h:
-	New files added for implementing the Templates for 
+	New files added for implementing the Templates for
 	a single client/server model
 
 	* examples/Simple/time/Time_i.cpp:
 	* examples/Simple/time/Time_i.h:
 	* examples/Simple/time/server.cpp:
 	* examples/Simple/time/client.cpp:
-	Made  changes in a way such that server and client 
+	Made  changes in a way such that server and client
 	make instantiations of templates with their interface
-	objects. 
+	objects.
 
 	* examples/Simple/Simple_Util.h:
 	* examples/Simple/Simple_Util.cpp:
 	New files that have the template definitions and
 	implementation of those methods.
-	
+
 
 Fri Jan 15 17:24:36 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
 
diff --git a/TAO/TAOACE_Static.dsw b/TAO/TAOACE_Static.dsw
index 8791005d676..f18dc05ea5b 100644
--- a/TAO/TAOACE_Static.dsw
+++ b/TAO/TAOACE_Static.dsw
@@ -36,48 +36,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Simple Client Static"=.\tests\Simple\client_static.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE static library

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO Static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler Static

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Simple Server Static"=.\tests\Simple\server_static.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE static library

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO Static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler Static

-    End Project Dependency

-}}}

-

-###############################################################################

-

 Project: "TAO Static"=.\tao\TAO_Static.dsp - Package Owner=<4>

 

 Package=<5>

@@ -119,4 +77,3 @@ Package=<3>
 }}}

 

 ###############################################################################

-

diff --git a/TAO/TAO_IDL/tao_idl.dsp b/TAO/TAO_IDL/tao_idl.dsp
index 36395687e45..91c9931631f 100644
--- a/TAO/TAO_IDL/tao_idl.dsp
+++ b/TAO/TAO_IDL/tao_idl.dsp
@@ -39,7 +39,7 @@ CFG=TAO_IDL Compiler - Win32 Alpha Debug
 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

+# PROP Intermediate_Dir "DLL\Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

+# PROP Intermediate_Dir "DLL\Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

diff --git a/TAO/TAO_IDL/tao_idl_static.dsp b/TAO/TAO_IDL/tao_idl_static.dsp
index 1303701b5a1..83db9fd4688 100644
--- a/TAO/TAO_IDL/tao_idl_static.dsp
+++ b/TAO/TAO_IDL/tao_idl_static.dsp
@@ -38,7 +38,7 @@ RSC=rc.exe
 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

+# PROP Intermediate_Dir "LIB\Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

@@ -64,7 +64,7 @@ LINK32=link.exe
 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

+# PROP Intermediate_Dir "LIB\Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp b/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp
index 7a12a96b30e..d8f9d6b05c2 100644
--- a/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp
+++ b/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp
@@ -38,7 +38,7 @@ RSC=rc.exe
 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir ""

-# PROP Intermediate_Dir "Release\Static"

+# PROP Intermediate_Dir "LIB\Release"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

 # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\\" /I "..\..\\" /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D __ACE_INLINE__=0 /FD /c

@@ -62,7 +62,7 @@ LIB32=link.exe -lib
 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug\Static"

+# PROP Intermediate_Dir "LIB\Debug"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

 # ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "..\\" /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /YX /FD /c

diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index 0791add95b3..226ee3b0268 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -20,13 +20,12 @@ CFG=TAO - Win32 Alpha Debug
 !MESSAGE 

 !MESSAGE "TAO - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE "TAO - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "TAO - Win32 Alpha Release" (based on\

- "Win32 (ALPHA) Dynamic-Link Library")

-!MESSAGE "TAO - Win32 Alpha Debug" (based on\

- "Win32 (ALPHA) Dynamic-Link Library")

+!MESSAGE "TAO - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")

+!MESSAGE "TAO - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -40,7 +39,7 @@ CFG=TAO - Win32 Alpha Debug
 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

+# PROP Intermediate_Dir "DLL\Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

@@ -71,7 +70,7 @@ LINK32=link.exe
 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

+# PROP Intermediate_Dir "DLL\Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

@@ -105,14 +104,14 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-MTL=midl.exe

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

 CPP=cl.exe

-# ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /O2 /I "..\..\\" /I "..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c

+# ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /O2 /I "..\..\\ /I "..\\ /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MT /Gt0 /W3 /GX /O2 /I "..\..\\" /I "..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c

+# ADD CPP /nologo /MT /Gt0 /W3 /GX /O2 /I "..\..\\ /I "..\\ /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

 RSC=rc.exe

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

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

@@ -137,14 +136,14 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\..\\" /I "..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /MTd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\..\\ /I "..\\ /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /MTd /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\..\\" /I "..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\..\\ /I "..\\ /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /MTd /c

 # SUBTRACT CPP /YX

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 RSC=rc.exe

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

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

diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp
index 4edc265196b..3b96a275b1d 100644
--- a/TAO/tao/TAO_Static.dsp
+++ b/TAO/tao/TAO_Static.dsp
@@ -22,9 +22,11 @@ CFG=TAO Static - Win32 Debug
 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

+RSC=rc.exe

 

 !IF  "$(CFG)" == "TAO Static - Win32 Release"

 

@@ -36,14 +38,13 @@ CPP=cl.exe
 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir ""

-# PROP Intermediate_Dir "Release\Static"

+# PROP Intermediate_Dir "LIB\Release"

 # PROP Target_Dir ""

-RSC=rc.exe

-# ADD BASE RSC /l 0x409

-# ADD RSC /l 0x409

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

 # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D __ACE_INLINE__=0 /FD /c

 # SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -61,13 +62,12 @@ LIB32=link.exe -lib
 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug\Static"

+# PROP Intermediate_Dir "LIB\Debug"

 # PROP Target_Dir ""

-RSC=rc.exe

-# ADD BASE RSC /l 0x409

-# ADD RSC /l 0x409

 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

 # ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "..\..\\" /I "..\\" /D TAO_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /YX /FD /c

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo