disambiguate tclpkg/gv #includes

Related to #1242 and #1785.

diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index f4aef4fce657a52afb0fc679414a083e208d584f..6a1c52f1d782c8f9d2ff5998fc37c7fc57d372c5 100644 (file)
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -6,6 +6,7 @@ SUBDIRS = demo
 pdfdir = $(pkgdatadir)/doc/pdf
 
 AM_CPPFLAGS = \
+       -I$(top_srcdir)/lib \
        -I$(top_srcdir)/lib/gvc \
        -I$(top_srcdir)/lib/common \
        -I$(top_srcdir)/lib/cgraph \
@@ -68,10 +69,10 @@ gvgotest: gv.i gvgotest.go gv.go runtime.h
        ( \
        eval $(go env); \
        mkdir -p go/src/gv; \
-       $(SED) -e 's/#include "gvc.h"/#include <graphviz\/gvc.h>/' <$(srcdir)/gv.i >go/src/gv/gv.swigcxx; \
-       $(SED) -e 's/#include <gvc.h>/#include <graphviz\/gvc.h>/' <$(srcdir)/gv_dummy_init.c >go/src/gv/gv_dummy_init.c; \
-       $(SED) -e 's/#include "gvplugin.h"/#include <graphviz\/gvplugin.h>/' <$(srcdir)/gv_builtins.c >go/src/gv/gv_builtins.c; \
-       $(SED) -e 's/#include "gvc.h"/#include <graphviz\/gvc.h>/' -e 's/DEMAND_LOADING/1/' <$(srcdir)/gv.cpp >go/src/gv/gv.cpp; \
+       $(SED) -e 's/#include <gvc\/gvc.h>/#include <graphviz\/gvc.h>/' <$(srcdir)/gv.i >go/src/gv/gv.swigcxx; \
+       $(SED) -e 's/#include <gvc\/gvc.h>/#include <graphviz\/gvc.h>/' <$(srcdir)/gv_dummy_init.c >go/src/gv/gv_dummy_init.c; \
+       $(SED) -e 's/#include <gvc\/gvplugin.h>/#include <graphviz\/gvplugin.h>/' <$(srcdir)/gv_builtins.c >go/src/gv/gv_builtins.c; \
+       $(SED) -e 's/#include <gvc\/gvc.h>/#include <graphviz\/gvc.h>/' -e 's/DEMAND_LOADING/1/' <$(srcdir)/gv.cpp >go/src/gv/gv.cpp; \
        cat gv.go >go/src/gv/gv.go; \
        cat $(srcdir)/gvgotest.go >go/src/gvgotest.go; \
        cd go/src; \

diff --git a/tclpkg/gv/gv.cpp b/tclpkg/gv/gv.cpp
index 1136b212423bf6473c8de36e35dc69e2b29dbffc..5d7a252f7587721a56def5b14e688c8e3bf11d74 100644 (file)
--- a/tclpkg/gv/gv.cpp
+++ b/tclpkg/gv/gv.cpp
@@ -13,7 +13,7 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include "gvc.h"
+#include <gvc/gvc.h>
 
 extern "C" {
 extern void gv_string_writer_init(GVC_t *gvc);

diff --git a/tclpkg/gv/gv.i b/tclpkg/gv/gv.i
index eaad15a0544ee611251e34d031882fac982af568..d324fd4d3f2d6bc9250f6b0c11b2690f230e2135 100644 (file)
--- a/tclpkg/gv/gv.i
+++ b/tclpkg/gv/gv.i
@@ -61,7 +61,7 @@
 #endif
 
 #include "config.h"
-#include "gvc.h"
+#include <gvc/gvc.h>
 
 /** New graphs */
 /*** New empty graph */

diff --git a/tclpkg/gv/gv_builtins.c b/tclpkg/gv/gv_builtins.c
index 20500934520e46cd8055fdf4b6987986e4d530b6..eeb5110a28df732243f527a35c800e4466f70e7e 100644 (file)
--- a/tclpkg/gv/gv_builtins.c
+++ b/tclpkg/gv/gv_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/gv/gv_dummy_init.c b/tclpkg/gv/gv_dummy_init.c
index dfdf2b986b024597e53ffc5929376e81839b2d1a..d213ab86d5c6ec3997f40b3b16ae3962deaf3f60 100644 (file)
--- a/tclpkg/gv/gv_dummy_init.c
+++ b/tclpkg/gv/gv_dummy_init.c
@@ -1,4 +1,4 @@
-#include <gvc.h>
+#include <gvc/gvc.h>
 
 void gv_string_writer_init (GVC_t *gvc) {}
 void gv_channel_writer_init (GVC_t *gvc) {}

diff --git a/tclpkg/gv/gv_java_init.c b/tclpkg/gv/gv_java_init.c
index 45d4783b2a82fd62621580a1fe2c82469e5aa1c1..a7f96cefb4f889b1f534cc94e7b2a49f990bef58 100644 (file)
--- a/tclpkg/gv/gv_java_init.c
+++ b/tclpkg/gv/gv_java_init.c
@@ -13,10 +13,10 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "gvc.h"
-#include "gvplugin.h"
-#include "gvcjob.h"
-#include "gvcint.h"
+#include <gvc/gvc.h>
+#include <gvc/gvplugin.h>
+#include <gvc/gvcjob.h>
+#include <gvc/gvcint.h>
 
 typedef struct {
     char* data;

diff --git a/tclpkg/gv/gv_php_init.c b/tclpkg/gv/gv_php_init.c
index 57503cfc7d385a9f663c8f7756299abf473ed9b1..7f17c38743f990876e6e66eb9994bd9e98fa8fa6 100644 (file)
--- a/tclpkg/gv/gv_php_init.c
+++ b/tclpkg/gv/gv_php_init.c
@@ -18,10 +18,10 @@
 #undef PACKAGE_TARNAME
 #undef PACKAGE_VERSION
 
-#include "gvc.h"
-#include "gvplugin.h"
-#include "gvcjob.h"
-#include "gvcint.h"
+#include <gvc/gvc.h>
+#include <gvc/gvplugin.h>
+#include <gvc/gvcjob.h>
+#include <gvc/gvcint.h>
 
 static size_t gv_string_writer (GVJ_t *job, const char *s, size_t len)
 {

diff --git a/tclpkg/gv/gv_tcl_init.c b/tclpkg/gv/gv_tcl_init.c
index 9940540a5b6de7bc779a77e741448a07abbe7ab9..e3a4e4203da6e08bf8fc686ae49db58c6b7d545b 100644 (file)
--- a/tclpkg/gv/gv_tcl_init.c
+++ b/tclpkg/gv/gv_tcl_init.c
@@ -12,10 +12,10 @@
  *************************************************************************/
 
 #include <tcl.h>
-#include "gvc.h"
-#include "gvplugin.h"
-#include "gvcjob.h"
-#include "gvcint.h"
+#include <gvc/gvc.h>
+#include <gvc/gvplugin.h>
+#include <gvc/gvcjob.h>
+#include <gvc/gvcint.h>
 
 static size_t gv_string_writer(GVJ_t *job, const char *s, size_t len)
 {