From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 29 Aug 2020 01:54:19 +0000 (-0700)
Subject: disambiguate plugin/gdk #includes
X-Git-Tag: 2.46.0~20^2^2~69^2~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=729bc9e99906cd92697c2b49461371a1dd943198;p=graphviz

disambiguate plugin/gdk #includes

Related to #1785.
---

diff --git a/plugin/gdk/Makefile.am b/plugin/gdk/Makefile.am
index bae57303a..81629ab9a 100644
--- a/plugin/gdk/Makefile.am
+++ b/plugin/gdk/Makefile.am
@@ -2,6 +2,7 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/common \
 	-I$(top_srcdir)/lib/pathplan \
 	-I$(top_srcdir)/lib/gvc \
diff --git a/plugin/gdk/gvdevice_gdk.c b/plugin/gdk/gvdevice_gdk.c
index 45177ada1..9fb6e817f 100644
--- a/plugin/gdk/gvdevice_gdk.c
+++ b/plugin/gdk/gvdevice_gdk.c
@@ -13,8 +13,8 @@
 
 #include "config.h"
 
-#include "gvplugin_device.h"
-#include "gvio.h"
+#include <gvc/gvplugin_device.h>
+#include <gvc/gvio.h>
 #ifdef HAVE_PANGOCAIRO
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
diff --git a/plugin/gdk/gvloadimage_gdk.c b/plugin/gdk/gvloadimage_gdk.c
index 24c5e846d..b567238ca 100644
--- a/plugin/gdk/gvloadimage_gdk.c
+++ b/plugin/gdk/gvloadimage_gdk.c
@@ -15,8 +15,8 @@
 
 #include <stdlib.h>
 
-#include "gvplugin_loadimage.h"
-#include "gvio.h"
+#include <gvc/gvplugin_loadimage.h>
+#include <gvc/gvio.h>
 
 #ifdef HAVE_PANGOCAIRO
 #include <cairo.h>
diff --git a/plugin/gdk/gvplugin_gdk.c b/plugin/gdk/gvplugin_gdk.c
index 6b84eb118..3cfbeeee1 100644
--- a/plugin/gdk/gvplugin_gdk.c
+++ b/plugin/gdk/gvplugin_gdk.c
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "gvplugin.h"
+#include <gvc/gvplugin.h>
 
 extern gvplugin_installed_t gvdevice_gdk_types[];
 extern gvplugin_installed_t gvloadimage_gdk_types[];