fix mechanism for specifying builtins

diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index f1db7fa03eabed674bf8023b7cd6157cbc8cb009..731b302a245004cc4d3cc57f51bb7760703847dd 100644 (file)
--- 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 24c32b01fae816fed93c94a11268e22c0673c415..bd9d0ec0b311a32435a5e201f1df42eb09a46c4e 100644 (file)
--- 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 00c3836e24aaee5fba720ada6fc322f8c9868398..d67775a47da1b6979cb83f904e7a54d04a555ac0 100644 (file)
--- 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