minor changes

updated makefiles

4 files changed, 52 insertions, 55 deletions

diff --git a/examples/Registry/test_registry_iterator.mak b/examples/Registry/test_registry_iterator.mak
index 7a55ae4c82f..a7ee7f38af3 100644
--- a/examples/Registry/test_registry_iterator.mak
+++ b/examples/Registry/test_registry_iterator.mak
@@ -35,9 +35,8 @@ NULL=nul
 !ENDIF 
 ################################################################################
 # Begin Project
-# PROP Target_Last_Scanned "test_registry_iterator - Win32 Debug"
-RSC=rc.exe
 CPP=cl.exe
+RSC=rc.exe
 
 !IF  "$(CFG)" == "test_registry_iterator - Win32 Release"
 
@@ -55,9 +54,9 @@ CLEAN :
 	-@erase ".\test_registry_iterator.obj"
 
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /GX /O2 /I ".." /I " ..\stl" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /GX /O2 /I ".." /I " ..\stl" /D "WIN32" /D "NDEBUG"\
- /D "_CONSOLE" /Fp"test_registry_iterator.pch" /YX /c 
+# ADD CPP /nologo /MDd /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
+CPP_PROJ=/nologo /MDd /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\
+ /Fp"test_registry_iterator.pch" /YX /c 
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -67,12 +66,12 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)/test_registry_iterator.bsc"
 BSC32_SBRS=
 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:console /machine:I386
-# ADD LINK32 ace.lib c:\users\irfan\registry\ace\debug\registry.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 /machine:I386
-LINK32_FLAGS=ace.lib c:\users\irfan\registry\ace\debug\registry.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:no /pdb:"$(OUTDIR)/test_registry_iterator.pdb"\
- /machine:I386 /out:"$(OUTDIR)/test_registry_iterator.exe" 
+# ADD LINK32 ace.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 /machine:I386
+LINK32_FLAGS=ace.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:no\
+ /pdb:"$(OUTDIR)/test_registry_iterator.pdb" /machine:I386\
+ /out:"$(OUTDIR)/test_registry_iterator.exe" 
 LINK32_OBJS= \
 	"$(INTDIR)/test_registry_iterator.obj"
 
@@ -93,17 +92,17 @@ INTDIR=.
 ALL : "$(OUTDIR)\test_registry_iterator.exe"
 
 CLEAN : 
-	-@erase ".\vc40.pdb"
-	-@erase ".\vc40.idb"
 	-@erase ".\test_registry_iterator.exe"
 	-@erase ".\test_registry_iterator.obj"
 	-@erase ".\test_registry_iterator.ilk"
 	-@erase ".\test_registry_iterator.pdb"
+	-@erase ".\vc40.pdb"
+	-@erase ".\vc40.idb"
 
 # 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 ".." /I " ..\stl" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /I " ..\stl" /D "WIN32" /D\
- "_DEBUG" /D "_CONSOLE" /Fp"test_registry_iterator.pch" /YX /c 
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
+ /Fp"test_registry_iterator.pch" /YX /c 
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -113,12 +112,12 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)/test_registry_iterator.bsc"
 BSC32_SBRS=
 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:console /debug /machine:I386
-# ADD LINK32 ace.lib c:\users\irfan\registry\ace\debug\registry.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 /debug /machine:I386
-LINK32_FLAGS=ace.lib c:\users\irfan\registry\ace\debug\registry.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)/test_registry_iterator.pdb"\
- /debug /machine:I386 /out:"$(OUTDIR)/test_registry_iterator.exe" 
+# ADD LINK32 ace.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 /debug /machine:I386
+LINK32_FLAGS=ace.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)/test_registry_iterator.pdb" /debug /machine:I386\
+ /out:"$(OUTDIR)/test_registry_iterator.exe" 
 LINK32_OBJS= \
 	"$(INTDIR)/test_registry_iterator.obj"
 
@@ -164,14 +163,13 @@ LINK32_OBJS= \
 
 SOURCE=.\test_registry_iterator.cpp
 DEP_CPP_TEST_=\
-	".\..\ace/Registry.h"\
+	{$(INCLUDE)}"\ace\Registry.h"\
 	{$(INCLUDE)}"\ace\Log_Msg.h"\
 	{$(INCLUDE)}"\ace\OS.h"\
-	{$(INCLUDE)}"\bstring.h"\
 	{$(INCLUDE)}"\ace\Time_Value.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TIMEB.H"\
+	{$(INCLUDE)}"\sys\types.h"\
+	{$(INCLUDE)}"\sys\stat.h"\
+	{$(INCLUDE)}"\sys\timeb.h"\
 	{$(INCLUDE)}"\ace\Trace.h"\
 	{$(INCLUDE)}"\ace\OS.i"\
 	{$(INCLUDE)}"\ace\config.h"\
@@ -183,7 +181,7 @@ DEP_CPP_TEST_=\
 	{$(INCLUDE)}"\ace\ACE.i"\
 	
 NODEP_CPP_TEST_=\
-	".\..\..\stl\msdev\mutex.h"\
+	"..\..\ace\bstring.h"\
 	
 
 "$(INTDIR)\test_registry_iterator.obj" : $(SOURCE) $(DEP_CPP_TEST_) "$(INTDIR)"
diff --git a/examples/Registry/test_registry_iterator.mdp b/examples/Registry/test_registry_iterator.mdp
index cdcde91d7e2..cb36b5b6a52 100644
--- a/examples/Registry/test_registry_iterator.mdp
+++ b/examples/Registry/test_registry_iterator.mdp
diff --git a/examples/Registry/test_registry_update.mak b/examples/Registry/test_registry_update.mak
index f0e26c38643..0076edd1454 100644
--- a/examples/Registry/test_registry_update.mak
+++ b/examples/Registry/test_registry_update.mak
@@ -35,9 +35,8 @@ NULL=nul
 !ENDIF 
 ################################################################################
 # Begin Project
-# PROP Target_Last_Scanned "test_registry_update - Win32 Debug"
-RSC=rc.exe
 CPP=cl.exe
+RSC=rc.exe
 
 !IF  "$(CFG)" == "test_registry_update - Win32 Release"
 
@@ -55,9 +54,9 @@ CLEAN :
 	-@erase ".\test_registry_update.obj"
 
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /GX /O2 /I ".." /I " ..\stl" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /GX /O2 /I ".." /I " ..\stl" /D "WIN32" /D "NDEBUG"\
- /D "_CONSOLE" /Fp"test_registry_update.pch" /YX /c 
+# ADD CPP /nologo /MDd /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
+CPP_PROJ=/nologo /MDd /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\
+ /Fp"test_registry_update.pch" /YX /c 
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -67,12 +66,12 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)/test_registry_update.bsc"
 BSC32_SBRS=
 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:console /machine:I386
-# ADD LINK32 ace.lib c:\users\irfan\registry\ace\debug\registry.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 /machine:I386
-LINK32_FLAGS=ace.lib c:\users\irfan\registry\ace\debug\registry.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:no /pdb:"$(OUTDIR)/test_registry_update.pdb"\
- /machine:I386 /out:"$(OUTDIR)/test_registry_update.exe" 
+# ADD LINK32 ace.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 /machine:I386
+LINK32_FLAGS=ace.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:no\
+ /pdb:"$(OUTDIR)/test_registry_update.pdb" /machine:I386\
+ /out:"$(OUTDIR)/test_registry_update.exe" 
 LINK32_OBJS= \
 	"$(INTDIR)/test_registry_update.obj"
 
@@ -93,17 +92,17 @@ INTDIR=.
 ALL : "$(OUTDIR)\test_registry_update.exe"
 
 CLEAN : 
-	-@erase ".\vc40.pdb"
-	-@erase ".\vc40.idb"
 	-@erase ".\test_registry_update.exe"
 	-@erase ".\test_registry_update.obj"
 	-@erase ".\test_registry_update.ilk"
 	-@erase ".\test_registry_update.pdb"
+	-@erase ".\vc40.pdb"
+	-@erase ".\vc40.idb"
 
 # 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 ".." /I " ..\stl" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /I " ..\stl" /D "WIN32" /D\
- "_DEBUG" /D "_CONSOLE" /Fp"test_registry_update.pch" /YX /c 
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
+ /Fp"test_registry_update.pch" /YX /c 
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -113,12 +112,12 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)/test_registry_update.bsc"
 BSC32_SBRS=
 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:console /debug /machine:I386
-# ADD LINK32 ace.lib c:\users\irfan\registry\ace\debug\registry.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 /debug /machine:I386
-LINK32_FLAGS=ace.lib c:\users\irfan\registry\ace\debug\registry.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)/test_registry_update.pdb"\
- /debug /machine:I386 /out:"$(OUTDIR)/test_registry_update.exe" 
+# ADD LINK32 ace.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 /debug /machine:I386
+LINK32_FLAGS=ace.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)/test_registry_update.pdb" /debug /machine:I386\
+ /out:"$(OUTDIR)/test_registry_update.exe" 
 LINK32_OBJS= \
 	"$(INTDIR)/test_registry_update.obj"
 
@@ -164,14 +163,14 @@ LINK32_OBJS= \
 
 SOURCE=.\test_registry_update.cpp
 DEP_CPP_TEST_=\
-	".\..\ace/Registry.h"\
+	{$(INCLUDE)}"\ace\Registry.h"\
 	{$(INCLUDE)}"\ace\Log_Msg.h"\
 	{$(INCLUDE)}"\ace\OS.h"\
 	{$(INCLUDE)}"\bstring.h"\
 	{$(INCLUDE)}"\ace\Time_Value.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TIMEB.H"\
+	{$(INCLUDE)}"\sys\types.h"\
+	{$(INCLUDE)}"\sys\stat.h"\
+	{$(INCLUDE)}"\sys\timeb.h"\
 	{$(INCLUDE)}"\ace\Trace.h"\
 	{$(INCLUDE)}"\ace\OS.i"\
 	{$(INCLUDE)}"\ace\config.h"\
@@ -183,7 +182,7 @@ DEP_CPP_TEST_=\
 	{$(INCLUDE)}"\ace\ACE.i"\
 	
 NODEP_CPP_TEST_=\
-	".\..\..\stl\msdev\mutex.h"\
+	"..\..\STL\mutex.h"\
 	
 
 "$(INTDIR)\test_registry_update.obj" : $(SOURCE) $(DEP_CPP_TEST_) "$(INTDIR)"
diff --git a/examples/Registry/test_registry_update.mdp b/examples/Registry/test_registry_update.mdp
index 833aff9038d..696f77bc597 100644
--- a/examples/Registry/test_registry_update.mdp
+++ b/examples/Registry/test_registry_update.mdp