Update build files for windows

diff --git a/windows/cmd/tools/Acyclic.mak b/windows/cmd/tools/Acyclic.mak
index 1c42b2aa88f979ada3f18c71788b02b5084bef10..bf647a6ec5ce30885736d80ce037512f91d4d8ed 100644 (file)
--- a/windows/cmd/tools/Acyclic.mak
+++ b/windows/cmd/tools/Acyclic.mak
@@ -42,12 +42,12 @@ ALL : "$(OUTDIR)\Acyclic.exe"
 \r
 !ELSE \r
 \r
-ALL : "ToolsSupport - Win32 Release" "$(OUTDIR)\Acyclic.exe"\r
+ALL : "ingraphs - Win32 Release" "$(OUTDIR)\Acyclic.exe"\r
 \r
 !ENDIF \r
 \r
 !IF "$(RECURSE)" == "1" \r
-CLEAN :"ToolsSupport - Win32 ReleaseCLEAN" \r
+CLEAN :"ingraphs - Win32 ReleaseCLEAN" \r
 !ELSE \r
 CLEAN :\r
 !ENDIF \r
@@ -64,26 +64,16 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\Acyclic.bsc"
 BSC32_SBRS= \\r
        \r
 LINK32=link.exe\r
-LINK32_FLAGS=graph.lib cdt.lib ToolsSupport.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_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
-       "$(OUTDIR)\ToolsSupport.lib"\r
+       "..\..\lib\ingraphs\Release\ingraphs.lib"\r
 \r
 "$(OUTDIR)\Acyclic.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
     $(LINK32) @<<\r
   $(LINK32_FLAGS) $(LINK32_OBJS)\r
 <<\r
 \r
-SOURCE="$(InputPath)"\r
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep\r
-\r
-ALL : $(DS_POSTBUILD_DEP)\r
-\r
-# Begin Custom Macros\r
-OutDir=.\Release\r
-# End Custom Macros\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "Acyclic - Win32 Debug"\r
 \r
 OUTDIR=.\Debug\r
@@ -98,12 +88,12 @@ ALL : "$(OUTDIR)\Acyclic.exe"
 \r
 !ELSE \r
 \r
-ALL : "ToolsSupport - Win32 Debug" "$(OUTDIR)\Acyclic.exe"\r
+ALL : "ingraphs - Win32 Debug" "$(OUTDIR)\Acyclic.exe"\r
 \r
 !ENDIF \r
 \r
 !IF "$(RECURSE)" == "1" \r
-CLEAN :"ToolsSupport - Win32 DebugCLEAN" \r
+CLEAN :"ingraphs - Win32 DebugCLEAN" \r
 !ELSE \r
 CLEAN :\r
 !ENDIF \r
@@ -123,26 +113,16 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\Acyclic.bsc"
 BSC32_SBRS= \\r
        \r
 LINK32=link.exe\r
-LINK32_FLAGS=graph.lib cdt.lib ToolsSupport.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_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
-       "$(OUTDIR)\ToolsSupport.lib"\r
+       "..\..\lib\ingraphs\Debug\ingraphs.lib"\r
 \r
 "$(OUTDIR)\Acyclic.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
     $(LINK32) @<<\r
   $(LINK32_FLAGS) $(LINK32_OBJS)\r
 <<\r
 \r
-SOURCE="$(InputPath)"\r
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep\r
-\r
-ALL : $(DS_POSTBUILD_DEP)\r
-\r
-# Begin Custom Macros\r
-OutDir=.\Debug\r
-# End Custom Macros\r
-\r
-\r
 !ENDIF \r
 \r
 .c{$(INTDIR)}.obj::\r
@@ -186,35 +166,34 @@ OutDir=.\Debug
 \r
 \r
 !IF "$(CFG)" == "Acyclic - Win32 Release" || "$(CFG)" == "Acyclic - Win32 Debug"\r
-SOURCE=..\src\acyclic.c\r
+SOURCE=.\acyclic.c\r
 \r
 "$(INTDIR)\acyclic.obj" : $(SOURCE) "$(INTDIR)"\r
-       $(CPP) $(CPP_PROJ) $(SOURCE)\r
 \r
 \r
 !IF  "$(CFG)" == "Acyclic - Win32 Release"\r
 \r
-"ToolsSupport - Win32 Release" : \r
-   cd "."\r
-   $(MAKE) /$(MAKEFLAGS) /F ".\ToolsSupport.mak" CFG="ToolsSupport - Win32 Release" \r
-   cd "."\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
-"ToolsSupport - Win32 ReleaseCLEAN" : \r
-   cd "."\r
-   $(MAKE) /$(MAKEFLAGS) /F ".\ToolsSupport.mak" CFG="ToolsSupport - Win32 Release" RECURSE=1 CLEAN \r
-   cd "."\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
-"ToolsSupport - Win32 Debug" : \r
-   cd "."\r
-   $(MAKE) /$(MAKEFLAGS) /F ".\ToolsSupport.mak" CFG="ToolsSupport - Win32 Debug" \r
-   cd "."\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
-"ToolsSupport - Win32 DebugCLEAN" : \r
-   cd "."\r
-   $(MAKE) /$(MAKEFLAGS) /F ".\ToolsSupport.mak" CFG="ToolsSupport - Win32 Debug" RECURSE=1 CLEAN \r
-   cd "."\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