changes for --with-cgraph

diff --git a/lib/Makefile.am b/lib/Makefile.am
index fdb9338a6e3720034108d9746d1a92596ac5c1af..dd4ac6c969668ea0f4923fa7b9ccf6f3b326a972 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -7,7 +7,7 @@ CGRAPH_DIRS = circogen_cgraph common_cgraph dotgen_cgraph \
        fdpgen_cgraph neatogen_cgraph twopigen_cgraph
 
 SUBDIRS = cdt graph cgraph gd pathplan sfio vmalloc ast vpsc \
-       rbtree sparse sfdpgen patchwork inkpot expr gvc xdot \
-       pack ingraphs topfish glcomp $(GRAPH_DIRS) $(CGRAPH_DIRS)
+       rbtree sparse sfdpgen patchwork inkpot expr pack gvc \
+       xdot ingraphs topfish glcomp $(GRAPH_DIRS) $(CGRAPH_DIRS)
 
 EXTRA_DIST = Makefile.old

diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am
index 24acaafddd2c6cae3244d7a3f0d0477fa4e72919..76df7f4756b801550e23b1d133722fe8f78e558b 100644 (file)
--- a/lib/common/Makefile.am
+++ b/lib/common/Makefile.am
@@ -1,24 +1,35 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
+if WITH_CGRAPH
+GRAPH = cgraph
+FDPGEN = fdpgen_cgraph
+else
+GRAPH = graph
+FDPGEN = cgraph
+endif
+
 AM_CPPFLAGS = \
         -I$(top_srcdir) \
        -I$(top_srcdir)/lib/gvc \
        -I$(top_srcdir)/lib/pack \
-       -I$(top_srcdir)/lib/fdpgen \
+       -I$(top_srcdir)/lib/$(FDPGEN) \
        -I$(top_srcdir)/lib/pathplan \
-       -I$(top_srcdir)/lib/graph \
-       -I$(top_srcdir)/lib/cdt @GD_INCLUDES@ @EXPAT_INCLUDES@ @Z_INCLUDES@
+       -I$(top_srcdir)/lib/$(GRAPH) \
+       -I$(top_srcdir)/lib/cdt $(GD_INCLUDES) $(EXPAT_INCLUDES) $(Z_INCLUDES)
 
 if WITH_WIN32
 AM_CFLAGS = -D_BLD_common=1
 endif
 
+if WITH_CGRAPH
+else
 pkginclude_HEADERS = arith.h geom.h color.h types.h textpara.h usershape.h
 noinst_HEADERS = render.h utils.h memory.h \
        geomprocs.h colorprocs.h colortbl.h entities.h globals.h \
        logic.h const.h macros.h htmllex.h htmltable.h pointset.h
 noinst_LTLIBRARIES = libcommon_C.la
+endif
 
 if WITH_CODEGENS
 CODEGENS = $(GD_CODEGENS) diagen.c hpglgen.c mifgen.c mpgen.c picgen.c vtxgen.c

diff --git a/lib/common/render.h b/lib/common/render.h
index 39b027c6cb2f606af5ba2f0cb0ceae50e2ae1d7e..c9ab524a8f2f40d007b9fb26a552b80a50e246f8 100644 (file)
--- a/lib/common/render.h
+++ b/lib/common/render.h
@@ -49,7 +49,6 @@ extern "C" {
 #include "colorprocs.h"                /* must collow color.h (in types.h) */
 #include "geomprocs.h"         /* must follow geom.h (in types.h) */
 #include "agxbuf.h"
-#include "graph.h"             /* must follow types.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) */

diff --git a/lib/common/types.h b/lib/common/types.h
index 0c7fcbf58e2283423537df28ed5f726353d6c25b..aa3dca4cb93e3d99ac94de19cb863c4fcb11e96d 100644 (file)
--- a/lib/common/types.h
+++ b/lib/common/types.h
@@ -587,7 +587,11 @@ typedef enum {NATIVEFONTS,PSFONTS,SVGFONTS} fontname_kind;
 #define ED_weight(e) (e)->u.weight
 #define ED_xpenalty(e) (e)->u.xpenalty
 
-#include <graph.h>
+#if WITH_CGRAPH
+#include "cgraph.h"
+#else
+#include "graph.h"
+#endif
 
     typedef struct {
         int useGrid;            /* use grid for speed up */

diff --git a/lib/gvc/gvc.c b/lib/gvc/gvc.c
index 8c5cb788d53c1e032119ea829cb425244c94dc68..ee897a73433b2b738c29a9ec9b5bb2a94b8ba919 100644 (file)
--- a/lib/gvc/gvc.c
+++ b/lib/gvc/gvc.c
@@ -20,7 +20,6 @@
 
 #include "builddate.h"
 #include "types.h"
-#include "graph.h"
 #include "const.h"
 #include "gvplugin.h"
 #include "gvcjob.h"

diff --git a/lib/gvc/gvc.h b/lib/gvc/gvc.h
index 194cfe65066d8c3189d6e293d8703fd535f854c3..6cc66543534b2d5f512c7c6ba9aa7620daa60d6f 100644 (file)
--- a/lib/gvc/gvc.h
+++ b/lib/gvc/gvc.h
@@ -18,7 +18,6 @@
 #define                        GVC_H
 
 #include "types.h"
-#include "graph.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lib/gvc/gvconfig.c b/lib/gvc/gvconfig.c
index 73ffdbe17bbc669f966b8f01676180fe95d6a125..67fb80914ab5747562850101825f08f01daab77f 100644 (file)
--- a/lib/gvc/gvconfig.c
+++ b/lib/gvc/gvconfig.c
@@ -52,7 +52,6 @@ static int glob (char*, int, int (*errfunc)(const char *, int), glob_t*);
 #include        "memory.h"
 #include        "const.h"
 #include        "types.h"
-#include        "graph.h"
 
 #include       "gvplugin.h"
 #include       "gvcjob.h"

diff --git a/lib/gvc/gvcontext.c b/lib/gvc/gvcontext.c
index 132a864f3dccf6cdaa0caeade930d067e6bbf07e..255bc360ae750e21918cf58a21a9247a53446d57 100644 (file)
--- a/lib/gvc/gvcontext.c
+++ b/lib/gvc/gvcontext.c
@@ -27,7 +27,6 @@
 #endif
 
 #include       "types.h"
-#include       "graph.h"
 #include        "gvplugin.h"
 #include        "gvcjob.h"
 #include        "gvcint.h"

diff --git a/lib/gvc/gvevent.c b/lib/gvc/gvevent.c
index 76ff5e273a69bf9d8b633bb1774e605e5d5d9559..bfd7150e0cb0ddfd67b5e606a501d6c31f267af7 100644 (file)
--- a/lib/gvc/gvevent.c
+++ b/lib/gvc/gvevent.c
@@ -21,7 +21,6 @@
 #include <string.h>
 
 #include "gvplugin_layout.h"
-#include "graph.h"
 #include "gvcint.h"
 #include "gvcproc.h"
 

diff --git a/lib/gvc/gvlayout.c b/lib/gvc/gvlayout.c
index 87729909c56d62d8e5fc4206b66f048d6f3b929c..b1f09cbd7c2ea633b8ffef30e1a8d4803ce5731d 100644 (file)
--- a/lib/gvc/gvlayout.c
+++ b/lib/gvc/gvlayout.c
@@ -26,7 +26,11 @@
 #include "const.h"
 #include "gvplugin_layout.h"
 #include "gvcint.h"
+#if WITH_CGRAPH
+#include "cgraph.h"
+#else
 #include "graph.h"
+#endif
 #include "gvcproc.h"
 
 extern void graph_init(graph_t *g, boolean use_rankdir);