- merge libdotneato into libgvc

- make libcommon a convenience library and link into libgvc
- convert demo to use libgvc

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index 6fd34cf5edf975f22766b601defa104ccd08cfea..bf9a7e104cb5aae0313358a0fb79ef0d66401105 100644 (file)
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -1,53 +1,24 @@
 ## Process this file with automake to produce Makefile.in
 
 pdfdir = $(pkgdatadir)/doc/pdf
-pkgconfigdir = $(libdir)/pkgconfig
 
 linkedman = neato.1 twopi.1 fdp.1 circo.1
 linkedpdf = neato.pdf twopi.pdf fdp.pdf circo.pdf
 linkedprogram = neato twopi fdp circo
 
 AM_CPPFLAGS = \
-        -I$(top_srcdir) \
         -I$(top_srcdir)/lib/common \
         -I$(top_srcdir)/lib/gvc \
        -I$(top_srcdir)/lib/pathplan \
        -I$(top_srcdir)/lib/graph \
        -I$(top_srcdir)/lib/cdt
 
-pkginclude_HEADERS = dotneato.h
-pkglib_LTLIBRARIES = libdotneato.la
-pkgconfig_DATA = libdotneato.pc
 bin_PROGRAMS = dot
 man_MANS = dot.1 
 pdf_DATA = dot.pdf
 
-libdotneato_la_SOURCES = dotneato.c
 dot_SOURCES = dot.c
-
-if DISABLE_LTDL
-libdotneato_la_LIBADD = \
-        $(top_builddir)/lib/graph/libgraph.la \
-       $(top_builddir)/lib/common/libcommon.la \
-       $(top_builddir)/lib/gvc/libgvc.la \
-       $(top_builddir)/plugin/libplugins.la
-
-dot_LDADD = \
-        $(top_builddir)/lib/graph/libgraph.la \
-        $(top_builddir)/lib/common/libcommon.la \
-        $(top_builddir)/lib/gvc/libgvc.la \
-       $(top_builddir)/plugin/libplugins.la
-else
-libdotneato_la_LIBADD = \
-        $(top_builddir)/lib/graph/libgraph.la \
-       $(top_builddir)/lib/common/libcommon.la \
-       $(top_builddir)/lib/gvc/libgvc.la @LIBGEN_LIBS@
-
-dot_LDADD = \
-        $(top_builddir)/lib/graph/libgraph.la \
-        $(top_builddir)/lib/common/libcommon.la \
-        $(top_builddir)/lib/gvc/libgvc.la  @LIBGEN_LIBS@
-endif
+dot_LDADD = $(top_builddir)/lib/gvc/libgvc.la
 
 install-data-hook:
        (cd $(DESTDIR)$(man1dir); for i in $(linkedman); do rm -f $$i; $(LN_S) dot.1 $$i; done;)

diff --git a/cmd/dot/dotneato.c b/cmd/dot/dotneato.c
deleted file mode 100644 (file)
index 402de0f..0000000
--- a/cmd/dot/dotneato.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/* $Id$ $Revision$ */
-/* vim:set shiftwidth=4 ts=8: */
-
-/**********************************************************
-*      This software is part of the graphviz package      *
-*                http://www.graphviz.org/                 *
-*                                                         *
-*            Copyright (c) 1994-2004 AT&T Corp.           *
-*                and is licensed under the                *
-*            Common Public License, Version 1.0           *
-*                      by AT&T Corp.                      *
-*                                                         *
-*        Information and Software Systems Research        *
-*              AT&T Research, Florham Park NJ             *
-**********************************************************/
-
-#include <dotneato.h>
-
-char *Info[] = {
-    "libdotneato",             /* Program */
-    VERSION,                   /* Version */
-    BUILDDATE                  /* Build Date */
-};
-
-GVC_t *gvContext(void)
-{
-    GVC_t *gvc;
-
-    aginit();
-    agnodeattr(NULL, "label", NODENAME_ESC);
-    gvc = gvNEWcontext(Info, username());
-    gvconfig(gvc); /* configure for available plugins and codegens */
-    return gvc;
-}
-
-int gvLayout(GVC_t *gvc, graph_t *g, char *engine)
-{
-    char buf[256];
-    Agsym_t *a;
-    int rc;
-
-    g = g->root;
-    if (GD_drawing(g)) {        /* only cleanup once between layouts */
-        gvlayout_cleanup(gvc, g);
-        GD_drawing(g) = NULL;
-    }
-    rc = gvlayout_select(gvc, engine);
-    if (rc == NO_SUPPORT) {
-        fprintf(stderr, "Layout type: \"%s\" not recognized. Use one of:%s\n",
-                engine, gvplugin_list(gvc, API_layout, engine));
-        return -1;
-    }
-
-    gvlayout_layout(gvc, g);
-
-/* set bb attribute for basic layout.
- * doesn't yet include margins, scaling or page sizes because
- * those depend on the renderer being used. */
-    if (GD_drawing(g)->landscape)
-        sprintf(buf, "%d %d %d %d",
-                ROUND(GD_bb(g).LL.y), ROUND(GD_bb(g).LL.x),
-                ROUND(GD_bb(g).UR.y), ROUND(GD_bb(g).UR.x));
-    else
-        sprintf(buf, "%d %d %d %d",
-                ROUND(GD_bb(g).LL.x), ROUND(GD_bb(g).LL.y),
-                ROUND(GD_bb(g).UR.x), ROUND(GD_bb(g).UR.y));
-    if (!(a = agfindattr(g, "bb"))) {
-        a = agraphattr(g, "bb", "");
-    }
-    agxset(g, a->index, buf);
-
-    return 0;
-}
-
-int gvRender(GVC_t *gvc, graph_t *g, char *format, FILE *out)
-{
-    int rc;
-    GVJ_t *job;
-
-    g = g->root;
-
-    /* create a job for the required format */
-    rc = gvrender_output_langname_job(gvc, format);
-    if (rc == NO_SUPPORT) {
-        fprintf(stderr, "Renderer type: \"%s\" not recognized. Use one of:%s\n",
-                format, gvplugin_list(gvc, API_render, format));
-        return -1;
-    }
-
-    job = gvc->job;
-    job->output_lang = gvrender_select(job, job->output_langname);
-    if (!GD_drawing(g) && job->output_lang != CANONICAL_DOT) {
-        fprintf(stderr, "Layout was not done\n");
-        return -1;
-    }
-    job->output_file = out;
-
-    emit_jobs(gvc, g);
-    gvrender_delete_jobs(gvc);
-
-    return 0;
-}
-
-
-void gvCleanup(GVC_t *gvc)
-{
-    gvFREEcontext(gvc);
-}

diff --git a/cmd/dot/dotneato.h b/cmd/dot/dotneato.h
deleted file mode 100644 (file)
index c8a344f..0000000
--- a/cmd/dot/dotneato.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* $Id$ $Revision$ */
-/* vim:set shiftwidth=4 ts=8: */
-
-/**********************************************************
-*      This software is part of the graphviz package      *
-*                http://www.graphviz.org/                 *
-*                                                         *
-*            Copyright (c) 1994-2004 AT&T Corp.           *
-*                and is licensed under the                *
-*            Common Public License, Version 1.0           *
-*                      by AT&T Corp.                      *
-*                                                         *
-*        Information and Software Systems Research        *
-*              AT&T Research, Florham Park NJ             *
-**********************************************************/
-
-#ifndef DOTNEATO_H
-#define DOTNEATO_H
-
-#include "render.h"
-#include "gvc.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern GVC_t *gvContext(void);
-extern int gvLayout(GVC_t *gvc, graph_t *g, char *engine);
-extern int gvRender(GVC_t *gvc, graph_t *g, char *format, FILE *out);
-extern void gvCleanup(GVC_t *gvc);
-
-#ifdef __cplusplus
-}
-#endif
-#endif

diff --git a/cmd/dot/libdotneato.pc.in b/cmd/dot/libdotneato.pc.in
deleted file mode 100644 (file)
index 082c04e..0000000
--- a/cmd/dot/libdotneato.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@/@PACKAGE@
-includedir=@includedir@/@PACKAGE@
-                                                                                       
-Name: libdotneato
-Description: All graph layout engines in a single library
-Version: @VERSION@
-Libs: -L${libdir} -ldotneato
-Cflags: -I${includedir}

diff --git a/configure.ac b/configure.ac
index 740eef925bdd511cf3d23334de3085b720492200..ddbc3a8737255a23088246639c9305e75018e21a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1491,20 +1491,13 @@ AC_CONFIG_FILES(Makefile
        lib/sfio/Sfio_f/Makefile
        lib/vmalloc/Makefile
        lib/dotgen/Makefile
-       lib/dotgen/libdotgen.pc
        lib/neatogen/Makefile
-       lib/neatogen/libneatogen.pc
        lib/fdpgen/Makefile
-       lib/fdpgen/libfdpgen.pc
        lib/circogen/Makefile
-       lib/circogen/libcircogen.pc
        lib/twopigen/Makefile
-       lib/twopigen/libtwopigen.pc
        lib/pack/Makefile
-       lib/pack/libpack.pc
        lib/expr/Makefile
        lib/common/Makefile
-       lib/common/libcommon.pc
        lib/ingraphs/Makefile
        lib/gvc/Makefile
        lib/gvc/libgvc.pc
@@ -1513,7 +1506,6 @@ AC_CONFIG_FILES(Makefile
        plugin/usershape/Makefile
        cmd/Makefile
        cmd/dot/Makefile
-       cmd/dot/libdotneato.pc
        cmd/tools/Makefile
        cmd/gvpr/Makefile
         cmd/lefty/ws/x11/libfilereq/Makefile

diff --git a/dot.demo/Makefile b/dot.demo/Makefile
index 1d288ca7290004f01dec9d4de9d6ec4fb2a4b366..17802a3f7d29dd15a9d186bddf60c667b8b4c1ce 100644 (file)
--- a/dot.demo/Makefile
+++ b/dot.demo/Makefile
@@ -1,8 +1,8 @@
 COMPILE=libtool --tag=CC --mode=compile ${CC} -c
 LINK=libtool --tag=CC --mode=link ${CC}
 
-CFLAGS=`pkg-config libdotneato --cflags`
-LDFLAGS=`pkg-config libdotneato --libs`
+CFLAGS=`pkg-config libgvc --cflags`
+LDFLAGS=`pkg-config libgvc --libs`
 
 all: dot demo simple
 

diff --git a/dot.demo/demo.c b/dot.demo/demo.c
index b87da72a94a0093462e70702fa1d390d5562bbbb..9e46447611a978804736870b932c441084272d26 100644 (file)
--- a/dot.demo/demo.c
+++ b/dot.demo/demo.c
@@ -14,7 +14,7 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
-#include <dotneato.h>
+#include <gvc.h>
 
 int main(int argc, char **argv)
 {

diff --git a/dot.demo/dot.c b/dot.demo/dot.c
index 583d4bf1c978ce066b91c87e1b8495223866eaeb..9ee3e43eb2750e887a41ea4ff1e252e1c6ed0287 100644 (file)
--- a/dot.demo/dot.c
+++ b/dot.demo/dot.c
@@ -14,7 +14,7 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
-#include <dotneato.h>
+#include <gvc.h>
 
 int main(int argc, char **argv)
 {

diff --git a/dot.demo/simple.c b/dot.demo/simple.c
index 0d4ba289c40c6e6181979bad13a811ad3d921789..47434536d5dbe008f5cd5610b90d1bef5944c5d1 100644 (file)
--- a/dot.demo/simple.c
+++ b/dot.demo/simple.c
@@ -14,7 +14,7 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
-#include <dotneato.h>
+#include <gvc.h>
 
 int main(int argc, char **argv)
 {

diff --git a/lib/circogen/libcircogen.pc.in b/lib/circogen/libcircogen.pc.in
deleted file mode 100644 (file)
index 46e0218..0000000
--- a/lib/circogen/libcircogen.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@/@PACKAGE@
-includedir=@includedir@/@PACKAGE@
-
-Name: libcircogen
-Description: Circular layout library
-Version: @VERSION@
-Libs: -L${libdir} -lcircogen
-Cflags: -I${includedir}

diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am
index 0ac3051d94b1f9f703462e178976655bd5493724..a8155db0e511d5f17ff70e06b492746285e22376 100644 (file)
--- a/lib/common/Makefile.am
+++ b/lib/common/Makefile.am
@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
 
 pkginclude_HEADERS = const.h globals.h htmllex.h htmltable.h macros.h \
        pointset.h render.h renderprocs.h types.h utils.h colortbl.h
-pkglib_LTLIBRARIES = libcommon.la
+noinst_LTLIBRARIES = libcommon.la
 
 if !DISABLE_CODEGENS
 CODEGENS = diagen.c figgen.c hpglgen.c gdgen.c mapgen.c mifgen.c mpgen.c \
@@ -26,8 +26,6 @@ libcommon_la_SOURCES = arrows.c colxlate.c fontmetrics.c \
        svgusershape.c timing.c labels.c ns.c shapes.c utils.c \
        output.c emit.c $(CODEGENS)
 
-libcommon_la_LIBADD = $(top_builddir)/lib/pathplan/libpathplan.la @GD_LIBS@ @EXPAT_LIBS@ @Z_LIBS@
-
 psgen.o psgen.lo : ps.h
 
 ps.h : ps.txt

diff --git a/lib/common/args.c b/lib/common/args.c
index 984767635ee5456aa43439b5c39498a66b96d6a4..33f2b70eb68f4209d22ed6e3c698cec00e7dccb2 100644 (file)
--- a/lib/common/args.c
+++ b/lib/common/args.c
@@ -27,7 +27,7 @@
 #include "config.h"
 #endif
 
-#include "render.h"
+#include "gvc.h"
 #include "tlayout.h"
 
 /* Default layout values, possibly set via command line; -1 indicates unset */

diff --git a/lib/common/arrows.c b/lib/common/arrows.c
index 72d45a16ecbc3533238b355e9acff39f4b090af0..110db8a5264fdf1f60f3209e28924787c42180d3 100644 (file)
--- a/lib/common/arrows.c
+++ b/lib/common/arrows.c
@@ -15,7 +15,6 @@
 **********************************************************/
 
 
-#include       "render.h"
 #include       "gvc.h"
 
 #define sqr(a) ((double) (a) * (a))

diff --git a/lib/common/colxlate.c b/lib/common/colxlate.c
index ad480fa2f7b4eac4dd24f53948fe1bb922423739..2be78956841a3fee27fa8c89cdd9f1103ca767f6 100644 (file)
--- a/lib/common/colxlate.c
+++ b/lib/common/colxlate.c
@@ -14,7 +14,7 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
-#include "render.h"
+#include "gvc.h"
 #include "colortbl.h"
 #include <ctype.h>
 

diff --git a/lib/common/diagen.c b/lib/common/diagen.c
index 383f3afaf6cc766441f7ffc06a20079af84c0f50..e6aa972d2693ee6c13d792804d8775ce9191de08 100644 (file)
--- a/lib/common/diagen.c
+++ b/lib/common/diagen.c
@@ -16,8 +16,8 @@
 
 
 
-#include       <stdarg.h>
-#include       "render.h"
+#include <stdarg.h>
+#include "gvc.h"
 #include "utils.h"
 
 #ifdef HAVE_LIBZ

diff --git a/lib/common/emit.c b/lib/common/emit.c
index 42e514182b3010ba0b6bc9722e03933e26938e1f..0e91b3710e63e37df583add5ce1a21f2d9fc7adb 100644 (file)
--- a/lib/common/emit.c
+++ b/lib/common/emit.c
@@ -20,9 +20,8 @@
 
 #include       <ctype.h>
 
-#include       "render.h"
-#include       "agxbuf.h"
 #include       "gvc.h"
+#include       "agxbuf.h"
 
 static char *defaultlinestyle[3] = { "solid\0", "setlinewidth\0001\0", 0 };
 int    emitState;

diff --git a/lib/common/figgen.c b/lib/common/figgen.c
index 94821a7ed229be0f4b18e5a0203ffdbe1f3457fa..e01cdd66d3cb9ea844d220fd8bcdd9c5ed638837 100644 (file)
--- a/lib/common/figgen.c
+++ b/lib/common/figgen.c
@@ -15,7 +15,7 @@
 **********************************************************/
 
 
-#include       "render.h"
+#include       "gvc.h"
 #include       "utils.h"
 #include       <ctype.h>
 

diff --git a/lib/common/fontmetrics.c b/lib/common/fontmetrics.c
index 6d018540ab9aba2fc71733ff4cd8a7c1eb0337e3..287bf044b7d96d6200f97a80546682662d5e4cd1 100644 (file)
--- a/lib/common/fontmetrics.c
+++ b/lib/common/fontmetrics.c
@@ -14,7 +14,7 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
-#include "render.h"
+#include "gvc.h"
 #include "utils.h"
 
 //#ifdef HAVE_CAIRO

diff --git a/lib/common/gdgen.c b/lib/common/gdgen.c
index 9f73a07d8f3cb06eb51312555ff67e164ebaffac..d01186f14eb29340f218acceb1667dcf586c4e68 100644 (file)
--- a/lib/common/gdgen.c
+++ b/lib/common/gdgen.c
@@ -14,7 +14,7 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
-#include                "render.h"
+#include                "gvc.h"
 #include                "gd.h"
 #include                "utils.h"
 #include                <fcntl.h>

diff --git a/lib/common/gdtextsize.c b/lib/common/gdtextsize.c
index 661b8eea549e3c6cb7ae436eface0422d2643239..7c1ab38e769ba2ae5eec6d105941bd7de0ee3431 100644 (file)
--- a/lib/common/gdtextsize.c
+++ b/lib/common/gdtextsize.c
@@ -14,7 +14,7 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
-#include       "render.h"
+#include       "gvc.h"
 #include       "gd.h"
 
 /* sometimes fonts are stored under a different name */

diff --git a/lib/common/gdusershape.c b/lib/common/gdusershape.c
index ff34d3858cd5fd3a5c6fbb68c0207ae05fd55d10..6f6b5e0984629407edb925e8066317ff940af892 100644 (file)
--- a/lib/common/gdusershape.c
+++ b/lib/common/gdusershape.c
@@ -14,7 +14,7 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
-#include                "render.h"
+#include                "gvc.h"
 #include                "gd.h"
 
 static Dict_t *ImageDict;

diff --git a/lib/common/globals.c b/lib/common/globals.c
index 486cc83ed90c2a326fc8847c73e335bf6dc1e61e..b00b4e54958cb0dee16275ab983e9b0e35264183 100644 (file)
--- a/lib/common/globals.c
+++ b/lib/common/globals.c
@@ -16,4 +16,4 @@
 
 
 #define EXTERN
-#include "render.h"
+#include "gvc.h"

diff --git a/lib/common/hpglgen.c b/lib/common/hpglgen.c
index 478baadc8973084093ef9820f9c495c69891979b..354ef28ea47d3d54c0d439303076f1fadaae4b23 100644 (file)
--- a/lib/common/hpglgen.c
+++ b/lib/common/hpglgen.c
@@ -18,8 +18,8 @@
 /* TODO:
  *  Use encoded form for polyline and polygon
  */
-#include       "render.h"
 #include       <ctype.h>
+#include       "gvc.h"
 
 #define SOLID  0
 #define DOTTED 1

diff --git a/lib/common/htmllex.c b/lib/common/htmllex.c
index e4bac406be4d1193fd5f9f6fcb9439f2d86368ac..594e13c94aa54424126e2c2928cd504d0d0d4d93 100644 (file)
--- a/lib/common/htmllex.c
+++ b/lib/common/htmllex.c
@@ -15,7 +15,7 @@
 **********************************************************/
 
 
-#include "render.h"
+#include "gvc.h"
 #include "htmltable.h"
 #include "htmlparse.h"
 #include "htmllex.h"

diff --git a/lib/common/htmlparse.y b/lib/common/htmlparse.y
index c2e65a742262b36fc1fc69296a0f4a5d30e6da9f..fb681db3e00cab3414801a56cf5adefa21ddfb7a 100644 (file)
--- a/lib/common/htmlparse.y
+++ b/lib/common/htmlparse.y
@@ -16,7 +16,7 @@
 
 %{
 
-#include "render.h"
+#include "gvc.h"
 #include "htmltable.h"
 #include "htmllex.h"
 

diff --git a/lib/common/htmltable.c b/lib/common/htmltable.c
index f0b089568b26af02919c9daa5f0e3020dbff4e27..190c5b18bbea4d1fda522d391703dd1d1a658360 100644 (file)
--- a/lib/common/htmltable.c
+++ b/lib/common/htmltable.c
@@ -33,7 +33,7 @@
  * e.g., CELLGRID=n, which sets CELLBORDER=0 and has the border drawing
  * handled correctly by the table.
  */
-#include "render.h"
+#include "gvc.h"
 #include "htmltable.h"
 #include "agxbuf.h"
 #include "pointset.h"

diff --git a/lib/common/htmltable.h b/lib/common/htmltable.h
index cc09906adb7739aa04586ac1d174532eb77a8074..c968be74af63e54b1ae16f294d4fa8cf5d1099a8 100644 (file)
--- a/lib/common/htmltable.h
+++ b/lib/common/htmltable.h
@@ -21,7 +21,6 @@ extern "C" {
 #ifndef TABLE_H
 #define TABLE_H
 
-#include "render.h"
 #include "gvc.h"
 
 #define FIXED_FLAG 1

diff --git a/lib/common/input.c b/lib/common/input.c
index ab11b58223d57902f533b3916cb2c9868dad463d..e04e775465274af09fddcfb9065fa817f0689d3a 100644 (file)
--- a/lib/common/input.c
+++ b/lib/common/input.c
@@ -16,7 +16,7 @@
 
 #include       <ctype.h>
 
-#include       "render.h"
+#include       "gvc.h"
 #include       "htmltable.h"
 
 char *Gvfilepath;

diff --git a/lib/common/labels.c b/lib/common/labels.c
index 4298604a1dd531f5fdba95e9b38f53b99a777963..90a84b5de47923b3067518ade7ca5aaef9c70a05 100644 (file)
--- a/lib/common/labels.c
+++ b/lib/common/labels.c
@@ -15,7 +15,6 @@
 **********************************************************/
 
 
-#include       "render.h"
 #include       "gvc.h"
 #include       "htmltable.h"
 #include       <limits.h>

diff --git a/lib/common/libcommon.pc.in b/lib/common/libcommon.pc.in
deleted file mode 100644 (file)
index f716361..0000000
--- a/lib/common/libcommon.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@/@PACKAGE@
-includedir=@includedir@/@PACKAGE@
-                                                                                       
-Name: libcommon
-Description: Various renderers and other routines common to all layout engines.
-Version: @VERSION@
-Libs: -L${libdir} -lcommon
-Cflags: -I${includedir}

diff --git a/lib/common/mapgen.c b/lib/common/mapgen.c
index 41984ab635b0e679663df8fb331e3bf5500f8d6d..2dcb688e46a6faed97d3031fdc5f76976defb48e 100644 (file)
--- a/lib/common/mapgen.c
+++ b/lib/common/mapgen.c
@@ -17,7 +17,7 @@
 
 #define NEWANCHORS 0
 
-#include                "render.h"
+#include                "gvc.h"
 #include                "htmltable.h"
 
 

diff --git a/lib/common/mifgen.c b/lib/common/mifgen.c
index d76ffc2987a9acce2d3e73f39863e8e4f0b3b462..1cdef1e7803bde4b1589f951f8d9b3e979932565 100644 (file)
--- a/lib/common/mifgen.c
+++ b/lib/common/mifgen.c
@@ -15,7 +15,7 @@
 **********************************************************/
 
 
-#include       "render.h"
+#include       "gvc.h"
 #include "utils.h"
 
 

diff --git a/lib/common/mpgen.c b/lib/common/mpgen.c
index e68e2dba8adf65e1da32f2597faac3cddba7ff99..f704ab7789cf2c66f0724e3d2822041be69e5e37 100644 (file)
--- a/lib/common/mpgen.c
+++ b/lib/common/mpgen.c
@@ -17,7 +17,7 @@
 /* mpgen.c 1999-Feb-23 Jim Hefferon jim@joshua.smcvt.edu 
  *  Adapted from psgen.c.  See 1st_read.mp.
  */
-#include       "render.h"
+#include       "gvc.h"
 #ifndef MSWIN32
 #include <unistd.h>
 #endif

diff --git a/lib/common/ns.c b/lib/common/ns.c
index aba858825be1cb16fe05a3dc59687a309094b68e..e22cf0133aa8aa4b821c355957d3d88a765b96c4 100644 (file)
--- a/lib/common/ns.c
+++ b/lib/common/ns.c
@@ -19,7 +19,7 @@
  * Network Simplex Algorithm for Ranking Nodes of a DAG
  */
 
-#include "render.h"
+#include "gvc.h"
 
 static int init_graph(graph_t *);
 static void dfs_cutval(node_t * v, edge_t * par);

diff --git a/lib/common/output.c b/lib/common/output.c
index 9f67ebf2fa37d3290d6b6c36b215e179bf538c17..ee78207bf8acd2a0528f774f1338ff96c628cd70 100644 (file)
--- a/lib/common/output.c
+++ b/lib/common/output.c
@@ -14,7 +14,6 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
-#include       "render.h"
 #include       "gvc.h"
 #include       "agxbuf.h"
 

diff --git a/lib/common/picgen.c b/lib/common/picgen.c
index a00f74a44cd1a04c9ea93d9aec6dc55fc7509a75..18216c822b27b349e0022eb1f4343ffc935e102e 100644 (file)
--- a/lib/common/picgen.c
+++ b/lib/common/picgen.c
@@ -15,7 +15,7 @@
 **********************************************************/
 
 
-#include       "render.h"
+#include       "gvc.h"
 
 
 #define PIC_COORDS_PER_LINE (16)       /* to avoid stdio BUF overflow */

diff --git a/lib/common/postproc.c b/lib/common/postproc.c
index bdf735924f8a3a92433d9772ca3d7ab6ec02ed1a..c247d804d3148c4d600b58e38a43df835027665c 100644 (file)
--- a/lib/common/postproc.c
+++ b/lib/common/postproc.c
@@ -15,7 +15,7 @@
 **********************************************************/
 
 
-#include       "render.h"
+#include       "gvc.h"
 
 
 static int Rankdir;

diff --git a/lib/common/psgen.c b/lib/common/psgen.c
index 989ff37af95d3d6b0ec340cec623a4fce866f9e0..b1f97f8270964aa3774b6f8b3822e5385279e2c3 100644 (file)
--- a/lib/common/psgen.c
+++ b/lib/common/psgen.c
@@ -21,7 +21,6 @@
  */
 #define        PDFMAX  3240            /*  Maximum size of Distiller's PDF canvas  */
 
-#include       "render.h"
 #include       "gvc.h"
 #include       "ps.h"
 #include       "utils.h"

diff --git a/lib/common/psusershape.c b/lib/common/psusershape.c
index 610b1a0eb99d7480ff35b52fb5acd9a192ff5c2a..7043a0240717373ffe14de472c9b7ebe928fc781 100644 (file)
--- a/lib/common/psusershape.c
+++ b/lib/common/psusershape.c
@@ -21,7 +21,7 @@
 #include <sys/stat.h>
 #include <stdio.h>
 
-#include       "render.h"
+#include       "gvc.h"
 
 static int N_EPSF_files;
 static Dict_t *EPSF_contents;

diff --git a/lib/common/render.h b/lib/common/render.h
index 4fb4dadad8004fdae9392529a06f94d817524f6b..1f5add85c195faabd2d9ff423d4f10bbfde20603 100644 (file)
--- a/lib/common/render.h
+++ b/lib/common/render.h
@@ -56,7 +56,6 @@
 #include "globals.h"
 #include "renderprocs.h"
 #include "utils.h"
-#include "gvc.h"
 
 typedef struct epsf_s {
     int macro_id;

diff --git a/lib/common/routespl.c b/lib/common/routespl.c
index c658d75958be05ce57560e65b03854dc21618465..ac6c5ed6c964e9638f474055884cafec71294691 100644 (file)
--- a/lib/common/routespl.c
+++ b/lib/common/routespl.c
@@ -15,8 +15,7 @@
 **********************************************************/
 
 
-/* #include    "dot.h" */
-#include       "render.h"
+#include       "gvc.h"
 #include       "pathplan.h"
 
 #ifdef UNUSED

diff --git a/lib/common/shapes.c b/lib/common/shapes.c
index e33f8a8137de27a2500968628e21b861f5c715ca..9e950934ed70b4a75fe3bcbc38a62d3f4547e838 100644 (file)
--- a/lib/common/shapes.c
+++ b/lib/common/shapes.c
@@ -17,7 +17,6 @@
 /* for sincos */
 #define _GNU_SOURCE 1
 
-#include       "render.h"
 #include       "gvc.h"
 #include       "htmltable.h"
 #include       <limits.h>

diff --git a/lib/common/splines.c b/lib/common/splines.c
index d21fe9e253fae632d2e96177e0f132008a2d9981..f86098c63de7c6f1fb60a3e072d736af28cc8375 100644 (file)
--- a/lib/common/splines.c
+++ b/lib/common/splines.c
@@ -19,7 +19,7 @@
  * an edge, starting from a list of control points.
  */
 
-#include <render.h>
+#include "gvc.h"
 
 static int debugleveln(edge_t* e, int i)
 {

diff --git a/lib/common/svggen.c b/lib/common/svggen.c
index c135cc0f85ceb3dc84cc6fb2b368f089f279751a..08fce906a742098b2629edb1bc4c2622ac375738 100644 (file)
--- a/lib/common/svggen.c
+++ b/lib/common/svggen.c
@@ -44,7 +44,7 @@ Stephen North
 north@research.att.com
 */
 
-#include       "render.h"
+#include       "gvc.h"
 #include       "utils.h"
 #ifdef HAVE_LIBZ
 #include       "zlib.h"

diff --git a/lib/common/svgusershape.c b/lib/common/svgusershape.c
index fb4579a76c83c9fecd43e6869320abe6eaebeffa..b3a1d1dc4b1c1863226e8de7d84473e7504af521 100644 (file)
--- a/lib/common/svgusershape.c
+++ b/lib/common/svgusershape.c
@@ -14,7 +14,7 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
-#include       "render.h"
+#include       "gvc.h"
 
 point svg_image_size(graph_t * g, char *shapeimagefile)
 {

diff --git a/lib/common/vrmlgen.c b/lib/common/vrmlgen.c
index bdabcc0d4a6b7d7622b237d8be3f0d9a9219ed8c..6b2c616d872257143129cca0c7dc2a174a3e8c51 100644 (file)
--- a/lib/common/vrmlgen.c
+++ b/lib/common/vrmlgen.c
@@ -15,7 +15,7 @@
 **********************************************************/
 
 
-#include               "render.h"
+#include               "gvc.h"
 #include               "gd.h"
 #include               "utils.h"
 #include               "pathutil.h"

diff --git a/lib/common/xdgen.c b/lib/common/xdgen.c
index de8735ae7aeeafb7a652de996836ecb7ab79d32e..747dd3bbec654a85e84d3c44010a9a3ba17c7912 100644 (file)
--- a/lib/common/xdgen.c
+++ b/lib/common/xdgen.c
@@ -14,7 +14,6 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
-#include       "render.h"
 #include       "gvc.h"
 #include       "agxbuf.h"