From dee78e6f32b1fa4310de0c7ac5c72d7968491150 Mon Sep 17 00:00:00 2001 From: Emden Gansner Date: Fri, 7 Oct 2011 14:48:09 -0400 Subject: [PATCH] Use ordinary dotgen even with cgraph --- plugin/dot_layout/Makefile.am | 2 +- plugin/dot_layout/gvlayout_dot_layout.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugin/dot_layout/Makefile.am b/plugin/dot_layout/Makefile.am index ef843fb52..6def5985f 100644 --- a/plugin/dot_layout/Makefile.am +++ b/plugin/dot_layout/Makefile.am @@ -29,7 +29,7 @@ libgvplugin_dot_layout_C_la_SOURCES = \ gvlayout_dot_layout.c if WITH_CGRAPH libgvplugin_dot_layout_C_la_LIBADD = \ - $(top_builddir)/lib/dotgen2/libdotgen2_C.la + $(top_builddir)/lib/dotgen/libdotgen_C.la else libgvplugin_dot_layout_C_la_LIBADD = \ $(top_builddir)/lib/dotgen/libdotgen_C.la diff --git a/plugin/dot_layout/gvlayout_dot_layout.c b/plugin/dot_layout/gvlayout_dot_layout.c index 368b48ad0..2e57cbee4 100644 --- a/plugin/dot_layout/gvlayout_dot_layout.c +++ b/plugin/dot_layout/gvlayout_dot_layout.c @@ -32,12 +32,12 @@ typedef enum { LAYOUT_DOT, } layout_type; #ifdef WITH_CGRAPH #pragma comment( lib, "cgraph.lib" ) #pragma comment( lib, "dotgen2.lib" ) - extern void dot2_layout(graph_t * g); - extern void dot2_cleanup(graph_t * g); + extern void dot_layout(graph_t * g); + extern void dot_cleanup(graph_t * g); gvlayout_engine_t dotgen_engine = { - dot2_layout, - dot2_cleanup, + dot_layout, + dot_cleanup, }; -- 2.40.0