disambiguate plugin/gtk #includes

Related to #1785.

diff --git a/plugin/gtk/Makefile.am b/plugin/gtk/Makefile.am
index cf3d25161acc63d99328429c26be02bc6e2fea6b..748064fe34a1a73b565ee8c24e28c0d2845f150f 100644 (file)
--- a/plugin/gtk/Makefile.am
+++ b/plugin/gtk/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/gtk/callbacks.c b/plugin/gtk/callbacks.c
index b9dcbe3278481e7417dcaebf3366fceda95b6c66..d5e5e65996efb38dbc9a2d4043dfce913f6d0602 100644 (file)
--- a/plugin/gtk/callbacks.c
+++ b/plugin/gtk/callbacks.c
@@ -15,7 +15,7 @@
 
 #include <gtk/gtk.h>
 
-#include "gvplugin_device.h"
+#include <gvc/gvplugin_device.h>
 
 #include "callbacks.h"
 #include "interface.h"

diff --git a/plugin/gtk/gvdevice_gtk.c b/plugin/gtk/gvdevice_gtk.c
index a20c9aa8884e92524abad3198ad703548165d60c..2d02add8266ca8ed6dcea3bafe3c267e713bf991 100644 (file)
--- a/plugin/gtk/gvdevice_gtk.c
+++ b/plugin/gtk/gvdevice_gtk.c
@@ -18,7 +18,7 @@
 #include <unistd.h>
 #endif
 
-#include "gvplugin_device.h"
+#include <gvc/gvplugin_device.h>
 
 #ifdef HAVE_GTK
 #include <gtk/gtk.h>

diff --git a/plugin/gtk/gvplugin_gtk.c b/plugin/gtk/gvplugin_gtk.c
index 831e21337c741a8d03378dcc00a0d1a95fa38273..d85da0d4c9cd44fea0ca915adbe533b130b6bbd4 100644 (file)
--- a/plugin/gtk/gvplugin_gtk.c
+++ b/plugin/gtk/gvplugin_gtk.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_types_gtk[];