From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 29 Aug 2020 04:51:46 +0000 (-0700)
Subject: disambiguate plugin/lasi #includes
X-Git-Tag: 2.46.0~20^2^2~69^2~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=732ec1d858e1e2884da675725266395d4340bc83;p=graphviz

disambiguate plugin/lasi #includes

Related to #1785.
---

diff --git a/plugin/lasi/Makefile.am b/plugin/lasi/Makefile.am
index 00ec4b7ef..f9cc8b8f8 100644
--- a/plugin/lasi/Makefile.am
+++ b/plugin/lasi/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/lasi/gvloadimage_lasi.c b/plugin/lasi/gvloadimage_lasi.c
index d2a4b1746..06557aee7 100644
--- a/plugin/lasi/gvloadimage_lasi.c
+++ b/plugin/lasi/gvloadimage_lasi.c
@@ -23,10 +23,10 @@
 #include <io.h>
 #endif
 
-#include "gvplugin_loadimage.h"
-#include "agxbuf.h"
-#include "utils.h"
-#include "gvio.h"
+#include <gvc/gvplugin_loadimage.h>
+#include <cgraph/agxbuf.h>
+#include <common/utils.h>
+#include <gvc/gvio.h>
 
 extern shape_desc *find_user_shape(char *name);
 
diff --git a/plugin/lasi/gvplugin_lasi.c b/plugin/lasi/gvplugin_lasi.c
index c2647de81..f0c91cd50 100644
--- a/plugin/lasi/gvplugin_lasi.c
+++ b/plugin/lasi/gvplugin_lasi.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_lasi_types[];
 extern gvplugin_installed_t gvrender_lasi_types[];
diff --git a/plugin/lasi/gvrender_lasi.cpp b/plugin/lasi/gvrender_lasi.cpp
index 1655ddf24..d52a9664e 100644
--- a/plugin/lasi/gvrender_lasi.cpp
+++ b/plugin/lasi/gvrender_lasi.cpp
@@ -18,21 +18,18 @@
 #include <stdexcept>
 #include <LASi.h>
 
-#include "gvplugin_render.h"
-#include "gvplugin_device.h"
-#include "gvio.h"
-#include "gvcint.h"
-#include "agxbuf.h"
-#include "const.h"
-#include "utils.h"
-#include "ps.h"
+#include <gvc/gvplugin_render.h>
+#include <gvc/gvplugin_device.h>
+#include <gvc/gvio.h>
+#include <gvc/gvcint.h>
+#include <cgraph/agxbuf.h>
+#include <common/const.h>
+#include <common/utils.h>
+#include <ps.h>
 
 using namespace LASi;
 using namespace std;
 
-/* for CHAR_LATIN1  */
-// #include "const.h"
-
 /*
  *     J$: added `pdfmark' URL embedding.  PostScript rendered from
  *         dot files with URL attributes will get active PDF links