changes for --with-cgraph

diff --git a/lib/gvc/gvplugin.c b/lib/gvc/gvplugin.c
index 90b2b4d4668a8fbe96b305b05a7def4635b27da7..f91d1759e5dc5374fb5994a50380ae8849e5ff5f 100644 (file)
--- a/lib/gvc/gvplugin.c
+++ b/lib/gvc/gvplugin.c
@@ -25,7 +25,6 @@
 
 #include        "memory.h"
 #include        "types.h"
-#include        "graph.h"
 #include        "gvplugin.h"
 #include        "gvcjob.h"
 #include        "gvcint.h"

diff --git a/lib/gvc/gvrender.c b/lib/gvc/gvrender.c
index 7d3b4bf8a14c88f6c5a46c027e936695b66d9fe6..c9a127df1f03081c8345c7ae35befc68d1afbb1e 100644 (file)
--- a/lib/gvc/gvrender.c
+++ b/lib/gvc/gvrender.c
@@ -30,7 +30,11 @@
 #include "macros.h"
 #include "colorprocs.h"
 #include "gvplugin_render.h"
+#if WITH_CGRAPH
+#include "cgraph.h"
+#else
 #include "graph.h"
+#endif
 #include "gvcint.h"
 #include "geom.h"
 #include "geomprocs.h"

diff --git a/lib/gvc/gvusershape.c b/lib/gvc/gvusershape.c
index bbac103626afaad115dce9c605952e50c8d89e5d..8cd17c124e039718fac1d01a538d0838157777e9 100644 (file)
--- a/lib/gvc/gvusershape.c
+++ b/lib/gvc/gvusershape.c
@@ -25,7 +25,6 @@
 #include "types.h"
 #include "logic.h"
 #include "memory.h"
-#include "graph.h"
 #include "agxbuf.h"
 #include "utils.h"
 

diff --git a/lib/pack/Makefile.am b/lib/pack/Makefile.am
index caa7c772e7c96676bab7e1a82e949e3465334c4a..c2300ce23b5036887160843d6f803662550c57d3 100644 (file)
--- a/lib/pack/Makefile.am
+++ b/lib/pack/Makefile.am
@@ -6,14 +6,18 @@ pdfdir = $(pkgdatadir)/doc/pdf
 
 if WITH_CGRAPH
 GRAPH = cgraph
+COMMON = common_cgraph
+NEATOGEN = neatogen_cgraph
 else
 GRAPH = graph
+COMMON = cgraph
+NEATOGEN = neatogen
 endif
 
 AM_CPPFLAGS = -I$(top_srcdir) \
-        -I$(top_srcdir)/lib/common \
+        -I$(top_srcdir)/lib/$(COMMON) \
        -I$(top_srcdir)/lib/gvc \
-       -I$(top_srcdir)/lib/neatogen \
+       -I$(top_srcdir)/lib/$(NEATOGEN) \
        -I$(top_srcdir)/lib/pathplan \
        -I$(top_srcdir)/lib/$(GRAPH) \
        -I$(top_srcdir)/lib/cdt

diff --git a/lib/pack/ccomps.c b/lib/pack/ccomps.c
index d4b55be8e45235046a4c9e9685e38d416ca8f04d..2e3ee5f880a14439c885ed812a06b92b21c4be1b 100644 (file)
--- a/lib/pack/ccomps.c
+++ b/lib/pack/ccomps.c
@@ -15,9 +15,9 @@
 **********************************************************/
 
 
-#include <render.h>
-#include <pack.h>
 #include <ctype.h>
+#include "render.h"
+#include "pack.h"
 
 #define MARKED(n) ((n)->u.mark)
 #define MARK(n) ((n)->u.mark = 1)

diff --git a/lib/pack/pack.h b/lib/pack/pack.h
index a32017dd3fecfb49e4f4d8b743fd68f7d49dc1a6..10fd7d468a6dd59dc45341fb9606a05ab4f8ff5d 100644 (file)
--- a/lib/pack/pack.h
+++ b/lib/pack/pack.h
@@ -24,7 +24,6 @@ extern "C" {
 #endif
 
 #include "types.h"
-#include "graph.h"
 
 /* Type indicating granularity and method 
  *  l_undef  - unspecified

diff --git a/lib/patchwork/Makefile.am b/lib/patchwork/Makefile.am
index c883cd85266e45e7d8e904d5f1c4397a4710e545..40b7597a0855ef3fc72a58f99bc37b515f9e3d53 100644 (file)
--- a/lib/patchwork/Makefile.am
+++ b/lib/patchwork/Makefile.am
@@ -1,18 +1,34 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
+if WITH_CGRAPH
+GRAPH = cgraph
+COMMON = common_cgraph
+NEATOGEN = neatogen_cgraph
+FDPGEN = fdpgen_cgraph
+else
+GRAPH = graph
+COMMON = common
+NEATOGEN = neatogen
+FDPGEN = fdpgen
+endif
+
 AM_CPPFLAGS = \
         -I$(top_srcdir) \
-        -I$(top_srcdir)/lib/common \
+        -I$(top_srcdir)/lib/$(COMMON) \
        -I$(top_srcdir)/lib/gvc \
-       -I$(top_srcdir)/lib/neatogen \
+       -I$(top_srcdir)/lib/$(NEATOGEN) \
+       -I$(top_srcdir)/lib/$(FDPGEN) \
        -I$(top_srcdir)/lib/pack \
        -I$(top_srcdir)/lib/pathplan \
-       -I$(top_srcdir)/lib/graph \
+       -I$(top_srcdir)/lib/$(GRAPH) \
        -I$(top_srcdir)/lib/cdt
 
+if WITH_CGRAPH
+else
 noinst_HEADERS = patchwork.h
 noinst_LTLIBRARIES = libpatchwork_C.la
+endif
 
 libpatchwork_C_la_SOURCES = patchwork.c patchworkinit.c
 

diff --git a/lib/patchwork/patchwork.h b/lib/patchwork/patchwork.h
index a65498fb9a559303b739b8dd82d0ed6222439493..9d08d1608e14e621f81df9720d9895ebad0ca812 100644 (file)
--- a/lib/patchwork/patchwork.h
+++ b/lib/patchwork/patchwork.h
@@ -17,7 +17,7 @@
 #define PATCHWORK_H
 
 #include "render.h"
-#include "../fdpgen/fdp.h"
+#include "fdp.h"
 
 #ifdef __cplusplus
 extern "C" {