From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Tue, 25 Aug 2020 00:48:30 +0000 (-0700)
Subject: disambiguate plugin/core #includes
X-Git-Tag: 2.46.0~20^2^2~69^2~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9596276747ecc33ea8cb79da64bb4b371742264;p=graphviz

disambiguate plugin/core #includes

Related to #1242 and #1785.
---

diff --git a/plugin/core/CMakeLists.txt b/plugin/core/CMakeLists.txt
index 9fb935f6c..824c1233e 100644
--- 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 3e83bde9f..7a6cc66c6 100644
--- 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 82dc4ba6c..40aca08a1 100644
--- 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 da422a9a7..cfe2209d6 100644
--- 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 2c1cf331b..d9f8f45ff 100644
--- 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 b7ec4a55b..17bfc727c 100644
--- 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 4f3920682..3574ab23a 100644
--- 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 f8080fb10..736ae756d 100644
--- 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 767e13e68..42ee4c9ea 100644
--- 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 38eea62bb..515aec7d2 100644
--- 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 49ee871f7..8ab1f70c0 100644
--- 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 b414c0d34..24b89a6ca 100644
--- 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 a8f2d7405..a100ca0d2 100644
--- 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 a2f790e07..91484087d 100644
--- 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 d1731ccbc..3091c1577 100644
--- 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 f9c5be83c..d6c345965 100644
--- 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 edcc32be2..0fdecb776 100644
--- 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 3c29ba905..a696f0ad5 100644
--- 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 630fe03cb..dbcbd2980 100644
--- 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 fe31dee0f..d8ac773af 100644
--- 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