From d33278365179e82c45765d55c9c8312cfe32b53a Mon Sep 17 00:00:00 2001 From: ellson Date: Wed, 20 Jul 2005 02:39:16 +0000 Subject: [PATCH] - merge libdotneato into libgvc - make libcommon a convenience library and link into libgvc - convert demo to use libgvc --- cmd/dot/Makefile.am | 31 +--------- cmd/dot/dotneato.c | 108 --------------------------------- cmd/dot/dotneato.h | 35 ----------- cmd/dot/libdotneato.pc.in | 10 --- configure.ac | 8 --- dot.demo/Makefile | 4 +- dot.demo/demo.c | 2 +- dot.demo/dot.c | 2 +- dot.demo/simple.c | 2 +- lib/circogen/libcircogen.pc.in | 10 --- lib/common/Makefile.am | 4 +- lib/common/args.c | 2 +- lib/common/arrows.c | 1 - lib/common/colxlate.c | 2 +- lib/common/diagen.c | 4 +- lib/common/emit.c | 3 +- lib/common/figgen.c | 2 +- lib/common/fontmetrics.c | 2 +- lib/common/gdgen.c | 2 +- lib/common/gdtextsize.c | 2 +- lib/common/gdusershape.c | 2 +- lib/common/globals.c | 2 +- lib/common/hpglgen.c | 2 +- lib/common/htmllex.c | 2 +- lib/common/htmlparse.y | 2 +- lib/common/htmltable.c | 2 +- lib/common/htmltable.h | 1 - lib/common/input.c | 2 +- lib/common/labels.c | 1 - lib/common/libcommon.pc.in | 10 --- lib/common/mapgen.c | 2 +- lib/common/mifgen.c | 2 +- lib/common/mpgen.c | 2 +- lib/common/ns.c | 2 +- lib/common/output.c | 1 - lib/common/picgen.c | 2 +- lib/common/postproc.c | 2 +- lib/common/psgen.c | 1 - lib/common/psusershape.c | 2 +- lib/common/render.h | 1 - lib/common/routespl.c | 3 +- lib/common/shapes.c | 1 - lib/common/splines.c | 2 +- lib/common/svggen.c | 2 +- lib/common/svgusershape.c | 2 +- lib/common/vrmlgen.c | 2 +- lib/common/xdgen.c | 1 - 47 files changed, 35 insertions(+), 257 deletions(-) delete mode 100644 cmd/dot/dotneato.c delete mode 100644 cmd/dot/dotneato.h delete mode 100644 cmd/dot/libdotneato.pc.in delete mode 100644 lib/circogen/libcircogen.pc.in delete mode 100644 lib/common/libcommon.pc.in diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am index 6fd34cf5e..bf9a7e104 100644 --- 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 index 402de0ff4..000000000 --- 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 - -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 index c8a344f57..000000000 --- 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 index 082c04ee0..000000000 --- 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 740eef925..ddbc3a873 100644 --- 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 1d288ca72..17802a3f7 100644 --- 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 b87da72a9..9e4644761 100644 --- a/dot.demo/demo.c +++ b/dot.demo/demo.c @@ -14,7 +14,7 @@ * AT&T Research, Florham Park NJ * **********************************************************/ -#include +#include int main(int argc, char **argv) { diff --git a/dot.demo/dot.c b/dot.demo/dot.c index 583d4bf1c..9ee3e43eb 100644 --- a/dot.demo/dot.c +++ b/dot.demo/dot.c @@ -14,7 +14,7 @@ * AT&T Research, Florham Park NJ * **********************************************************/ -#include +#include int main(int argc, char **argv) { diff --git a/dot.demo/simple.c b/dot.demo/simple.c index 0d4ba289c..47434536d 100644 --- a/dot.demo/simple.c +++ b/dot.demo/simple.c @@ -14,7 +14,7 @@ * AT&T Research, Florham Park NJ * **********************************************************/ -#include +#include int main(int argc, char **argv) { diff --git a/lib/circogen/libcircogen.pc.in b/lib/circogen/libcircogen.pc.in deleted file mode 100644 index 46e021837..000000000 --- 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 0ac3051d9..a8155db0e 100644 --- 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 984767635..33f2b70eb 100644 --- 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 72d45a16e..110db8a52 100644 --- 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 ad480fa2f..2be789568 100644 --- 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 diff --git a/lib/common/diagen.c b/lib/common/diagen.c index 383f3afaf..e6aa972d2 100644 --- a/lib/common/diagen.c +++ b/lib/common/diagen.c @@ -16,8 +16,8 @@ -#include -#include "render.h" +#include +#include "gvc.h" #include "utils.h" #ifdef HAVE_LIBZ diff --git a/lib/common/emit.c b/lib/common/emit.c index 42e514182..0e91b3710 100644 --- a/lib/common/emit.c +++ b/lib/common/emit.c @@ -20,9 +20,8 @@ #include -#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 94821a7ed..e01cdd66d 100644 --- a/lib/common/figgen.c +++ b/lib/common/figgen.c @@ -15,7 +15,7 @@ **********************************************************/ -#include "render.h" +#include "gvc.h" #include "utils.h" #include diff --git a/lib/common/fontmetrics.c b/lib/common/fontmetrics.c index 6d018540a..287bf044b 100644 --- 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 9f73a07d8..d01186f14 100644 --- 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 diff --git a/lib/common/gdtextsize.c b/lib/common/gdtextsize.c index 661b8eea5..7c1ab38e7 100644 --- 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 ff34d3858..6f6b5e098 100644 --- 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 486cc83ed..b00b4e549 100644 --- 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 478baadc8..354ef28ea 100644 --- 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 +#include "gvc.h" #define SOLID 0 #define DOTTED 1 diff --git a/lib/common/htmllex.c b/lib/common/htmllex.c index e4bac406b..594e13c94 100644 --- 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 c2e65a742..fb681db3e 100644 --- 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 f0b089568..190c5b18b 100644 --- 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 cc09906ad..c968be74a 100644 --- 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 ab11b5822..e04e77546 100644 --- a/lib/common/input.c +++ b/lib/common/input.c @@ -16,7 +16,7 @@ #include -#include "render.h" +#include "gvc.h" #include "htmltable.h" char *Gvfilepath; diff --git a/lib/common/labels.c b/lib/common/labels.c index 4298604a1..90a84b5de 100644 --- a/lib/common/labels.c +++ b/lib/common/labels.c @@ -15,7 +15,6 @@ **********************************************************/ -#include "render.h" #include "gvc.h" #include "htmltable.h" #include diff --git a/lib/common/libcommon.pc.in b/lib/common/libcommon.pc.in deleted file mode 100644 index f71636174..000000000 --- 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 41984ab63..2dcb688e4 100644 --- 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 d76ffc298..1cdef1e78 100644 --- 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 e68e2dba8..f704ab778 100644 --- 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 #endif diff --git a/lib/common/ns.c b/lib/common/ns.c index aba858825..e22cf0133 100644 --- 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 9f67ebf2f..ee78207bf 100644 --- 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 a00f74a44..18216c822 100644 --- 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 bdf735924..c247d804d 100644 --- 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 989ff37af..b1f97f827 100644 --- 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 610b1a0eb..7043a0240 100644 --- a/lib/common/psusershape.c +++ b/lib/common/psusershape.c @@ -21,7 +21,7 @@ #include #include -#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 4fb4dadad..1f5add85c 100644 --- 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 c658d7595..ac6c5ed6c 100644 --- 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 e33f8a813..9e950934e 100644 --- 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 diff --git a/lib/common/splines.c b/lib/common/splines.c index d21fe9e25..f86098c63 100644 --- a/lib/common/splines.c +++ b/lib/common/splines.c @@ -19,7 +19,7 @@ * an edge, starting from a list of control points. */ -#include +#include "gvc.h" static int debugleveln(edge_t* e, int i) { diff --git a/lib/common/svggen.c b/lib/common/svggen.c index c135cc0f8..08fce906a 100644 --- 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 fb4579a76..b3a1d1dc4 100644 --- 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 bdabcc0d4..6b2c616d8 100644 --- 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 de8735ae7..747dd3bbe 100644 --- 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" -- 2.40.0