disambiguate plugin/gdk #includes

Related to #1785.

diff --git a/plugin/gdk/Makefile.am b/plugin/gdk/Makefile.am
index bae57303ac52202f9f2601c6b73ab450a7f2dc17..81629ab9a17772ded64bea82921bed4203dd3cd3 100644 (file)
--- 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 45177ada1789f4c01717d08a419f18b8db998244..9fb6e817f716d0bbb99954b433eff8cf8fcaa652 100644 (file)
--- 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 24c5e846db3f2db4db6ac757472ab10f280b13f9..b567238caa99f4eb48835574c1d80234c7108f99 100644 (file)
--- 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 6b84eb1185ebee43efb22b34a4fcd95219b52bba..3cfbeeee135b38da223d3af65e30f6814a8a5d54 100644 (file)
--- 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[];