From c89d26f788fd8c86fdf6da1d2bd9d929b6201e37 Mon Sep 17 00:00:00 2001 From: ellson Date: Tue, 14 Oct 2008 17:27:45 +0000 Subject: [PATCH] changes for --with-cgraph --- lib/gvc/gvplugin.c | 1 - lib/gvc/gvrender.c | 4 ++++ lib/gvc/gvusershape.c | 1 - lib/pack/Makefile.am | 8 ++++++-- lib/pack/ccomps.c | 4 ++-- lib/pack/pack.h | 1 - lib/patchwork/Makefile.am | 22 +++++++++++++++++++--- lib/patchwork/patchwork.h | 2 +- 8 files changed, 32 insertions(+), 11 deletions(-) diff --git a/lib/gvc/gvplugin.c b/lib/gvc/gvplugin.c index 90b2b4d46..f91d1759e 100644 --- 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 7d3b4bf8a..c9a127df1 100644 --- 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 bbac10362..8cd17c124 100644 --- 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 caa7c772e..c2300ce23 100644 --- 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 d4b55be8e..2e3ee5f88 100644 --- a/lib/pack/ccomps.c +++ b/lib/pack/ccomps.c @@ -15,9 +15,9 @@ **********************************************************/ -#include -#include #include +#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 a32017dd3..10fd7d468 100644 --- 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 c883cd852..40b7597a0 100644 --- 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 a65498fb9..9d08d1608 100644 --- 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" { -- 2.40.0