Now uses $ACE_ROOT/bin

2 files changed, 27 insertions, 32 deletions

diff --git a/netsvcs/clients/Naming/Client/Client_Test.dsp b/netsvcs/clients/Naming/Client/Client_Test.dsp
index 77aa0def6e0..6cdc92d791c 100644
--- a/netsvcs/clients/Naming/Client/Client_Test.dsp
+++ b/netsvcs/clients/Naming/Client/Client_Test.dsp
@@ -13,18 +13,16 @@ CFG=NETSVCS Naming Client DLL - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE

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

 !MESSAGE 

-!MESSAGE NMAKE /f "Client_Test.mak"\

- CFG="NETSVCS Naming Client DLL - Win32 Debug"

+!MESSAGE NMAKE /f "Client_Test.mak" CFG="NETSVCS Naming Client DLL - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "NETSVCS Naming Client DLL - Win32 Release" (based on\

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

-!MESSAGE "NETSVCS Naming Client DLL - Win32 Debug" (based on\

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

+!MESSAGE "NETSVCS Naming Client DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "NETSVCS Naming Client DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -47,8 +45,8 @@ RSC=rc.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

 # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\...." /I "..\..\..\..\\" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /FD /c

 # SUBTRACT CPP /YX

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

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

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

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

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

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

 BSC32=bscmake.exe

@@ -56,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 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:windows /dll /machine:I386

-# ADD LINK32 ace.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\..\..\ace"

+# ADD LINK32 ace.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\..\bin\Client_Test.dll" /libpath:"..\..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "NETSVCS Naming Client DLL - Win32 Debug"

 

@@ -74,8 +72,8 @@ LINK32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

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

 # SUBTRACT CPP /YX

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

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

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

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

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

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

 BSC32=bscmake.exe

@@ -83,7 +81,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 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:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Client_Testd.dll" /pdbtype:sept /libpath:"..\..\..\..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\..\bin\Client_Testd.dll" /pdbtype:sept /libpath:"..\..\..\..\ace"

 

 !ENDIF 

 

diff --git a/netsvcs/lib/netsvcs.dsp b/netsvcs/lib/netsvcs.dsp
index b734c04ad21..05d935c48e3 100644
--- a/netsvcs/lib/netsvcs.dsp
+++ b/netsvcs/lib/netsvcs.dsp
@@ -18,17 +18,14 @@ CFG=NETSVCS Library - Win32 Alpha Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "NETSVCS Library - Win32 Release" (based on\

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

-!MESSAGE "NETSVCS Library - Win32 Debug" (based on\

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

-!MESSAGE "NETSVCS Library - Win32 Alpha Debug" (based on\

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

-!MESSAGE "NETSVCS Library - Win32 Alpha Release" (based on\

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

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

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

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

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

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -60,7 +57,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 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:windows /dll /machine:I386

-# ADD LINK32 ace.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 ace.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\bin\netsvcs.dll" /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Debug"

 

@@ -90,7 +87,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 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:windows /dll /debug /machine:I386

-# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"netsvcsd.dll" /libpath:"..\..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\bin\netsvcsd.dll" /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Alpha Debug"

 

@@ -106,12 +103,12 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "netsvcs"

-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 /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /MTd /c

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

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

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

+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"

@@ -136,12 +133,12 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "netsvcs"

-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 "..\..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

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

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

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

+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"