disambiguate plugin/core #includes

Related to #1242 and #1785.

diff --git a/plugin/core/CMakeLists.txt b/plugin/core/CMakeLists.txt
index 9fb935f6cc9fc4235c087a6f8968a96320fed1a4..824c1233e641cfb51c148b9c88cf555001d34ea9 100644 (file)
--- a/plugin/core/CMakeLists.txt
+++ b/plugin/core/CMakeLists.txt
@@ -1,20 +1,3 @@
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${TOP_SOURCE_DIR}
-    ${GRAPHVIZ_LIB_DIR}/ast
-    ${GRAPHVIZ_LIB_DIR}/cdt
-    ${GRAPHVIZ_LIB_DIR}/cgraph
-    ${GRAPHVIZ_LIB_DIR}/common
-    ${GRAPHVIZ_LIB_DIR}/expr
-    ${GRAPHVIZ_LIB_DIR}/gvc
-    ${GRAPHVIZ_LIB_DIR}/gvpr
-    ${GRAPHVIZ_LIB_DIR}/pathplan
-    ${GRAPHVIZ_LIB_DIR}/sfio
-    ${GRAPHVIZ_LIB_DIR}/vmalloc
-    ${GRAPHVIZ_LIB_DIR}/xdot
-)
-
 # Generate ps.h from ps.txt
 add_custom_command(
     OUTPUT ps.h
@@ -43,6 +26,23 @@ add_library(gvplugin_core SHARED
        gvrender_core_vml.c
 )
 
+target_include_directories(gvplugin_core PRIVATE
+    ${GRAPHVIZ_LIB_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${GRAPHVIZ_LIB_DIR}/ast
+    ${GRAPHVIZ_LIB_DIR}/cdt
+    ${GRAPHVIZ_LIB_DIR}/cgraph
+    ${GRAPHVIZ_LIB_DIR}/common
+    ${GRAPHVIZ_LIB_DIR}/expr
+    ${GRAPHVIZ_LIB_DIR}/gvc
+    ${GRAPHVIZ_LIB_DIR}/gvpr
+    ${GRAPHVIZ_LIB_DIR}/pathplan
+    ${GRAPHVIZ_LIB_DIR}/sfio
+    ${GRAPHVIZ_LIB_DIR}/vmalloc
+    ${GRAPHVIZ_LIB_DIR}/xdot
+)
+
 target_link_libraries(gvplugin_core
     cdt
     cgraph

diff --git a/plugin/core/Makefile.am b/plugin/core/Makefile.am
index 3e83bde9f6a8d8c923b5523297530190608de5a7..7a6cc66c6aa57ac58ba6824f899bd6edd1689c39 100644 (file)
--- a/plugin/core/Makefile.am
+++ b/plugin/core/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/core/gvloadimage_core.c b/plugin/core/gvloadimage_core.c
index 82dc4ba6c5d341f13d3aa36151af2538dba9cd4b..40aca08a1aa552ff01388fc17fa016969981f599 100644 (file)
--- a/plugin/core/gvloadimage_core.c
+++ b/plugin/core/gvloadimage_core.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 void core_loadimage_xdot(GVJ_t*, usershape_t*, boxf, boolean);
 extern shape_desc *find_user_shape(char *name);

diff --git a/plugin/core/gvplugin_core.c b/plugin/core/gvplugin_core.c
index da422a9a74cd21bf6d85fd1616c3e6616b3ae939..cfe2209d66303f75f5460448c0e05d79383aa3fc 100644 (file)
--- a/plugin/core/gvplugin_core.c
+++ b/plugin/core/gvplugin_core.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_dot_types[];
 extern gvplugin_installed_t gvdevice_fig_types[];

diff --git a/plugin/core/gvplugin_core.vcxproj b/plugin/core/gvplugin_core.vcxproj
index 2c1cf331b0efbbd18d9c0a8af9b10d633bb2fe24..d9f8f45ff5c8875dd1201883812b9b9c7768033a 100644 (file)
--- a/plugin/core/gvplugin_core.vcxproj
+++ b/plugin/core/gvplugin_core.vcxproj
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -76,7 +76,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>
       <EnablePREfast>true</EnablePREfast>

diff --git a/plugin/core/gvrender_core_dia.c b/plugin/core/gvrender_core_dia.c
index b7ec4a55b4a8f067864cf3ac77a39888ee3abb8b..17bfc727cf55bef77d4d5c7e83459eaf26ce9eee 100644 (file)
--- a/plugin/core/gvrender_core_dia.c
+++ b/plugin/core/gvrender_core_dia.c
@@ -20,13 +20,13 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "macros.h"
-#include "const.h"
+#include <common/macros.h>
+#include <common/const.h>
 
-#include "gvplugin_render.h"
-#include "gvplugin_device.h"
-#include "gvio.h"
-#include "gvcint.h"
+#include <gvc/gvplugin_render.h>
+#include <gvc/gvplugin_device.h>
+#include <gvc/gvio.h>
+#include <gvc/gvcint.h>
 
 typedef enum { FORMAT_DIA, } format_type;
 

diff --git a/plugin/core/gvrender_core_dot.c b/plugin/core/gvrender_core_dot.c
index 4f392068238841b3d72ed5251ad48ea96f8ebe0e..3574ab23a5047b62477ea19af764a9286ff65e8a 100644 (file)
--- a/plugin/core/gvrender_core_dot.c
+++ b/plugin/core/gvrender_core_dot.c
@@ -22,14 +22,14 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "macros.h"
-#include "const.h"
-
-#include "gvplugin_render.h"
-#include "gvplugin_device.h"
-#include "agxbuf.h"
-#include "utils.h"
-#include "gvio.h"
+#include <common/macros.h>
+#include <common/const.h>
+
+#include <gvc/gvplugin_render.h>
+#include <gvc/gvplugin_device.h>
+#include <cgraph/agxbuf.h>
+#include <common/utils.h>
+#include <gvc/gvio.h>
 
 #define GNEW(t)          (t*)malloc(sizeof(t))
 

diff --git a/plugin/core/gvrender_core_fig.c b/plugin/core/gvrender_core_fig.c
index f8080fb1095f3873e3520aba6e7309c5e1dc6267..736ae756df756a6691bbcf113b01c0f176443227 100644 (file)
--- a/plugin/core/gvrender_core_fig.c
+++ b/plugin/core/gvrender_core_fig.c
@@ -22,15 +22,15 @@
 #include <io.h>
 #endif
 
-#include "macros.h"
-#include "const.h"
-
-#include "gvplugin_render.h"
-#include "gvplugin_device.h"
-#include "gvio.h"
-#include "agxbuf.h"
-#include "utils.h"
-#include "color.h"
+#include <common/macros.h>
+#include <common/const.h>
+
+#include <gvc/gvplugin_render.h>
+#include <gvc/gvplugin_device.h>
+#include <gvc/gvio.h>
+#include <cgraph/agxbuf.h>
+#include <common/utils.h>
+#include <common/color.h>
 
 /* Number of points to split splines into */
 #define BEZIERSUBDIVISION 6

diff --git a/plugin/core/gvrender_core_hpgl.c b/plugin/core/gvrender_core_hpgl.c
index 767e13e68c9fc7e7c4c04d2ad9b4798b9ff1e912..42ee4c9ea03481b4b6d6ebc9f189af4aef6bd331 100644 (file)
--- a/plugin/core/gvrender_core_hpgl.c
+++ b/plugin/core/gvrender_core_hpgl.c
@@ -24,15 +24,15 @@
 #include <io.h>
 #endif
 
-#include "macros.h"
-#include "const.h"
-
-#include "gvdevice.h"
-#include "gvplugin_render.h"
-#include "gvplugin_device.h"
-#include "agxbuf.h"
-#include "utils.h"
-#include "color.h"
+#include <common/macros.h>
+#include <common/const.h>
+
+#include <gvc/gvdevice.h>
+#include <gvc/gvplugin_render.h>
+#include <gvc/gvplugin_device.h>
+#include <cgraph/agxbuf.h>
+#include <common/utils.h>
+#include <common/color.h>
 
 /* Number of points to split splines into */
 #define BEZIERSUBDIVISION 6

diff --git a/plugin/core/gvrender_core_json.c b/plugin/core/gvrender_core_json.c
index 38eea62bbc3772fe5940802eace2191f55db9da0..515aec7d22b3072817ed69e8d75b9e1139204618 100644 (file)
--- a/plugin/core/gvrender_core_json.c
+++ b/plugin/core/gvrender_core_json.c
@@ -22,17 +22,17 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "macros.h"
-#include "const.h"
-#include "xdot.h"
-
-#include "gvplugin_render.h"
-#include "gvplugin_device.h"
-#include "agxbuf.h"
-#include "utils.h"
-#include "gvc.h"
-#include "gvio.h"
-#include "gvcint.h"
+#include <common/macros.h>
+#include <common/const.h>
+#include <xdot/xdot.h>
+
+#include <gvc/gvplugin_render.h>
+#include <gvc/gvplugin_device.h>
+#include <cgraph/agxbuf.h>
+#include <common/utils.h>
+#include <gvc/gvc.h>
+#include <gvc/gvio.h>
+#include <gvc/gvcint.h>
 
 typedef enum {
        FORMAT_JSON,

diff --git a/plugin/core/gvrender_core_map.c b/plugin/core/gvrender_core_map.c
index 49ee871f7b952cc22065f2b797d06da7f99da67a..8ab1f70c08c26a70a52c8340c6c4dccd1432508b 100644 (file)
--- a/plugin/core/gvrender_core_map.c
+++ b/plugin/core/gvrender_core_map.c
@@ -15,9 +15,9 @@
 
 #include <stdlib.h>
 
-#include "gvplugin_render.h"
-#include "gvplugin_device.h"
-#include "gvio.h"
+#include <gvc/gvplugin_render.h>
+#include <gvc/gvplugin_device.h>
+#include <gvc/gvio.h>
 
 extern char *xml_string(char *str);
 extern char *xml_url_string(char *str);

diff --git a/plugin/core/gvrender_core_mif.c b/plugin/core/gvrender_core_mif.c
index b414c0d3491985f4fcebca08e2c9c06e87a323bc..24b89a6ca448c2c0194700a692f11be02e1b5c63 100644 (file)
--- a/plugin/core/gvrender_core_mif.c
+++ b/plugin/core/gvrender_core_mif.c
@@ -20,14 +20,14 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "macros.h"
-#include "const.h"
-
-#include "gvio.h"
-#include "gvplugin_render.h"
-#include "gvplugin_device.h"
-#include "gvcint.h"
-#include "strcasecmp.h"
+#include <common/macros.h>
+#include <common/const.h>
+
+#include <gvc/gvio.h>
+#include <gvc/gvplugin_render.h>
+#include <gvc/gvplugin_device.h>
+#include <gvc/gvcint.h>
+#include <cgraph/strcasecmp.h>
 
 typedef enum { FORMAT_MIF, } format_type;
 

diff --git a/plugin/core/gvrender_core_mp.c b/plugin/core/gvrender_core_mp.c
index a8f2d7405af370d90b22f439e55141ec570dc8d5..a100ca0d219085241a242c07cdb2361358986454 100644 (file)
--- a/plugin/core/gvrender_core_mp.c
+++ b/plugin/core/gvrender_core_mp.c
@@ -24,15 +24,15 @@
 #include <io.h>
 #endif
 
-#include "macros.h"
-#include "const.h"
-
-#include "gvplugin_render.h"
-#include "gvplugin_device.h"
-#include "gvio.h"
-#include "agxbuf.h"
-#include "utils.h"
-#include "color.h"
+#include <common/macros.h>
+#include <common/const.h>
+
+#include <gvc/gvplugin_render.h>
+#include <gvc/gvplugin_device.h>
+#include <gvc/gvio.h>
+#include <cgraph/agxbuf.h>
+#include <common/utils.h>
+#include <common/color.h>
 
 /* Number of points to split splines into */
 #define BEZIERSUBDIVISION 6

diff --git a/plugin/core/gvrender_core_pic.c b/plugin/core/gvrender_core_pic.c
index a2f790e07a309d5795f9346256d4f79030c8a691..91484087d882ff075c3ac7709696bafead3e5852 100644 (file)
--- a/plugin/core/gvrender_core_pic.c
+++ b/plugin/core/gvrender_core_pic.c
@@ -18,15 +18,15 @@
 #include <stdarg.h>
 #include <ctype.h>
 
-#include "gvplugin_render.h"
-#include "gvplugin_device.h"
-#include "gvio.h"
-#include "agxbuf.h"
-#include "utils.h"
-#include "color.h"
-#include "colorprocs.h"
-
-#include "const.h"
+#include <gvc/gvplugin_render.h>
+#include <gvc/gvplugin_device.h>
+#include <gvc/gvio.h>
+#include <cgraph/agxbuf.h>
+#include <common/utils.h>
+#include <common/color.h>
+#include <common/colorprocs.h>
+
+#include <common/const.h>
 
 /* Number of points to split splines into */
 #define BEZIERSUBDIVISION 6

diff --git a/plugin/core/gvrender_core_pov.c b/plugin/core/gvrender_core_pov.c
index d1731ccbc2ce231a8a9e406aaf22d424486c953e..3091c1577f94b788e633ed8cc394eba42322daf6 100644 (file)
--- a/plugin/core/gvrender_core_pov.c
+++ b/plugin/core/gvrender_core_pov.c
@@ -25,13 +25,13 @@
 #include <ctype.h>
 #include <errno.h>
 
-#include "macros.h"
-#include "const.h"
+#include <common/macros.h>
+#include <common/const.h>
 
-#include "gvplugin_render.h"
-#include "gvplugin_device.h"
-#include "gvio.h"
-#include "gvcint.h"
+#include <gvc/gvplugin_render.h>
+#include <gvc/gvplugin_device.h>
+#include <gvc/gvio.h>
+#include <gvc/gvcint.h>
 
 #define POV_VERSION \
     "#version 3.6;\n"

diff --git a/plugin/core/gvrender_core_ps.c b/plugin/core/gvrender_core_ps.c
index f9c5be83c67a78e7800b01ae32158680dd15d347..d6c34596557e2482330abe3fd4a0d2c6f3ee0803 100644 (file)
--- a/plugin/core/gvrender_core_ps.c
+++ b/plugin/core/gvrender_core_ps.c
@@ -16,15 +16,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "gvplugin_render.h"
-#include "gvplugin_device.h"
-#include "gvio.h"
-#include "agxbuf.h"
-#include "utils.h"
+#include <gvc/gvplugin_render.h>
+#include <gvc/gvplugin_device.h>
+#include <gvc/gvio.h>
+#include <cgraph/agxbuf.h>
+#include <common/utils.h>
 #include "ps.h"
 
 /* for CHAR_LATIN1  */
-#include "const.h"
+#include <common/const.h>
 
 /*
  *     J$: added `pdfmark' URL embedding.  PostScript rendered from

diff --git a/plugin/core/gvrender_core_svg.c b/plugin/core/gvrender_core_svg.c
index edcc32be2af80fbc188fd393dd4fd2c07a7f0b55..0fdecb776fdebe650cc7f63b744b45819da6aee9 100644 (file)
--- a/plugin/core/gvrender_core_svg.c
+++ b/plugin/core/gvrender_core_svg.c
@@ -28,16 +28,16 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "macros.h"
-#include "const.h"
-
-#include "gvplugin_render.h"
-#include "agxbuf.h"
-#include "utils.h"
-#include "gvplugin_device.h"
-#include "gvio.h"
-#include "gvcint.h"
-#include "strcasecmp.h"
+#include <common/macros.h>
+#include <common/const.h>
+
+#include <gvc/gvplugin_render.h>
+#include <cgraph/agxbuf.h>
+#include <common/utils.h>
+#include <gvc/gvplugin_device.h>
+#include <gvc/gvio.h>
+#include <gvc/gvcint.h>
+#include <cgraph/strcasecmp.h>
 
 #define LOCALNAMEPREFIX                '%'
 

diff --git a/plugin/core/gvrender_core_tk.c b/plugin/core/gvrender_core_tk.c
index 3c29ba90562f667586374a3d7fc8ef8748281f2f..a696f0ad54740dc6e0ac7a7bdf9dc7feda357ec0 100644 (file)
--- a/plugin/core/gvrender_core_tk.c
+++ b/plugin/core/gvrender_core_tk.c
@@ -17,13 +17,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "macros.h"
-#include "const.h"
+#include <common/macros.h>
+#include <common/const.h>
 
-#include "gvplugin_render.h"
-#include "gvplugin_device.h"
-#include "gvio.h"
-#include "gvcint.h"
+#include <gvc/gvplugin_render.h>
+#include <gvc/gvplugin_device.h>
+#include <gvc/gvio.h>
+#include <gvc/gvcint.h>
 
 typedef enum { FORMAT_TK, } format_type;
 

diff --git a/plugin/core/gvrender_core_vml.c b/plugin/core/gvrender_core_vml.c
index 630fe03cb882c607ecc82977328c5503e6919aed..dbcbd298040b3e5805f0915819b4ff2bb3ba75c7 100644 (file)
--- a/plugin/core/gvrender_core_vml.c
+++ b/plugin/core/gvrender_core_vml.c
@@ -18,14 +18,14 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "macros.h"
-#include "const.h"
-
-#include "gvplugin_render.h"
-#include "gvplugin_device.h"
-#include "gvio.h"
-#include "memory.h"
-#include "strcasecmp.h"
+#include <common/macros.h>
+#include <common/const.h>
+
+#include <gvc/gvplugin_render.h>
+#include <gvc/gvplugin_device.h>
+#include <gvc/gvio.h>
+#include <common/memory.h>
+#include <cgraph/strcasecmp.h>
 
 typedef enum { FORMAT_VML, FORMAT_VMLZ, } format_type;
 

diff --git a/plugin/core/gvrender_core_vtx.c b/plugin/core/gvrender_core_vtx.c
index fe31dee0f62ea7411b27d735008c853cd8345d18..d8ac773af070d4d9510917e49c3b883088caeb30 100644 (file)
--- a/plugin/core/gvrender_core_vtx.c
+++ b/plugin/core/gvrender_core_vtx.c
@@ -24,15 +24,15 @@
 #include <io.h>
 #endif
 
-#include "macros.h"
-#include "const.h"
-
-#include "gvio.h"
-#include "gvplugin_render.h"
-#include "gvplugin_device.h"
-#include "agxbuf.h"
-#include "utils.h"
-#include "color.h"
+#include <common/macros.h>
+#include <common/const.h>
+
+#include <gvc/gvio.h>
+#include <gvc/gvplugin_render.h>
+#include <gvc/gvplugin_device.h>
+#include <cgraph/agxbuf.h>
+#include <common/utils.h>
+#include <common/color.h>
 
 /* Number of points to split splines into */
 #define BEZIERSUBDIVISION 6