Fix tools windows .mak files to remove absolute path name.

diff --git a/windows/cmd/tools/Acyclic.mak b/windows/cmd/tools/Acyclic.mak
index bf647a6ec5ce30885736d80ce037512f91d4d8ed..ec70c271205e464d581551ef49ebb0ce34f400f5 100644 (file)
--- a/windows/cmd/tools/Acyclic.mak
+++ b/windows/cmd/tools/Acyclic.mak
@@ -36,21 +36,10 @@ INTDIR=.\Release
 OutDir=.\Release\r
 # End Custom Macros\r
 \r
-!IF "$(RECURSE)" == "0" \r
-\r
 ALL : "$(OUTDIR)\Acyclic.exe"\r
 \r
-!ELSE \r
-\r
-ALL : "ingraphs - Win32 Release" "$(OUTDIR)\Acyclic.exe"\r
 \r
-!ENDIF \r
-\r
-!IF "$(RECURSE)" == "1" \r
-CLEAN :"ingraphs - Win32 ReleaseCLEAN" \r
-!ELSE \r
 CLEAN :\r
-!ENDIF \r
        -@erase "$(INTDIR)\acyclic.obj"\r
        -@erase "$(INTDIR)\vc60.idb"\r
        -@erase "$(OUTDIR)\Acyclic.exe"\r
@@ -66,8 +55,7 @@ BSC32_SBRS= \
 LINK32=link.exe\r
 LINK32_FLAGS=graph.lib cdt.lib ingraphs.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)\Acyclic.pdb" /machine:I386 /out:"$(OUTDIR)\Acyclic.exe" /libpath:"../../lib/lib/Release" \r
 LINK32_OBJS= \\r
-       "$(INTDIR)\acyclic.obj" \\r
-       "..\..\lib\ingraphs\Release\ingraphs.lib"\r
+       "$(INTDIR)\acyclic.obj"\r
 \r
 "$(OUTDIR)\Acyclic.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
     $(LINK32) @<<\r
@@ -82,21 +70,10 @@ INTDIR=.\Debug
 OutDir=.\Debug\r
 # End Custom Macros\r
 \r
-!IF "$(RECURSE)" == "0" \r
-\r
 ALL : "$(OUTDIR)\Acyclic.exe"\r
 \r
-!ELSE \r
-\r
-ALL : "ingraphs - Win32 Debug" "$(OUTDIR)\Acyclic.exe"\r
-\r
-!ENDIF \r
 \r
-!IF "$(RECURSE)" == "1" \r
-CLEAN :"ingraphs - Win32 DebugCLEAN" \r
-!ELSE \r
 CLEAN :\r
-!ENDIF \r
        -@erase "$(INTDIR)\acyclic.obj"\r
        -@erase "$(INTDIR)\vc60.idb"\r
        -@erase "$(INTDIR)\vc60.pdb"\r
@@ -115,8 +92,7 @@ BSC32_SBRS= \
 LINK32=link.exe\r
 LINK32_FLAGS=graph.lib cdt.lib ingraphs.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)\Acyclic.pdb" /debug /machine:I386 /out:"$(OUTDIR)\Acyclic.exe" /pdbtype:sept /libpath:"../../lib/lib/Debug" \r
 LINK32_OBJS= \\r
-       "$(INTDIR)\acyclic.obj" \\r
-       "..\..\lib\ingraphs\Debug\ingraphs.lib"\r
+       "$(INTDIR)\acyclic.obj"\r
 \r
 "$(OUTDIR)\Acyclic.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
     $(LINK32) @<<\r
@@ -171,32 +147,6 @@ SOURCE=.\acyclic.c
 "$(INTDIR)\acyclic.obj" : $(SOURCE) "$(INTDIR)"\r
 \r
 \r
-!IF  "$(CFG)" == "Acyclic - Win32 Release"\r
-\r
-"ingraphs - Win32 Release" : \r
-   cd "\graphvizCVS\builddaemon\graphviz-win\lib\ingraphs"\r
-   $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Release" \r
-   cd "..\..\cmd\tools"\r
-\r
-"ingraphs - Win32 ReleaseCLEAN" : \r
-   cd "\graphvizCVS\builddaemon\graphviz-win\lib\ingraphs"\r
-   $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Release" RECURSE=1 CLEAN \r
-   cd "..\..\cmd\tools"\r
-\r
-!ELSEIF  "$(CFG)" == "Acyclic - Win32 Debug"\r
-\r
-"ingraphs - Win32 Debug" : \r
-   cd "\graphvizCVS\builddaemon\graphviz-win\lib\ingraphs"\r
-   $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Debug" \r
-   cd "..\..\cmd\tools"\r
-\r
-"ingraphs - Win32 DebugCLEAN" : \r
-   cd "\graphvizCVS\builddaemon\graphviz-win\lib\ingraphs"\r
-   $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Debug" RECURSE=1 CLEAN \r
-   cd "..\..\cmd\tools"\r
-\r
-!ENDIF \r
-\r
 \r
 !ENDIF \r
 \r

diff --git a/windows/cmd/tools/ccomps.mak b/windows/cmd/tools/ccomps.mak
index c9357042586202dfa42da5c68ca2d097f8763a93..e929aebf993ed0ecca349ef559723e91493d8809 100644 (file)
--- a/windows/cmd/tools/ccomps.mak
+++ b/windows/cmd/tools/ccomps.mak
@@ -36,21 +36,10 @@ INTDIR=.\Release
 OutDir=.\Release\r
 # End Custom Macros\r
 \r
-!IF "$(RECURSE)" == "0" \r
-\r
 ALL : "$(OUTDIR)\ccomps.exe"\r
 \r
-!ELSE \r
-\r
-ALL : "ingraphs - Win32 Release" "$(OUTDIR)\ccomps.exe"\r
 \r
-!ENDIF \r
-\r
-!IF "$(RECURSE)" == "1" \r
-CLEAN :"ingraphs - Win32 ReleaseCLEAN" \r
-!ELSE \r
 CLEAN :\r
-!ENDIF \r
        -@erase "$(INTDIR)\ccomps.obj"\r
        -@erase "$(INTDIR)\vc60.idb"\r
        -@erase "$(OUTDIR)\ccomps.exe"\r
@@ -66,8 +55,7 @@ BSC32_SBRS= \
 LINK32=link.exe\r
 LINK32_FLAGS=graph.lib cdt.lib ingraphs.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)\ccomps.pdb" /machine:I386 /out:"$(OUTDIR)\ccomps.exe" /libpath:"../../lib/lib/Release" \r
 LINK32_OBJS= \\r
-       "$(INTDIR)\ccomps.obj" \\r
-       "..\..\lib\ingraphs\Release\ingraphs.lib"\r
+       "$(INTDIR)\ccomps.obj"\r
 \r
 "$(OUTDIR)\ccomps.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
     $(LINK32) @<<\r
@@ -82,21 +70,10 @@ INTDIR=.\Debug
 OutDir=.\Debug\r
 # End Custom Macros\r
 \r
-!IF "$(RECURSE)" == "0" \r
-\r
 ALL : "$(OUTDIR)\ccomps.exe"\r
 \r
-!ELSE \r
-\r
-ALL : "ingraphs - Win32 Debug" "$(OUTDIR)\ccomps.exe"\r
-\r
-!ENDIF \r
 \r
-!IF "$(RECURSE)" == "1" \r
-CLEAN :"ingraphs - Win32 DebugCLEAN" \r
-!ELSE \r
 CLEAN :\r
-!ENDIF \r
        -@erase "$(INTDIR)\ccomps.obj"\r
        -@erase "$(INTDIR)\vc60.idb"\r
        -@erase "$(INTDIR)\vc60.pdb"\r
@@ -115,8 +92,7 @@ BSC32_SBRS= \
 LINK32=link.exe\r
 LINK32_FLAGS=graph.lib cdt.lib ingraphs.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)\ccomps.pdb" /debug /machine:I386 /out:"$(OUTDIR)\ccomps.exe" /pdbtype:sept /libpath:"../../lib/lib/Debug" \r
 LINK32_OBJS= \\r
-       "$(INTDIR)\ccomps.obj" \\r
-       "..\..\lib\ingraphs\Debug\ingraphs.lib"\r
+       "$(INTDIR)\ccomps.obj"\r
 \r
 "$(OUTDIR)\ccomps.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
     $(LINK32) @<<\r
@@ -171,32 +147,6 @@ SOURCE=.\ccomps.c
 "$(INTDIR)\ccomps.obj" : $(SOURCE) "$(INTDIR)"\r
 \r
 \r
-!IF  "$(CFG)" == "ccomps - Win32 Release"\r
-\r
-"ingraphs - Win32 Release" : \r
-   cd "\graphvizCVS\builddaemon\graphviz-win\lib\ingraphs"\r
-   $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Release" \r
-   cd "..\..\cmd\tools"\r
-\r
-"ingraphs - Win32 ReleaseCLEAN" : \r
-   cd "\graphvizCVS\builddaemon\graphviz-win\lib\ingraphs"\r
-   $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Release" RECURSE=1 CLEAN \r
-   cd "..\..\cmd\tools"\r
-\r
-!ELSEIF  "$(CFG)" == "ccomps - Win32 Debug"\r
-\r
-"ingraphs - Win32 Debug" : \r
-   cd "\graphvizCVS\builddaemon\graphviz-win\lib\ingraphs"\r
-   $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Debug" \r
-   cd "..\..\cmd\tools"\r
-\r
-"ingraphs - Win32 DebugCLEAN" : \r
-   cd "\graphvizCVS\builddaemon\graphviz-win\lib\ingraphs"\r
-   $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Debug" RECURSE=1 CLEAN \r
-   cd "..\..\cmd\tools"\r
-\r
-!ENDIF \r
-\r
 \r
 !ENDIF \r
 \r

diff --git a/windows/cmd/tools/dijkstra.mak b/windows/cmd/tools/dijkstra.mak
index 5dff0c31d315f0b06231a1a4646b9499287a290c..4108385dd59f6d272719a52e231c52e041990d0b 100755 (executable)
--- a/windows/cmd/tools/dijkstra.mak
+++ b/windows/cmd/tools/dijkstra.mak
@@ -36,21 +36,10 @@ INTDIR=.\Release
 OutDir=.\Release\r
 # End Custom Macros\r
 \r
-!IF "$(RECURSE)" == "0" \r
-\r
 ALL : "$(OUTDIR)\dijkstra.exe"\r
 \r
-!ELSE \r
-\r
-ALL : "ingraphs - Win32 Release" "$(OUTDIR)\dijkstra.exe"\r
 \r
-!ENDIF \r
-\r
-!IF "$(RECURSE)" == "1" \r
-CLEAN :"ingraphs - Win32 ReleaseCLEAN" \r
-!ELSE \r
 CLEAN :\r
-!ENDIF \r
        -@erase "$(INTDIR)\dijkstra.obj"\r
        -@erase "$(INTDIR)\vc60.idb"\r
        -@erase "$(OUTDIR)\dijkstra.exe"\r
@@ -66,8 +55,7 @@ BSC32_SBRS= \
 LINK32=link.exe\r
 LINK32_FLAGS=agraph.lib cdt.lib common.lib ingraphs.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)\dijkstra.pdb" /machine:I386 /out:"$(OUTDIR)\dijkstra.exe" /libpath:"../../lib/lib/Release" \r
 LINK32_OBJS= \\r
-       "$(INTDIR)\dijkstra.obj" \\r
-       "..\..\lib\ingraphs\Release\ingraphs.lib"\r
+       "$(INTDIR)\dijkstra.obj"\r
 \r
 "$(OUTDIR)\dijkstra.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
     $(LINK32) @<<\r
@@ -82,21 +70,10 @@ INTDIR=.\Debug
 OutDir=.\Debug\r
 # End Custom Macros\r
 \r
-!IF "$(RECURSE)" == "0" \r
-\r
 ALL : "$(OUTDIR)\dijkstra.exe"\r
 \r
-!ELSE \r
-\r
-ALL : "ingraphs - Win32 Debug" "$(OUTDIR)\dijkstra.exe"\r
-\r
-!ENDIF \r
 \r
-!IF "$(RECURSE)" == "1" \r
-CLEAN :"ingraphs - Win32 DebugCLEAN" \r
-!ELSE \r
 CLEAN :\r
-!ENDIF \r
        -@erase "$(INTDIR)\dijkstra.obj"\r
        -@erase "$(INTDIR)\vc60.idb"\r
        -@erase "$(INTDIR)\vc60.pdb"\r
@@ -115,8 +92,7 @@ BSC32_SBRS= \
 LINK32=link.exe\r
 LINK32_FLAGS=agraph.lib cdt.lib common.lib ingraphs.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)\dijkstra.pdb" /debug /machine:I386 /out:"$(OUTDIR)\dijkstra.exe" /pdbtype:sept /libpath:"../../lib/lib/Debug" \r
 LINK32_OBJS= \\r
-       "$(INTDIR)\dijkstra.obj" \\r
-       "..\..\lib\ingraphs\Debug\ingraphs.lib"\r
+       "$(INTDIR)\dijkstra.obj"\r
 \r
 "$(OUTDIR)\dijkstra.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
     $(LINK32) @<<\r
@@ -171,32 +147,6 @@ SOURCE=.\dijkstra.c
 "$(INTDIR)\dijkstra.obj" : $(SOURCE) "$(INTDIR)"\r
 \r
 \r
-!IF  "$(CFG)" == "dijkstra - Win32 Release"\r
-\r
-"ingraphs - Win32 Release" : \r
-   cd "\graphvizCVS\builddaemon\graphviz-win\lib\ingraphs"\r
-   $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Release" \r
-   cd "..\..\cmd\tools"\r
-\r
-"ingraphs - Win32 ReleaseCLEAN" : \r
-   cd "\graphvizCVS\builddaemon\graphviz-win\lib\ingraphs"\r
-   $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Release" RECURSE=1 CLEAN \r
-   cd "..\..\cmd\tools"\r
-\r
-!ELSEIF  "$(CFG)" == "dijkstra - Win32 Debug"\r
-\r
-"ingraphs - Win32 Debug" : \r
-   cd "\graphvizCVS\builddaemon\graphviz-win\lib\ingraphs"\r
-   $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Debug" \r
-   cd "..\..\cmd\tools"\r
-\r
-"ingraphs - Win32 DebugCLEAN" : \r
-   cd "\graphvizCVS\builddaemon\graphviz-win\lib\ingraphs"\r
-   $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Debug" RECURSE=1 CLEAN \r
-   cd "..\..\cmd\tools"\r
-\r
-!ENDIF \r
-\r
 \r
 !ENDIF \r
 \r

diff --git a/windows/cmd/tools/gc.mak b/windows/cmd/tools/gc.mak
index ed2704ad2a8ae3dfe79b1286d1e5f05aab462a7b..6965db171c16b9438cf871b9f6bcedbae0e6e20d 100644 (file)
--- a/windows/cmd/tools/gc.mak
+++ b/windows/cmd/tools/gc.mak
@@ -36,21 +36,10 @@ INTDIR=.\Release
 OutDir=.\Release\r
 # End Custom Macros\r
 \r
-!IF "$(RECURSE)" == "0" \r
-\r
 ALL : "$(OUTDIR)\gc.exe"\r
 \r
-!ELSE \r
-\r
-ALL : "ingraphs - Win32 Release" "$(OUTDIR)\gc.exe"\r
 \r
-!ENDIF \r
-\r
-!IF "$(RECURSE)" == "1" \r
-CLEAN :"ingraphs - Win32 ReleaseCLEAN" \r
-!ELSE \r
 CLEAN :\r
-!ENDIF \r
        -@erase "$(INTDIR)\gc.obj"\r
        -@erase "$(INTDIR)\vc60.idb"\r
        -@erase "$(OUTDIR)\gc.exe"\r
@@ -66,8 +55,7 @@ BSC32_SBRS= \
 LINK32=link.exe\r
 LINK32_FLAGS=graph.lib cdt.lib ingraphs.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)\gc.pdb" /machine:I386 /out:"$(OUTDIR)\gc.exe" /libpath:"../../lib/lib/Release" \r
 LINK32_OBJS= \\r
-       "$(INTDIR)\gc.obj" \\r
-       "..\..\lib\ingraphs\Release\ingraphs.lib"\r
+       "$(INTDIR)\gc.obj"\r
 \r
 "$(OUTDIR)\gc.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
     $(LINK32) @<<\r
@@ -82,21 +70,10 @@ INTDIR=.\Debug
 OutDir=.\Debug\r
 # End Custom Macros\r
 \r
-!IF "$(RECURSE)" == "0" \r
-\r
 ALL : "$(OUTDIR)\gc.exe"\r
 \r
-!ELSE \r
-\r
-ALL : "ingraphs - Win32 Debug" "$(OUTDIR)\gc.exe"\r
-\r
-!ENDIF \r
 \r
-!IF "$(RECURSE)" == "1" \r
-CLEAN :"ingraphs - Win32 DebugCLEAN" \r
-!ELSE \r
 CLEAN :\r
-!ENDIF \r
        -@erase "$(INTDIR)\gc.obj"\r
        -@erase "$(INTDIR)\vc60.idb"\r
        -@erase "$(INTDIR)\vc60.pdb"\r
@@ -115,8 +92,7 @@ BSC32_SBRS= \
 LINK32=link.exe\r
 LINK32_FLAGS=graph.lib cdt.lib ingraphs.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)\gc.pdb" /debug /machine:I386 /out:"$(OUTDIR)\gc.exe" /pdbtype:sept /libpath:"../../lib/lib/Debug" \r
 LINK32_OBJS= \\r
-       "$(INTDIR)\gc.obj" \\r
-       "..\..\lib\ingraphs\Debug\ingraphs.lib"\r
+       "$(INTDIR)\gc.obj"\r
 \r
 "$(OUTDIR)\gc.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
     $(LINK32) @<<\r
@@ -171,32 +147,6 @@ SOURCE=.\gc.c
 "$(INTDIR)\gc.obj" : $(SOURCE) "$(INTDIR)"\r
 \r
 \r
-!IF  "$(CFG)" == "gc - Win32 Release"\r
-\r
-"ingraphs - Win32 Release" : \r
-   cd "\graphvizCVS\builddaemon\graphviz-win\lib\ingraphs"\r
-   $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Release" \r
-   cd "..\..\cmd\tools"\r
-\r
-"ingraphs - Win32 ReleaseCLEAN" : \r
-   cd "\graphvizCVS\builddaemon\graphviz-win\lib\ingraphs"\r
-   $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Release" RECURSE=1 CLEAN \r
-   cd "..\..\cmd\tools"\r
-\r
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"\r
-\r
-"ingraphs - Win32 Debug" : \r
-   cd "\graphvizCVS\builddaemon\graphviz-win\lib\ingraphs"\r
-   $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Debug" \r
-   cd "..\..\cmd\tools"\r
-\r
-"ingraphs - Win32 DebugCLEAN" : \r
-   cd "\graphvizCVS\builddaemon\graphviz-win\lib\ingraphs"\r
-   $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Debug" RECURSE=1 CLEAN \r
-   cd "..\..\cmd\tools"\r
-\r
-!ENDIF \r
-\r
 \r
 !ENDIF \r
 \r

diff --git a/windows/cmd/tools/gvcolor.mak b/windows/cmd/tools/gvcolor.mak
index bb022065ed9b2021d7174e63d40e06972d83840d..8f9e664a363e1ef89cf5bea2f3801cbdfe6e65a1 100644 (file)
--- a/windows/cmd/tools/gvcolor.mak
+++ b/windows/cmd/tools/gvcolor.mak
@@ -56,8 +56,8 @@ BSC32_SBRS= \
 LINK32=link.exe\r
 LINK32_FLAGS=graph.lib cdt.lib ingraphs.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)\gvcolor.pdb" /machine:I386 /out:"$(OUTDIR)\gvcolor.exe" /libpath:"../../lib/lib/Release" \r
 LINK32_OBJS= \\r
-       "$(INTDIR)\gvcolor.obj" \\r
-       "$(INTDIR)\colxlate.obj"\r
+       "$(INTDIR)\colxlate.obj" \\r
+       "$(INTDIR)\gvcolor.obj"\r
 \r
 "$(OUTDIR)\gvcolor.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
     $(LINK32) @<<\r
@@ -95,8 +95,8 @@ BSC32_SBRS= \
 LINK32=link.exe\r
 LINK32_FLAGS=graph.lib cdt.lib ingraphs.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)\gvcolor.pdb" /debug /machine:I386 /out:"$(OUTDIR)\gvcolor.exe" /pdbtype:sept /libpath:"../../lib/lib/Debug" \r
 LINK32_OBJS= \\r
-       "$(INTDIR)\gvcolor.obj" \\r
-       "$(INTDIR)\colxlate.obj"\r
+       "$(INTDIR)\colxlate.obj" \\r
+       "$(INTDIR)\gvcolor.obj"\r
 \r
 "$(OUTDIR)\gvcolor.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
     $(LINK32) @<<\r