fix mechanism for specifying builtins

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index 1e0c46895cccf1d17c668055620aaba2b8c8e341..d1a67e62413efe5363beb7a074a472dce0860b81 100644 (file)
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -11,23 +11,19 @@ AM_CPPFLAGS = \
         -I$(top_srcdir)/lib/gvc \
        -I$(top_srcdir)/lib/pathplan \
        -I$(top_srcdir)/lib/graph \
-       -I$(top_srcdir)/lib/cdt
+       -I$(top_srcdir)/lib/cdt \
+       -DBUILTINS
 
 if ENABLE_STATIC
-bin_PROGRAMS = dot dot_static
+bin_PROGRAMS = dot_static
 else
 bin_PROGRAMS = dot
 endif
 man_MANS = dot.1 
 pdf_DATA = dot.pdf
 
-dot_SOURCES = dot.c
-dot_LDFLAGS = -export-dynamic -dlpreopen self -export-symbols-regex '.*_LTX_library'
-dot_LDADD = \
-       $(top_builddir)/lib/plugin/libgvplugin_dot_layout.la \
-       $(top_builddir)/lib/plugin/libgvplugin_neato_layout.la \
-       $(top_builddir)/lib/plugin/libgvplugin_usershape_gd.la \
-       $(top_builddir)/lib/gvc/libgvc.la
+dot_SOURCES = dot.c dot_builtins.c
+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;)
@@ -47,19 +43,7 @@ uninstall-hook:
 dot.pdf: $(top_srcdir)/cmd/dot/dot.1
        groff -Tps -man $(top_srcdir)/cmd/dot/dot.1 | ps2pdf - - >$@
 
-dot_static_SOURCES = $(dot_SOURCES)
-dot_static_DEPENDENCIES = \
-       $(top_builddir)/lib/plugin/.libs/libgvplugin_dot_layout.a \
-       $(top_builddir)/lib/plugin/.libs/libgvplugin_neato_layout.a \
-       $(top_builddir)/lib/plugin/.libs/libgvplugin_usershape_gd.a \
-       $(top_builddir)/lib/gvc/.libs/libgvc.a \
-       $(top_builddir)/lib/pathplan/.libs/libpathplan.a \
-       $(top_builddir)/lib/pack/.libs/libpack.a \
-       $(top_builddir)/lib/graph/.libs/libgraph.a \
-       $(top_builddir)/lib/cdt/.libs/libcdt.a \
-       $(top_builddir)/lib/gd/.libs/libgvgd.a
-dot_static_LDFLAGS = -export-dynamic -dlpreopen self -export-symbols-regex '.*_LTX_library'
-
+dot_static_SOURCES = dot.c dot_static_builtins.c
 dot_static_LDADD = \
        $(top_builddir)/lib/plugin/.libs/libgvplugin_dot_layout.a \
        $(top_builddir)/lib/plugin/.libs/libgvplugin_neato_layout.a \

diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
index 5707e9b7892fc78c46219daa96a50d00297f41e0..430ba8de00a5fc45b2722cc222bf94325a10f8e2 100644 (file)
--- a/cmd/tools/Makefile.am
+++ b/cmd/tools/Makefile.am
@@ -10,7 +10,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/neatogen \
        -I$(top_srcdir)/lib/gvc \
        -I$(top_srcdir)/lib/common \
-       -I$(top_srcdir)/lib/ingraphs @EXPAT_INCLUDES@
+       -I$(top_srcdir)/lib/ingraphs @EXPAT_INCLUDES@ -DBUILTINS
 
 pdfdir = $(pkgdatadir)/doc/pdf
 
@@ -95,15 +95,11 @@ gc_LDADD = \
        $(top_builddir)/lib/ingraphs/libingraphs.la \
        $(top_builddir)/lib/graph/libgraph.la
 
-gvpack_SOURCES = gvpack.c
-
-gvpack_LDFLAGS = -export-dynamic -dlpreopen self -export-symbols-regex '.*_LTX_library'
+gvpack_SOURCES = gvpack.c gvpack_builtins.c
 
 gvpack_LDADD = \
-       $(top_builddir)/lib/common/libcommon.la \
        $(top_builddir)/lib/gvc/libgvc.la \
        $(top_builddir)/lib/ingraphs/libingraphs.la \
-       $(top_builddir)/lib/graph/libgraph.la \
        $(top_builddir)/lib/plugin/libgvplugin_neato_layout.la
 
 dijkstra_SOURCES = dijkstra.c

diff --git a/dot.demo/Makefile b/dot.demo/Makefile
index 3ac3f3d98d1f69b085317d16339ef043d2e133f1..e6e69eb46b7ab8d53dd82f0ea530afb13bb0c606 100644 (file)
--- a/dot.demo/Makefile
+++ b/dot.demo/Makefile
@@ -1,28 +1,11 @@
-COMPILE=libtool --tag=CC --mode=compile ${CC} -c
-LINK=libtool --tag=CC --mode=link ${CC}
-
 CFLAGS=`pkg-config libgvc --cflags` -Wall -g -O2
-LDFLAGS=`pkg-config libgvc --libs` -export-dynamic -dlpreopen self -export-symbols-regex '.*_LTX_library'
+LDFLAGS=`pkg-config libgvc --libs`
 
 all: dot demo simple
 
-dot: dot.lo
-       ${LINK} ${LDFLAGS} -o $@ dot.lo
-
-dot.lo: dot.c
-       ${COMPILE} ${CFLAGS} -o $@ dot.c
-
-demo: demo.lo
-       ${LINK} ${LDFLAGS} -o $@ demo.lo
-
-demo.lo: demo.c
-       ${COMPILE} ${CFLAGS} -o $@ demo.c
-
-simple: simple.lo
-       ${LINK} ${LDFLAGS} -o $@ simple.lo
-
-simple.lo: simple.c
-       ${COMPILE} ${CFLAGS} -o $@ simple.c
+dot: dot.o
+demo: demo.o
+simple: simple.o
 
 clean:
-       rm -rf *.o *.lo .libs dot demo simple *.png
+       rm -rf *.o dot demo simple *.png

diff --git a/lib/common/args.c b/lib/common/args.c
index 5d389e99aea29d9a22841821bdac9a519cf80934..d4b92760bfb3e32b20ac617663e0c8f15b6ba3ec 100644 (file)
--- a/lib/common/args.c
+++ b/lib/common/args.c
@@ -27,7 +27,10 @@
 #include "config.h"
 #endif
 
-#include "gvc.h"
+#include "render.h"
+#include "gvplugin.h"
+#include "gvcint.h"
+#include "gvcproc.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 dcf786eabdf318cc703f24b08cfd1a2690e18144..909d30ad741da4b1473caf614558a67638075156 100644 (file)
--- a/lib/common/arrows.c
+++ b/lib/common/arrows.c
@@ -15,7 +15,10 @@
 **********************************************************/
 
 
-#include       "gvc.h"
+#include "render.h"
+#include "gvplugin.h"
+#include "gvcint.h"
+#include "gvcproc.h"
 
 #define EPSILON .0001
 

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

diff --git a/lib/common/diagen.c b/lib/common/diagen.c
index 5fc454490b2c02654163be970995e7a9aaae712c..f2cd74cc728bc454b19fafffe657c2797c3d8ff2 100644 (file)
--- a/lib/common/diagen.c
+++ b/lib/common/diagen.c
@@ -17,7 +17,10 @@
 
 
 #include <stdarg.h>
-#include "gvc.h"
+#include "render.h"
+#include "gvplugin.h"
+#include "gvcint.h"
+#include "gvcproc.h"
 #include "utils.h"
 
 #ifdef HAVE_LIBZ

diff --git a/lib/common/emit.c b/lib/common/emit.c
index cf5976a41d5cc94c82370563f10fb3be6cfcabf5..6628d155fbca9ae513fe983e336bfbeab813981e 100644 (file)
--- a/lib/common/emit.c
+++ b/lib/common/emit.c
@@ -19,8 +19,10 @@
  */
 
 #include       <ctype.h>
-
-#include       "gvc.h"
+#include "render.h"
+#include "gvplugin.h"
+#include "gvcint.h"
+#include "gvcproc.h"
 #include       "agxbuf.h"
 
 static char *defaultlinestyle[3] = { "solid\0", "setlinewidth\0001\0", 0 };

diff --git a/lib/common/figgen.c b/lib/common/figgen.c
index e01cdd66d3cb9ea844d220fd8bcdd9c5ed638837..b846ab92c2e123c1aee9d1cfdf03b2ead57b18e8 100644 (file)
--- a/lib/common/figgen.c
+++ b/lib/common/figgen.c
@@ -14,8 +14,10 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
-
-#include       "gvc.h"
+#include "render.h"
+#include "gvplugin.h"
+#include "gvcint.h"
+#include "gvcproc.h"
 #include       "utils.h"
 #include       <ctype.h>
 

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

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

diff --git a/lib/common/gdtextsize.c b/lib/common/gdtextsize.c
index 9c3a1c664eb288a2b6c3de624fe96efc23dc376e..2b976379d789477c2172a7697b439b84910d23b6 100644 (file)
--- a/lib/common/gdtextsize.c
+++ b/lib/common/gdtextsize.c
@@ -14,7 +14,10 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
-#include       "gvc.h"
+#include "render.h"
+#include "gvplugin.h"
+#include "gvcint.h"
+#include "gvcproc.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 6f6b5e0984629407edb925e8066317ff940af892..015cc6821e12ffecb39e68dc8018632d3f200866 100644 (file)
--- a/lib/common/gdusershape.c
+++ b/lib/common/gdusershape.c
@@ -14,7 +14,10 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
-#include                "gvc.h"
+#include "render.h"
+#include "gvplugin.h"
+#include "gvcint.h"
+#include "gvcproc.h"
 #include                "gd.h"
 
 static Dict_t *ImageDict;

diff --git a/lib/common/globals.c b/lib/common/globals.c
index b00b4e54958cb0dee16275ab983e9b0e35264183..67167778d0b703bfc6295940dd0db720ed2e42ca 100644 (file)
--- a/lib/common/globals.c
+++ b/lib/common/globals.c
@@ -16,4 +16,7 @@
 
 
 #define EXTERN
-#include "gvc.h"
+#include "render.h"
+#include "gvplugin.h"
+#include "gvcint.h"
+#include "gvcproc.h"

diff --git a/lib/common/hpglgen.c b/lib/common/hpglgen.c
index 354ef28ea47d3d54c0d439303076f1fadaae4b23..d69650fb044db7560755f72610e4d0a27a87d06e 100644 (file)
--- a/lib/common/hpglgen.c
+++ b/lib/common/hpglgen.c
@@ -19,7 +19,10 @@
  *  Use encoded form for polyline and polygon
  */
 #include       <ctype.h>
-#include       "gvc.h"
+#include "render.h"
+#include "gvplugin.h"
+#include "gvcint.h"
+#include "gvcproc.h"
 
 #define SOLID  0
 #define DOTTED 1

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

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

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

diff --git a/lib/common/htmltable.h b/lib/common/htmltable.h
index c968be74af63e54b1ae16f294d4fa8cf5d1099a8..3a8499b595cc8def1058832aaa2278c59a30df2e 100644 (file)
--- a/lib/common/htmltable.h
+++ b/lib/common/htmltable.h
@@ -21,7 +21,10 @@ extern "C" {
 #ifndef TABLE_H
 #define TABLE_H
 
-#include "gvc.h"
+#include "render.h"
+#include "gvplugin.h"
+#include "gvcint.h"
+#include "gvcproc.h"
 
 #define FIXED_FLAG 1
 #define HALIGN_RIGHT (1 << 1)

diff --git a/lib/common/input.c b/lib/common/input.c
index c4275eb5d6a2175da876d9b721869407cd937cbe..02360a628acd69b45960263995fea455bc2dec5a 100644 (file)
--- a/lib/common/input.c
+++ b/lib/common/input.c
@@ -15,8 +15,10 @@
 **********************************************************/
 
 #include       <ctype.h>
-
-#include       "gvc.h"
+#include "render.h"
+#include "gvplugin.h"
+#include "gvcint.h"
+#include "gvcproc.h"
 #include       "htmltable.h"
 
 char *Gvfilepath;

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

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

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

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

diff --git a/lib/common/ns.c b/lib/common/ns.c
index e22cf0133aa8aa4b821c355957d3d88a765b96c4..df2597fc3e73ef35bb927b5aae60ea2d76f32c83 100644 (file)
--- a/lib/common/ns.c
+++ b/lib/common/ns.c
@@ -19,7 +19,10 @@
  * Network Simplex Algorithm for Ranking Nodes of a DAG
  */
 
-#include "gvc.h"
+#include "render.h"
+#include "gvplugin.h"
+#include "gvcint.h"
+#include "gvcproc.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 ee78207bf8acd2a0528f774f1338ff96c628cd70..3bbf883c046047583d9b6b283cca28aaf739dcbb 100644 (file)
--- a/lib/common/output.c
+++ b/lib/common/output.c
@@ -14,7 +14,10 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
-#include       "gvc.h"
+#include "render.h"
+#include "gvplugin.h"
+#include "gvcint.h"
+#include "gvcproc.h"
 #include       "agxbuf.h"
 
 static int e_arrows;           /* graph has edges with end arrows */

diff --git a/lib/common/picgen.c b/lib/common/picgen.c
index 18216c822b27b349e0022eb1f4343ffc935e102e..6f14907859d6a31efde239e988d05f4fcaff8b01 100644 (file)
--- a/lib/common/picgen.c
+++ b/lib/common/picgen.c
@@ -15,7 +15,10 @@
 **********************************************************/
 
 
-#include       "gvc.h"
+#include "render.h"
+#include "gvplugin.h"
+#include "gvcint.h"
+#include "gvcproc.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 4154081de7cd58e4dd6905e1be0f57afc7f82292..4df06af9cf4af118a163c97b5c8a5b6e8e74c92b 100644 (file)
--- a/lib/common/postproc.c
+++ b/lib/common/postproc.c
@@ -15,7 +15,10 @@
 **********************************************************/
 
 
-#include       "gvc.h"
+#include "render.h"
+#include "gvplugin.h"
+#include "gvcint.h"
+#include "gvcproc.h"
 
 
 static int Rankdir;

diff --git a/lib/common/psgen.c b/lib/common/psgen.c
index 583f69458c596e04e227d0757a7bd7a5f66cfc33..aedde1419b074536fdf3f91cd83a706b21548d62 100644 (file)
--- a/lib/common/psgen.c
+++ b/lib/common/psgen.c
@@ -21,7 +21,10 @@
  */
 #define        PDFMAX  3240            /*  Maximum size of Distiller's PDF canvas  */
 
-#include       "gvc.h"
+#include "render.h"
+#include "gvplugin.h"
+#include "gvcint.h"
+#include "gvcproc.h"
 #include       "ps.h"
 #include       "utils.h"
 #include       "agxbuf.h"

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

diff --git a/lib/common/routespl.c b/lib/common/routespl.c
index ac6c5ed6c964e9638f474055884cafec71294691..701e2c9240595204409153fb8efd783650851e06 100644 (file)
--- a/lib/common/routespl.c
+++ b/lib/common/routespl.c
@@ -15,7 +15,10 @@
 **********************************************************/
 
 
-#include       "gvc.h"
+#include "render.h"
+#include "gvplugin.h"
+#include "gvcint.h"
+#include "gvcproc.h"
 #include       "pathplan.h"
 
 #ifdef UNUSED

diff --git a/lib/common/shapes.c b/lib/common/shapes.c
index e2f68ccb2467c77f9382ff9f82b5e8e0f15d3a48..3be317abd3a34071c9a93c018fc333c5d2fc0258 100644 (file)
--- a/lib/common/shapes.c
+++ b/lib/common/shapes.c
@@ -17,7 +17,10 @@
 /* for sincos */
 #define _GNU_SOURCE 1
 
-#include       "gvc.h"
+#include "render.h"
+#include "gvplugin.h"
+#include "gvcint.h"
+#include "gvcproc.h"
 #include       "htmltable.h"
 #include       <limits.h>
 

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

diff --git a/lib/common/svggen.c b/lib/common/svggen.c
index 2a5c828415e143ea22821ac0b3915933caa38ad8..c7ee9892c9d9f43c71072e640062f2667f2128ae 100644 (file)
--- a/lib/common/svggen.c
+++ b/lib/common/svggen.c
@@ -44,7 +44,10 @@ Stephen North
 north@research.att.com
 */
 
-#include       "gvc.h"
+#include "render.h"
+#include "gvplugin.h"
+#include "gvcint.h"
+#include "gvcproc.h"
 #include       "utils.h"
 #ifdef HAVE_LIBZ
 #include       "zlib.h"

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

diff --git a/lib/common/utils.c b/lib/common/utils.c
index 6ed0a3e442c93a6fda1123cc97763bf857912cbc..b339cf8d02e6a527cdded0e86bdab9d7cf36544d 100644 (file)
--- a/lib/common/utils.c
+++ b/lib/common/utils.c
@@ -15,7 +15,10 @@
 **********************************************************/
 
 
-#include       "gvc.h"
+#include "render.h"
+#include "gvplugin.h"
+#include "gvcint.h"
+#include "gvcproc.h"
 #include       "agxbuf.h"
 #include       "utils.h"
 #include       "htmltable.h"

diff --git a/lib/common/vrmlgen.c b/lib/common/vrmlgen.c
index f6ddec96b0bec091f0d0c0035268133a4a247cd2..493d849ce289673a82cdb982a2e378edb2185701 100644 (file)
--- a/lib/common/vrmlgen.c
+++ b/lib/common/vrmlgen.c
@@ -15,7 +15,10 @@
 **********************************************************/
 
 
-#include               "gvc.h"
+#include "render.h"
+#include "gvplugin.h"
+#include "gvcint.h"
+#include "gvcproc.h"
 #include               "gd.h"
 #include               "utils.h"
 #include               "pathutil.h"

diff --git a/lib/common/vtxgen.c b/lib/common/vtxgen.c
index 734c2d12f685dc0ebcb39b23d3626c85eb26ba7c..dba63a640e96d3e1df4d2a36fc87384846a418c3 100644 (file)
--- a/lib/common/vtxgen.c
+++ b/lib/common/vtxgen.c
@@ -27,7 +27,10 @@
  */
 #define SUPPORT_WRITEDATE
 
-#include       "gvc.h"
+#include "render.h"
+#include "gvplugin.h"
+#include "gvcint.h"
+#include "gvcproc.h"
 #ifdef SUPPORT_WRITEDATE
 #include <time.h>
 #endif

diff --git a/lib/common/xdgen.c b/lib/common/xdgen.c
index 747dd3bbec654a85e84d3c44010a9a3ba17c7912..ddbc3c99beb3e4e84268a4b08723e5017aa81671 100644 (file)
--- a/lib/common/xdgen.c
+++ b/lib/common/xdgen.c
@@ -14,7 +14,10 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
-#include       "gvc.h"
+#include "render.h"
+#include "gvplugin.h"
+#include "gvcint.h"
+#include "gvcproc.h"
 #include       "agxbuf.h"
 
 int    xdemitState;

diff --git a/lib/gvc/gvc.c b/lib/gvc/gvc.c
index 26615b8b637adfff639da1d07c2988204d71849f..376aede185d04454757a6b21196005fc93630e94 100644 (file)
--- a/lib/gvc/gvc.c
+++ b/lib/gvc/gvc.c
@@ -14,7 +14,10 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
-#include "gvc.h"
+#include "render.h"
+#include "gvplugin.h"
+#include "gvcint.h"
+#include "gvcproc.h"
 
 char *LibInfo[] = {
     "libgvc",          /* Program */

diff --git a/lib/gvc/gvc.h b/lib/gvc/gvc.h
index b2d246f2607757041ce9626ee66375744c0d552b..2f40b7e4a908e73f6d34db6526c113f75943fe5a 100644 (file)
--- a/lib/gvc/gvc.h
+++ b/lib/gvc/gvc.h
@@ -76,6 +76,11 @@ extern int gvFreeLayout(GVC_t *gvc, graph_t *g);
 /* Clean up graphviz context */
 extern int gvFreeContext(GVC_t *gvc);
 
+#ifndef BUILTINS
+const lt_symlist_t lt_preloaded_symbols[] = {{0,0,},};
+#define BUILTINS
+#endif
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/gvc/gvconfig.c b/lib/gvc/gvconfig.c
index 33c99e90254e75e6c8759890111b13491792959a..dc67d804796208d8be421551340a93379c285f29 100644 (file)
--- a/lib/gvc/gvconfig.c
+++ b/lib/gvc/gvconfig.c
@@ -200,17 +200,9 @@ static void gvconfig_plugin_install_from_library(GVC_t * gvc, char *path, gvplug
     }
 }
 
-struct lt_symlist
-{
-    const char *name;
-    void* address;
-};
-
-extern const struct lt_symlist lt_preloaded_symbols[];
-
 static void gvconfig_plugin_install_builtins(GVC_t * gvc)
 {
-    const struct lt_symlist *s;
+    const lt_symlist_t *s;
     const char *name;
 
     s = lt_preloaded_symbols;

diff --git a/lib/gvc/gvplugin.h b/lib/gvc/gvplugin.h
index e75e181a56437c66e72857f0f677bc4439a513d6..70ecb718790f139c6306d7d260cb3915175d9502 100644 (file)
--- a/lib/gvc/gvplugin.h
+++ b/lib/gvc/gvplugin.h
@@ -74,7 +74,13 @@ extern "C" {
        gvplugin_api_t *apis;
     } gvplugin_library_t;
 
-    extern gvplugin_library_t *builtins[];
+
+    typedef struct {
+       const char *name;
+       void* address;
+    } lt_symlist_t;
+
+    extern const lt_symlist_t lt_preloaded_symbols[];
 
 #ifdef __cplusplus
 }

diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index b8aa928b885c428d854763b99b78ad12e7903e21..c114dbf986ea11e234da2efe363ad65edf9b0886 100644 (file)
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -10,12 +10,8 @@ AM_CPPFLAGS = \
 
 LIBS =  @LIBS@ -lc
 
-BASESOURCES = gv.cpp builtins.c
-BASELIBS = \
-       $(top_builddir)/lib/plugin/libgvplugin_dot_layout.la \
-       $(top_builddir)/lib/plugin/libgvplugin_neato_layout.la \
-       $(top_builddir)/lib/plugin/libgvplugin_usershape_gd.la \
-       $(top_builddir)/lib/gvc/libgvc.la
+BASESOURCES = gv.cpp
+BASELIBS = $(top_builddir)/lib/gvc/libgvc.la
 
 
 #CSHARP_hdr = gv.cs gvPINVOKE.cs SWIGTYPE_p_Agraph_t.cs SWIGTYPE_p_Agnode_t.cs SWIGTYPE_p_Agedge_t.cs

diff --git a/tclpkg/gv/gv.cpp b/tclpkg/gv/gv.cpp
index 516a0ff51e9f6764defbb564b620e02c880f6aa3..8773ef723342afe971637573c2a20e47dc6d857d 100644 (file)
--- a/tclpkg/gv/gv.cpp
+++ b/tclpkg/gv/gv.cpp
@@ -14,6 +14,7 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
+#define BUILTINS
 #include "gvc.h"
 
 GVC_t *gvc;