Update old make configure and build process;

avoid including sys/time.h in lefty/common.h on Windows;
fix Windows build;
remove a couple of holes related to the new libgvc_dot_builtins.a;
fix several bugs in dotty and lefty related to sending output to
the printer and rendering output in postscript

diff --git a/windows/cmd/dot/dot.dsp b/windows/cmd/dot/dot.dsp
index 2f67358badeca6787aa515aac2c880c3f2125c4f..9fa49aed977393628b53a9a4f79634d55cd6d627 100644 (file)
--- a/windows/cmd/dot/dot.dsp
+++ b/windows/cmd/dot/dot.dsp
@@ -95,10 +95,6 @@ LINK32=link.exe
 \r
 SOURCE=dot.c\r
 # End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\dot_builtins_oldmake.c\r
-# End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 \r

diff --git a/windows/cmd/dot/dot.mak b/windows/cmd/dot/dot.mak
index a05740f563dbe779b42ed1298b5ad4ddf56eecdb..8f55881985c3ce94b110cc32df800495c63a809b 100755 (executable)
--- a/windows/cmd/dot/dot.mak
+++ b/windows/cmd/dot/dot.mak
@@ -25,10 +25,6 @@ NULL=
 NULL=nul\r
 !ENDIF \r
 \r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
 !IF  "$(CFG)" == "dot - Win32 Release"\r
 \r
 OUTDIR=.\Release\r
@@ -42,15 +38,48 @@ ALL : "$(OUTDIR)\dot.exe"
 \r
 CLEAN :\r
        -@erase "$(INTDIR)\dot.obj"\r
-       -@erase "$(INTDIR)\dot_builtins_oldmake.obj"\r
        -@erase "$(INTDIR)\vc60.idb"\r
        -@erase "$(OUTDIR)\dot.exe"\r
 \r
 "$(OUTDIR)" :\r
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
 \r
+CPP=cl.exe\r
 CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "../../lib/dotgen" /I "../../lib/neatogen" /I "../../lib/fdpgen" /I "../../lib/circogen" /I "../../lib/twopigen" /I "../../lib/common" /I "../../lib/gvc" /I "../.." /I "../../lib/pathplan" /I "../../lib/cdt" /I "../../lib/gd" /I "../../lib/graph" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "MSWIN32" /D "HAVE_CONFIG_H" /D "BUILTINS" /Fp"$(INTDIR)\dot.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
+\r
+.c{$(INTDIR)}.obj::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cpp{$(INTDIR)}.obj::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cxx{$(INTDIR)}.obj::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.c{$(INTDIR)}.sbr::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cpp{$(INTDIR)}.sbr::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cxx{$(INTDIR)}.sbr::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+MTL=midl.exe\r
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 \r
+RSC=rc.exe\r
 BSC32=bscmake.exe\r
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\dot.bsc" \r
 BSC32_SBRS= \\r
@@ -58,8 +87,7 @@ BSC32_SBRS= \
 LINK32=link.exe\r
 LINK32_FLAGS=pack.lib pathplan.lib plugin.lib gd.lib graph.lib cdt.lib common.lib gvc.lib neatogen.lib twopigen.lib fdpgen.lib circogen.lib dotgen.lib libexpat.lib libexpatw.lib z.lib png.lib jpeg.lib ft.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)\dot.pdb" /machine:I386 /out:"$(OUTDIR)\dot.exe" /libpath:"..\..\lib\lib\Release" /libpath:"..\..\third-party\lib" \r
 LINK32_OBJS= \\r
-       "$(INTDIR)\dot.obj" \\r
-       "$(INTDIR)\dot_builtins_oldmake.obj"\r
+       "$(INTDIR)\dot.obj"\r
 \r
 "$(OUTDIR)\dot.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
     $(LINK32) @<<\r
@@ -79,7 +107,6 @@ ALL : "$(OUTDIR)\dot.exe"
 \r
 CLEAN :\r
        -@erase "$(INTDIR)\dot.obj"\r
-       -@erase "$(INTDIR)\dot_builtins_oldmake.obj"\r
        -@erase "$(INTDIR)\vc60.idb"\r
        -@erase "$(INTDIR)\vc60.pdb"\r
        -@erase "$(OUTDIR)\dot.exe"\r
@@ -87,24 +114,8 @@ CLEAN :
 "$(OUTDIR)" :\r
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
 \r
+CPP=cl.exe\r
 CPP_PROJ=/nologo /MLd /W3 /Gm /Gi /GX /ZI /Od /I "../../lib/dotgen" /I "../../lib/neatogen" /I "../../lib/fdpgen" /I "../../lib/circogen" /I "../../lib/twopigen" /I "../../lib/common" /I "../../lib/gvc" /I "../.." /I "../../lib/pathplan" /I "../../lib/cdt" /I "../../lib/gd" /I "../../lib/graph" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "MSWIN32" /D "HAVE_CONFIG_H" /D "BUILTINS" /Fp"$(INTDIR)\dot.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 \r
-BSC32=bscmake.exe\r
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\dot.bsc" \r
-BSC32_SBRS= \\r
-       \r
-LINK32=link.exe\r
-LINK32_FLAGS=pack.lib pathplan.lib plugin.lib gd.lib graph.lib cdt.lib common.lib gvc.lib neatogen.lib twopigen.lib fdpgen.lib circogen.lib dotgen.lib libexpat.lib libexpatw.lib z.lib png.lib jpeg.lib ft.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 /profile /debug /machine:I386 /out:"$(OUTDIR)\dot.exe" /libpath:"..\..\lib\lib\Debug" /libpath:"..\..\third-party\lib" \r
-LINK32_OBJS= \\r
-       "$(INTDIR)\dot.obj" \\r
-       "$(INTDIR)\dot_builtins_oldmake.obj"\r
-\r
-"$(OUTDIR)\dot.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
-    $(LINK32) @<<\r
-  $(LINK32_FLAGS) $(LINK32_OBJS)\r
-<<\r
-\r
-!ENDIF \r
 \r
 .c{$(INTDIR)}.obj::\r
    $(CPP) @<<\r
@@ -136,6 +147,25 @@ LINK32_OBJS= \
    $(CPP_PROJ) $< \r
 <<\r
 \r
+MTL=midl.exe\r
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 \r
+RSC=rc.exe\r
+BSC32=bscmake.exe\r
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\dot.bsc" \r
+BSC32_SBRS= \\r
+       \r
+LINK32=link.exe\r
+LINK32_FLAGS=pack.lib pathplan.lib plugin.lib gd.lib graph.lib cdt.lib common.lib gvc.lib neatogen.lib twopigen.lib fdpgen.lib circogen.lib dotgen.lib libexpat.lib libexpatw.lib z.lib png.lib jpeg.lib ft.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 /profile /debug /machine:I386 /out:"$(OUTDIR)\dot.exe" /libpath:"..\..\lib\lib\Debug" /libpath:"..\..\third-party\lib" \r
+LINK32_OBJS= \\r
+       "$(INTDIR)\dot.obj"\r
+\r
+"$(OUTDIR)\dot.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
+    $(LINK32) @<<\r
+  $(LINK32_FLAGS) $(LINK32_OBJS)\r
+<<\r
+\r
+!ENDIF \r
+\r
 \r
 !IF "$(NO_EXTERNAL_DEPS)" != "1"\r
 !IF EXISTS("dot.dep")\r
@@ -152,11 +182,6 @@ SOURCE=dot.c
 "$(INTDIR)\dot.obj" : $(SOURCE) "$(INTDIR)"\r
 \r
 \r
-SOURCE=.\dot_builtins_oldmake.c\r
-\r
-"$(INTDIR)\dot_builtins_oldmake.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
 \r
 !ENDIF \r
 \r