I give up. Plugins need access to graph types. Just don't pull in any

graph functions so that plugins have dependencies on graph libraries.

Clean up header inclusions.

diff --git a/lib/common/render.h b/lib/common/render.h
index 487f703f9c285cf9a73c67e9f9bbc932d57aa80e..5bcb7aaf00cc9ba18c9a03b5fc00dfa552a790c3 100644 (file)
--- a/lib/common/render.h
+++ b/lib/common/render.h
@@ -52,6 +52,7 @@ extern "C" {
 #include "agxbuf.h"
 #include "utils.h"             /* must follow types.h and agxbuf.h */
 #include "gvplugin.h"          /* must follow gvcext.h (in types.h) */
+#include "gvcjob.h"            /* must follow gvcext.h (in types.h) */
 #include "gvcint.h"            /* must follow gvcext.h (in types.h) */
 #include "gvcproc.h"           /* must follow gvcext.h (in types.h) */
 

diff --git a/lib/common/types.h b/lib/common/types.h
index 1c8235df74f6ff4d129c12555f754d03ffac9382..a154147041b6365c5191dde8fd184569bdc1209b 100644 (file)
--- a/lib/common/types.h
+++ b/lib/common/types.h
@@ -587,6 +587,10 @@ extern "C" {
         double T0;              /* initial temperature */
     } fdpParms_t;
 
+    typedef struct {
+       int flags;
+    } gvlayout_features_t;
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/gvc/gvc.c b/lib/gvc/gvc.c
index 00eee7fb4b1a5de77ebd3423b35e560925935fb2..421959d2fd2209bd720e6740aab0cb13db4ae084 100644 (file)
--- a/lib/gvc/gvc.c
+++ b/lib/gvc/gvc.c
@@ -22,6 +22,7 @@
 #include "graph.h"
 #include "const.h"
 #include "gvplugin.h"
+#include "gvcjob.h"
 #include "gvcint.h"
 #include "gvcproc.h"
 

diff --git a/lib/gvc/gvcint.h b/lib/gvc/gvcint.h
index 5a44a1f24ee8cdc5d83d521cfb7cef48ce5efefa..ae251fd8bbb58f563a390053686801b44ab53899 100644 (file)
--- a/lib/gvc/gvcint.h
+++ b/lib/gvc/gvcint.h
@@ -23,13 +23,8 @@
 extern "C" {
 #endif
 
-#include "gvcjob.h"
 #include "gvcommon.h"
 
-    typedef struct {
-       int flags;
-    } gvlayout_features_t;
-
     /* active plugin headers */
     typedef struct gvplugin_active_layout_s {
         gvlayout_engine_t *engine;
@@ -104,10 +99,7 @@ extern "C" {
        GVJ_t *job;     /* current job */
 
        int emit_state; /* current emit_state */
-       graph_t *g;     /* current graph */
-       graph_t *sg;    /* current subgraph/cluster */
-       node_t *n;      /* current node */
-       edge_t *e;      /* current edge */
+       graph_t *g;      /* current graph */
 
        /* gvrender_begin_job() */
        gvplugin_active_textlayout_t textlayout;

diff --git a/lib/gvc/gvcjob.h b/lib/gvc/gvcjob.h
index 2f565d8cf789c6d09c0cbeb0f61fb7e64247ace1..766722d2dad5861d06fbc80466763ec3ac0ffa3c 100644 (file)
--- a/lib/gvc/gvcjob.h
+++ b/lib/gvc/gvcjob.h
@@ -23,10 +23,6 @@
 extern "C" {
 #endif
 
-#include <stdio.h>
-#include "geom.h"
-#include "color.h"
-#include "gvcext.h"
 #include "gvcommon.h"
 
 #define ARRAY_SIZE(A) (sizeof(A)/sizeof(A[0]))
@@ -126,6 +122,10 @@ extern "C" {
        GVJ_t *next_active;     /* linked list of active jobs (e.g. multiple windows) */
 
        GVCOMMON_t *common;
+       graph_t *g;             /* current state */
+       graph_t *sg;
+       node_t *n;
+       edge_t *e;
 
        char *input_filename;
        int graph_index;

diff --git a/lib/gvc/gvcommon.h b/lib/gvc/gvcommon.h
index 676e41cdc58d6504a56f7a7222302d0c94605cbc..7a31703bfc5cb166e4881eb79f1b3d6d27fc6e6f 100644 (file)
--- a/lib/gvc/gvcommon.h
+++ b/lib/gvc/gvcommon.h
@@ -34,17 +34,6 @@ extern "C" {
        int viewNum;     /* current view - 1 based count of views,
                            all pages in all layers */
        char *objtype;   /* "graph", "cluster", "node", or "edge" */
-       char *graph_name;
-       char *cluster_name;
-       unsigned long cluster_id;
-       char *node_name;
-       unsigned long node_id;
-       char *edge_tailname;
-       unsigned long edge_tailid;
-       char *edge_headname;
-       unsigned long edge_headid;
-        unsigned long edge_id;
-       bool edge_directed;
 
     } GVCOMMON_t;
 

diff --git a/lib/gvc/gvconfig.c b/lib/gvc/gvconfig.c
index 0efcaea19ad81c7e8dcae161367665b44671c773..e3b79ae64e16036a0a93042e6dac4ff8e06cd7aa 100644 (file)
--- a/lib/gvc/gvconfig.c
+++ b/lib/gvc/gvconfig.c
@@ -29,12 +29,12 @@
 #endif
 
 #include        "memory.h"
-
 #include        "const.h"
 #include        "types.h"
 #include        "graph.h"
 
 #include       "gvplugin.h"
+#include       "gvcjob.h"
 #include       "gvcint.h"
 #include        "gvcproc.h"
 

diff --git a/lib/gvc/gvcontext.c b/lib/gvc/gvcontext.c
index 92887afe42dd55560599ce3eb585521bb0b7018c..b842744a8722ea422f89c0b30dbec2872fa66f4b 100644 (file)
--- a/lib/gvc/gvcontext.c
+++ b/lib/gvc/gvcontext.c
@@ -29,6 +29,7 @@
 #include       "types.h"
 #include       "graph.h"
 #include        "gvplugin.h"
+#include        "gvcjob.h"
 #include        "gvcint.h"
 #include        "gvcproc.h"
 

diff --git a/lib/gvc/gvdevice.c b/lib/gvc/gvdevice.c
index 5c9880a99045d49d84cb76f471cecc1c7fec8d77..329de0248773caa9e6f4e84d2ef8ba7d09783255 100644 (file)
--- a/lib/gvc/gvdevice.c
+++ b/lib/gvc/gvdevice.c
@@ -27,7 +27,6 @@
 #include <string.h>
 
 #include "const.h"
-#include "types.h"
 #include "gvplugin_device.h"
 #include "gvcint.h"
 #include "gvcproc.h"

diff --git a/lib/gvc/gvevent.c b/lib/gvc/gvevent.c
index 5e54acfacc9c07e8d3dbcf31bb5762a9bcb3b744..6594728d1f80c3bdf8227760185f2b647afc3165 100644 (file)
--- a/lib/gvc/gvevent.c
+++ b/lib/gvc/gvevent.c
@@ -18,11 +18,9 @@
 #include "config.h"
 #endif
 
-#include "gvplugin.h"
-#include "types.h"
+#include "gvplugin_layout.h"
 #include "graph.h"
 #include "gvcint.h"
-#include "gvplugin_layout.h"
 #include "gvcproc.h"
 
 #include <string.h>

diff --git a/lib/gvc/gvjobs.c b/lib/gvc/gvjobs.c
index 1824ae3746ccd9e17e1ef77629941640a35b8905..e0f872fdcf6f6596d862533231b18b7d273de6c1 100644 (file)
--- a/lib/gvc/gvjobs.c
+++ b/lib/gvc/gvjobs.c
@@ -21,6 +21,7 @@
 #include       "memory.h"
 #include       "types.h"
 #include        "gvplugin.h"
+#include        "gvcjob.h"
 #include        "gvcint.h"
 #include        "gvcproc.h"
 

diff --git a/lib/gvc/gvlayout.c b/lib/gvc/gvlayout.c
index c0830978ba2aeb805a78644fab5c5c32a4ed7d86..5e523cd97083ff00e70d1ab159b2601d8d534bd6 100644 (file)
--- a/lib/gvc/gvlayout.c
+++ b/lib/gvc/gvlayout.c
@@ -24,9 +24,9 @@
 #endif
 
 #include "const.h"
-#include "types.h"
-#include "graph.h"
 #include "gvplugin_layout.h"
+#include "graph.h"
+#include "gvcint.h"
 #include "gvcproc.h"
 
 extern void graph_init(graph_t *g, bool use_rankdir);

diff --git a/lib/gvc/gvplugin.c b/lib/gvc/gvplugin.c
index b784532bc5e2d32b55abfa92ac81ebb33704ebdd..ff53123811a727f002e57f0d47594bbc3b7650f9 100644 (file)
--- a/lib/gvc/gvplugin.c
+++ b/lib/gvc/gvplugin.c
@@ -27,6 +27,7 @@
 #include        "types.h"
 #include        "graph.h"
 #include        "gvplugin.h"
+#include        "gvcjob.h"
 #include        "gvcint.h"
 #include        "gvcproc.h"
 

diff --git a/lib/gvc/gvplugin_device.h b/lib/gvc/gvplugin_device.h
index a073ed0c7700e9ae868d87d81c9bc0a12481be65..d032d9ac5c5d1b5fd2ea403714aa02c50e4da5ec 100644 (file)
--- a/lib/gvc/gvplugin_device.h
+++ b/lib/gvc/gvplugin_device.h
@@ -17,6 +17,7 @@
 #ifndef GVDEVICE_PLUGIN_H
 #define GVDEVICE_PLUGIN_H
 
+#include "types.h"
 #include "gvplugin.h"
 #include "gvcjob.h"
 

diff --git a/lib/gvc/no_builtins.c b/lib/gvc/no_builtins.c
index 886a0736ba7c15b48664b81eb903756f72cdbe86..ee422b98ca929caa948475f5f77a32e41b7f6031 100644 (file)
--- a/lib/gvc/no_builtins.c
+++ b/lib/gvc/no_builtins.c
@@ -18,6 +18,6 @@
 #include "config.h"
 #endif
 
-#include "gvplugin.h"
+#include "gvcext.h"
 
 const lt_symlist_t lt_preloaded_symbols[] = { { 0, 0 } };