disambiguate plugin/gd #includes

Related to #1242 and #1785.

diff --git a/plugin/gd/CMakeLists.txt b/plugin/gd/CMakeLists.txt
index dacce48392d59a877a7cd860c8fcfdb24bfdf2b4..0beeccd82d0f960f20204e87adf0b8ae9cde56ab 100644 (file)
--- a/plugin/gd/CMakeLists.txt
+++ b/plugin/gd/CMakeLists.txt
@@ -1,15 +1,5 @@
 if (GD_FOUND)
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${GRAPHVIZ_LIB_DIR}/cdt
-    ${GRAPHVIZ_LIB_DIR}/cgraph
-    ${GRAPHVIZ_LIB_DIR}/common
-    ${GRAPHVIZ_LIB_DIR}/gvc
-    ${GRAPHVIZ_LIB_DIR}/pathplan
-    ${GD_INCLUDE_DIRS}
-)
-
 add_library(gvplugin_gd SHARED
     # Source files
     gvdevice_gd.c
@@ -20,6 +10,17 @@ add_library(gvplugin_gd SHARED
        gvtextlayout_gd.c
 )
 
+target_include_directories(gvplugin_gd PRIVATE
+    ${GRAPHVIZ_LIB_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${GRAPHVIZ_LIB_DIR}/cdt
+    ${GRAPHVIZ_LIB_DIR}/cgraph
+    ${GRAPHVIZ_LIB_DIR}/common
+    ${GRAPHVIZ_LIB_DIR}/gvc
+    ${GRAPHVIZ_LIB_DIR}/pathplan
+    ${GD_INCLUDE_DIRS}
+)
+
 target_link_libraries(gvplugin_gd
     cdt
     cgraph

diff --git a/plugin/gd/Makefile.am b/plugin/gd/Makefile.am
index bb3c47700f7a72e3fdb6d45a2652e588c569b139..58202ba30fdec1e5f25459337bb041a4751534a6 100644 (file)
--- a/plugin/gd/Makefile.am
+++ b/plugin/gd/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/gd/gvdevice_gd.c b/plugin/gd/gvdevice_gd.c
index 5f67f1a58617ab15ccb45fcfcf28fceb26771c45..4040c547494166f2b5ecb5369919e776f33c12ed 100644 (file)
--- a/plugin/gd/gvdevice_gd.c
+++ b/plugin/gd/gvdevice_gd.c
@@ -13,10 +13,10 @@
 
 #include "config.h"
 
-#include "gvplugin_device.h"
-#include "gvio.h"
+#include <gvc/gvplugin_device.h>
+#include <gvc/gvio.h>
 
-#include "gd.h"
+#include <gd.h>
 
 int gvdevice_gd_putBuf (gdIOCtx *context, const void *buffer, int len)
 {

diff --git a/plugin/gd/gvloadimage_gd.c b/plugin/gd/gvloadimage_gd.c
index 8953aec96c9b814176c1710ef5b59c05b93a0169..71ef28a5a1dbc9f2db34ab612ce10be29f19780e 100644 (file)
--- a/plugin/gd/gvloadimage_gd.c
+++ b/plugin/gd/gvloadimage_gd.c
@@ -21,9 +21,9 @@
 #include <cairo.h>
 #endif
 
-#include "gvplugin_loadimage.h"
-#include "gvio.h"
-#include "gd.h"
+#include <gvc/gvplugin_loadimage.h>
+#include <gvc/gvio.h>
+#include <gd.h>
 
 typedef enum {
     FORMAT_PNG_GD, FORMAT_GIF_GD, FORMAT_JPG_GD, FORMAT_GD_GD, FORMAT_GD2_GD, FORMAT_XPM_GD, FORMAT_WBMP_GD, FORMAT_XBM_GD,

diff --git a/plugin/gd/gvplugin_gd.c b/plugin/gd/gvplugin_gd.c
index 3ccb8d6337fc274a7c1772680f6a4ac6fa8b425a..6905753b2a690d8b4c4f16bde2582425df7cf350 100644 (file)
--- a/plugin/gd/gvplugin_gd.c
+++ b/plugin/gd/gvplugin_gd.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 gvrender_gd_types[];
 extern gvplugin_installed_t gvrender_vrml_types[];

diff --git a/plugin/gd/gvplugin_gd.vcxproj b/plugin/gd/gvplugin_gd.vcxproj
index a856283288c7222b2a009117a4296f73c79f359b..d42d3f5bc198e9fb7653b6b89a51a9f171f4d2b4 100644 (file)
--- a/plugin/gd/gvplugin_gd.vcxproj
+++ b/plugin/gd/gvplugin_gd.vcxproj
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -79,7 +79,7 @@ copy $(SolutionDir)windows\dependencies\libraries\x86\bin\pixman-1.dll $(OutDir)
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/plugin/gd/gvrender_gd.c b/plugin/gd/gvrender_gd.c
index 7456d1003e4f710868539c1247e1fdcf0699886b..0660e45c360145f2dff28aeefe4a0fbb8e07f6d9 100644 (file)
--- a/plugin/gd/gvrender_gd.c
+++ b/plugin/gd/gvrender_gd.c
@@ -19,10 +19,10 @@
 #include <string.h>
 #include <fcntl.h>
 
-#include "gvplugin_render.h"
-#include "gvplugin_device.h"
-#include "gvcint.h"    /* for gvc->g for agget */
-#include "gd.h"
+#include <gvc/gvplugin_render.h>
+#include <gvc/gvplugin_device.h>
+#include <gvc/gvcint.h>        /* for gvc->g for agget */
+#include <gd.h>
 
 #ifndef INT32_MAX
 #define INT32_MAX              (2147483647)

diff --git a/plugin/gd/gvrender_gd_vrml.c b/plugin/gd/gvrender_gd_vrml.c
index d350b64ff1c442d33f4fa968fdcaa935b223525f..0bde14e66a70616f31ba268d53aef883bb262846 100644 (file)
--- a/plugin/gd/gvrender_gd_vrml.c
+++ b/plugin/gd/gvrender_gd_vrml.c
@@ -19,24 +19,24 @@
 #include <string.h>
 #include <fcntl.h>
 
-#include "gvplugin_render.h"
-#include "gvio.h"
-#include "gd.h"
+#include <gvc/gvplugin_render.h>
+#include <gvc/gvio.h>
+#include <gd.h>
 
 #ifdef HAVE_GD_PNG
 
 /* for N_GNEW() */
-#include "memory.h"
+#include <common/memory.h>
 
 /* for gvcolor_t */
-#include "color.h"
+#include <common/color.h>
 
 /* for late_double() */
-#include "agxbuf.h"
-#include "utils.h"
+#include <cgraph/agxbuf.h>
+#include <common/utils.h>
 
 /* for wind() */
-#include "pathutil.h"
+#include <pathplan/pathutil.h>
 
 extern shape_kind shapeOf(node_t *);
 extern pointf gvrender_ptf(GVJ_t *job, pointf p);

diff --git a/plugin/gd/gvtextlayout_gd.c b/plugin/gd/gvtextlayout_gd.c
index 7ead7e48e50952981392c2c361422102b3c99c7a..7d8780375e655a60849b29a2dbd091cf12f75823 100644 (file)
--- a/plugin/gd/gvtextlayout_gd.c
+++ b/plugin/gd/gvtextlayout_gd.c
@@ -16,9 +16,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "gvplugin_textlayout.h"
-#include "gd.h"
-#include "strcasecmp.h"
+#include <gvc/gvplugin_textlayout.h>
+#include <gd.h>
+#include <cgraph/strcasecmp.h>
 
 #ifdef HAVE_GD_FREETYPE