From: ellson <devnull@localhost>
Date: Tue, 18 Oct 2005 18:28:35 +0000 (+0000)
Subject: fix mechanism for specifying builtins
X-Git-Tag: LAST_LIBGRAPH~32^2~7314
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=561ee3e9cf5c6b5b2f158acf722d7120bd25aee7;p=graphviz

fix mechanism for specifying builtins
---

diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index f1db7fa03..731b302a2 100644
--- a/tclpkg/tcldot/Makefile.am
+++ b/tclpkg/tcldot/Makefile.am
@@ -30,14 +30,10 @@ pdf_DATA = $(pdf)
 html_DATA = $(html)
 endif
 
-libtcldot_la_SOURCES = tcldot.c tkgen.c builtins.c \
-	$(top_srcdir)/tclpkg/gdtclft/gdtclft.c
+libtcldot_la_SOURCES = tcldot.c tkgen.c $(top_srcdir)/tclpkg/gdtclft/gdtclft.c
 libtcldot_la_LIBADD = \
 	$(top_builddir)/tclpkg/tclhandle/libtclhandle.la \
 	$(top_builddir)/tclpkg/tclstubs/libtclstubs.la \
-        $(top_builddir)/lib/plugin/libgvplugin_dot_layout.la \
-        $(top_builddir)/lib/plugin/libgvplugin_neato_layout.la \
-        $(top_builddir)/lib/plugin/libgvplugin_usershape_gd.la \
 	$(top_builddir)/lib/gvc/libgvc.la @LIBGEN_LIBS@ @LIBLTDL@
 
 if WITH_TCL
diff --git a/tclpkg/tcldot/tcldot.c b/tclpkg/tcldot/tcldot.c
index 24c32b01f..bd9d0ec0b 100644
--- a/tclpkg/tcldot/tcldot.c
+++ b/tclpkg/tcldot/tcldot.c
@@ -19,6 +19,9 @@
 /*    specifically just the change to Tcl_CmdProc */
 #define USE_NON_CONST
 
+#include "gvc.h"
+#include "tcl.h"
+#include "tclhandle.h"
 #include "tcldot.h"
 
 char *Info[] = {
diff --git a/tclpkg/tcldot/tkgen.c b/tclpkg/tcldot/tkgen.c
index 00c3836e2..d67775a47 100644
--- a/tclpkg/tcldot/tkgen.c
+++ b/tclpkg/tcldot/tkgen.c
@@ -19,11 +19,13 @@
  * tkgen.c generate canvas commands to display a graph
  */
 
-#include "tcldot.h"
+/* builtins are defined in tcldot.c  - prevent duplicate */
+#define BUILTINS 
+#include "gvc.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
+#include "tcl.h"
+#include "tclhandle.h"
+#include "tcldot.h"
 
 /* font modifiers */
 #define REGULAR 0