From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Thu, 3 Sep 2020 02:46:29 +0000 (-0700)
Subject: disambiguate tclpkg/gv #includes
X-Git-Tag: 2.46.0~20^2^2~63^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9cba4b55be1abb3cc934aff16bba6f4965493c15;p=graphviz

disambiguate tclpkg/gv #includes

Related to #1242 and #1785.
---

diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index f4aef4fce..6a1c52f1d 100644
--- 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 1136b2124..5d7a252f7 100644
--- 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 eaad15a05..d324fd4d3 100644
--- 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 205009345..eeb5110a2 100644
--- 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 dfdf2b986..d213ab86d 100644
--- 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 45d4783b2..a7f96cefb 100644
--- 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 57503cfc7..7f17c3874 100644
--- 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 9940540a5..e3a4e4203 100644
--- 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)
 {