disambiguate tclpkg/tcldot #includes

Related to #1242 and #1785.

diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index dd1f1bc0828fe29898c168f6b396c682cf11a07e..46eb8889eb43fe6cb76ae5357f9f82714b69dec2 100644 (file)
--- a/tclpkg/tcldot/Makefile.am
+++ b/tclpkg/tcldot/Makefile.am
@@ -16,6 +16,7 @@ htmldir = $(pkgdatadir)/doc/html
 pkgtcldir = $(pkglibdir)/tcl
 
 AM_CPPFLAGS = \
+       -I$(top_srcdir)/lib \
        -I$(top_srcdir)/lib/gvc \
        -I$(top_srcdir)/lib/common \
        -I$(top_srcdir)/lib/cgraph \

diff --git a/tclpkg/tcldot/no_builtins.c b/tclpkg/tcldot/no_builtins.c
index 20500934520e46cd8055fdf4b6987986e4d530b6..eeb5110a28df732243f527a35c800e4466f70e7e 100644 (file)
--- a/tclpkg/tcldot/no_builtins.c
+++ b/tclpkg/tcldot/no_builtins.c
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "gvplugin.h"
+#include <gvc/gvplugin.h>
 
 lt_symlist_t lt_preloaded_symbols[] = { { 0, 0 } };
 

diff --git a/tclpkg/tcldot/tcldot-util.c b/tclpkg/tcldot/tcldot-util.c
index 979823466192a9a894b3105e10eb05408c7fb965..50db79e607843a1e57807dde6d86dd22cb0c28d1 100644 (file)
--- a/tclpkg/tcldot/tcldot-util.c
+++ b/tclpkg/tcldot/tcldot-util.c
@@ -13,7 +13,7 @@
 
 
 #include "tcldot.h"
-#include "strcasecmp.h"
+#include <cgraph/strcasecmp.h>
 
 size_t Tcldot_string_writer(GVJ_t *job, const char *s, size_t len)
 {

diff --git a/tclpkg/tcldot/tcldot.h b/tclpkg/tcldot/tcldot.h
index c6a46dca6ecb4869597ea8173dee5e4fcb488bb8..a98f25a62bac8ddd727daad750e486cb80e651b1 100644 (file)
--- a/tclpkg/tcldot/tcldot.h
+++ b/tclpkg/tcldot/tcldot.h
@@ -16,9 +16,9 @@
 /*    specifically just the change to Tcl_CmdProc */
 #define USE_NON_CONST
 #include <tcl.h>
-#include "render.h"
-#include "gvc.h"
-#include "gvio.h"
+#include <common/render.h>
+#include <gvc/gvc.h>
+#include <gvc/gvio.h>
 #include "tclhandle.h"
 
 #ifndef CONST84

diff --git a/tclpkg/tcldot/tcldot_builtins.c b/tclpkg/tcldot/tcldot_builtins.c
index 8250bd39243733df6e2b2f1da79ba0e3247248e7..a0a80adfffea6ad2b3a81267d2da21583b0b142a 100644 (file)
--- a/tclpkg/tcldot/tcldot_builtins.c
+++ b/tclpkg/tcldot/tcldot_builtins.c
@@ -13,7 +13,7 @@
 
 #include "config.h"
 
-#include "gvplugin.h"
+#include <gvc/gvplugin.h>
 
 #if defined(GVDLL) && !defined(ENABLE_LTDL)
 #define extern __declspec(dllimport)