disambiguate plugin/xlib #includes

Related to #1785.

diff --git a/plugin/xlib/Makefile.am b/plugin/xlib/Makefile.am
index a6b542ea7e0c1845226e3c6d273317a3752e3865..63ff0b005ae384b89dcd437577e375e05b51f08e 100644 (file)
--- a/plugin/xlib/Makefile.am
+++ b/plugin/xlib/Makefile.am
@@ -4,6 +4,7 @@
 pdfdir = $(pkgdatadir)/doc/pdf
 
 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/xlib/gvdevice_xlib.c b/plugin/xlib/gvdevice_xlib.c
index ed2b0e85510f79b3b5dcc97792e4e21a8e36677f..55219b10d2caaf7422bfb04ad86a37b4a1b24270 100644 (file)
--- a/plugin/xlib/gvdevice_xlib.c
+++ b/plugin/xlib/gvdevice_xlib.c
@@ -42,7 +42,7 @@
 #include <poll.h>
 #endif
 
-#include "gvplugin_device.h"
+#include <gvc/gvplugin_device.h>
 
 #include <cairo.h>
 #ifdef CAIRO_HAS_XLIB_SURFACE

diff --git a/plugin/xlib/gvplugin_xlib.c b/plugin/xlib/gvplugin_xlib.c
index b855822c53c5ebee5f5dcdba01afc5cb5545221e..14282ab7b05508e2e468dafe373cc953739582a2 100644 (file)
--- a/plugin/xlib/gvplugin_xlib.c
+++ b/plugin/xlib/gvplugin_xlib.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_xlib[];