From a92789e4aac2537c0010a4ef77d7d344a06b84c6 Mon Sep 17 00:00:00 2001 From: ellson Date: Tue, 25 Jan 2005 18:13:56 +0000 Subject: [PATCH] make tcldot work again --- tclpkg/tcldot/Makefile.am | 21 ++++++++++++++------ tclpkg/tcldot/plugins.c | 40 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 6 deletions(-) create mode 100644 tclpkg/tcldot/plugins.c diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am index bb47b1b89..331529f8f 100644 --- a/tclpkg/tcldot/Makefile.am +++ b/tclpkg/tcldot/Makefile.am @@ -35,17 +35,26 @@ pdf_DATA = $(pdf) html_DATA = $(html) endif -libtcldot_la_SOURCES = tcldot.c tkgen.c $(top_srcdir)/tclpkg/gdtclft/gdtclft.c +libtcldot_la_SOURCES = tcldot.c tkgen.c plugins.c $(top_srcdir)/tclpkg/gdtclft/gdtclft.c +if DISABLE_GVRENDER libtcldot_la_LIBADD = \ $(top_builddir)/tclpkg/tclhandle/libtclhandle.la \ $(top_builddir)/tclpkg/tclstubs/libtclstubs.la \ + $(top_builddir)/lib/common/libcommon.la \ $(top_builddir)/lib/gvc/libgvc.la \ - $(top_builddir)/lib/dotgen/libdotgen.la \ - $(top_builddir)/lib/neatogen/libneatogen.la \ - $(top_builddir)/lib/twopigen/libtwopigen.la \ - $(top_builddir)/lib/fdpgen/libfdpgen.la \ - $(top_builddir)/lib/circogen/libcircogen.la + $(top_builddir)/plugin/layout/libgvplugin_layout.la @LIBGEN_LIBS@ +else +libtcldot_la_LIBADD = \ + $(top_builddir)/tclpkg/tclhandle/libtclhandle.la \ + $(top_builddir)/tclpkg/tclstubs/libtclstubs.la \ + $(top_builddir)/lib/common/libcommon.la \ + $(top_builddir)/lib/gvc/libgvc.la \ + $(top_builddir)/plugin/cairo/libgvplugin_cairo.la \ + $(top_builddir)/plugin/gd/libgvplugin_gd.la \ + $(top_builddir)/plugin/text/libgvplugin_text.la \ + $(top_builddir)/plugin/layout/libgvplugin_layout.la @CAIRO_LIBS@ @LIBGEN_LIBS@ +endif if WITH_TCL all-local: pkgIndex.tcl diff --git a/tclpkg/tcldot/plugins.c b/tclpkg/tcldot/plugins.c new file mode 100644 index 000000000..035e34651 --- /dev/null +++ b/tclpkg/tcldot/plugins.c @@ -0,0 +1,40 @@ +/* $Id$ $Revision$ */ +/* vim:set shiftwidth=4 ts=8: */ + +/********************************************************** +* This software is part of the graphviz package * +* http://www.graphviz.org/ * +* * +* Copyright (c) 1994-2004 AT&T Corp. * +* and is licensed under the * +* Common Public License, Version 1.0 * +* by AT&T Corp. * +* * +* Information and Software Systems Research * +* AT&T Research, Florham Park NJ * +**********************************************************/ + +#include + +#include "config.h" +#include "types.h" +#include "macros.h" +#include "gvc.h" + +#ifndef DISABLE_GVRENDER +extern gvplugin_t gvplugin_cairo_LTX_plugin, + gvplugin_gd_LTX_plugin, + gvplugin_text_LTX_plugin; +#endif +extern gvplugin_t gvplugin_layout_LTX_plugin; + +gvplugin_t *builtins[] = { +#ifndef DISABLE_GVRENDER + &gvplugin_cairo_LTX_plugin, + &gvplugin_gd_LTX_plugin, + &gvplugin_text_LTX_plugin, +#endif + &gvplugin_layout_LTX_plugin, + NULL +}; + -- 2.40.0