disambiguate plugin/lasi #includes

Related to #1785.

diff --git a/plugin/lasi/Makefile.am b/plugin/lasi/Makefile.am
index 00ec4b7efe51634190acd8cb7b9b10f9db26574f..f9cc8b8f8c1dd02552df18551f17e74474d2f363 100644 (file)
--- 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 d2a4b174618db732f1374af122dfcbbbba66233d..06557aee7063b83cd8ef5781d84c80985d83eca8 100644 (file)
--- 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 c2647de813a51d0fbc8165f86cbb340285cf6583..f0c91cd50172582b1e161d18b663269d5366fef6 100644 (file)
--- 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 1655ddf243875cca39b0da490be407b1d6b2b724..d52a9664ea8357a1da03184d21236c4e36d28dc8 100644 (file)
--- 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