From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 16 Aug 2020 17:59:42 +0000 (-0700)
Subject: disambiguate lib/edgepaint/*.c #includes
X-Git-Tag: 2.46.0~20^2^2~90^2~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7fbe68332067e21319afb0b2740f778acc4e61ca;p=graphviz

disambiguate lib/edgepaint/*.c #includes

Related to #1785.
---

diff --git a/lib/edgepaint/Makefile.am b/lib/edgepaint/Makefile.am
index 9f1831a58..ad057d043 100644
--- a/lib/edgepaint/Makefile.am
+++ b/lib/edgepaint/Makefile.am
@@ -6,6 +6,7 @@ LAB_GAMUT_VERSION="1:0:0"
 pkgconfigdir = $(libdir)/pkgconfig
 
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/common \
 	-I$(top_srcdir)/lib/sparse \
 	-I$(top_srcdir)/lib/gvc \
diff --git a/lib/edgepaint/edge_distinct_coloring.c b/lib/edgepaint/edge_distinct_coloring.c
index 72916b2b9..19871dfa1 100644
--- a/lib/edgepaint/edge_distinct_coloring.c
+++ b/lib/edgepaint/edge_distinct_coloring.c
@@ -7,14 +7,14 @@
  *
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
-#include "general.h"
+#include <sparse/general.h>
 #include <math.h>
-#include "time.h"
-#include "SparseMatrix.h"
-#include "node_distinct_coloring.h"
-#include "DotIO.h"
-#include "intersection.h"
-#include "QuadTree.h"
+#include <time.h>
+#include <sparse/SparseMatrix.h>
+#include <edgepaint/node_distinct_coloring.h>
+#include <sparse/DotIO.h>
+#include <edgepaint/intersection.h>
+#include <sparse/QuadTree.h>
 
 static int splines_intersect(int dim, int u1, int v1, int u2, int v2, 
 			     real cos_critical, int check_edges_with_same_endpoint, 
diff --git a/lib/edgepaint/edgepaintlib.vcxproj b/lib/edgepaint/edgepaintlib.vcxproj
index 70c9ee48e..321c4cc25 100644
--- a/lib/edgepaint/edgepaintlib.vcxproj
+++ b/lib/edgepaint/edgepaintlib.vcxproj
@@ -54,7 +54,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -71,7 +71,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader />
diff --git a/lib/edgepaint/furtherest_point.c b/lib/edgepaint/furtherest_point.c
index c2fbf5f00..06f731189 100644
--- a/lib/edgepaint/furtherest_point.c
+++ b/lib/edgepaint/furtherest_point.c
@@ -7,9 +7,9 @@
  *
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
-#include "general.h"
-#include "QuadTree.h"
-#include "furtherest_point.h"
+#include <sparse/general.h>
+#include <sparse/QuadTree.h>
+#include <edgepaint/furtherest_point.h>
 #include <string.h>
 
 static real dist(int dim, real *x, real *y){
diff --git a/lib/edgepaint/intersection.c b/lib/edgepaint/intersection.c
index 4e18a4772..2d7af8f93 100644
--- a/lib/edgepaint/intersection.c
+++ b/lib/edgepaint/intersection.c
@@ -7,7 +7,7 @@
  *
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
-#include "general.h"
+#include <sparse/general.h>
 #include <math.h>
 
 static real cross(real *u, real *v){
diff --git a/lib/edgepaint/lab.c b/lib/edgepaint/lab.c
index fc40ce3f1..3287e4237 100644
--- a/lib/edgepaint/lab.c
+++ b/lib/edgepaint/lab.c
@@ -7,14 +7,14 @@
  *
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
-#include "general.h"
-#include "QuadTree.h"
-#include "lab.h"
-#include "math.h"
-#include "stdio.h"
-#include "stdlib.h"
-#include "color_palette.h"
-#include "lab_gamut.h"
+#include <sparse/general.h>
+#include <sparse/QuadTree.h>
+#include <edgepaint/lab.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sparse/color_palette.h>
+#include <edgepaint/lab_gamut.h>
 
 color_rgb color_rgb_init(double r, double g, double b){
   color_rgb rgb;
diff --git a/lib/edgepaint/lab_gamut.c b/lib/edgepaint/lab_gamut.c
index 58adb5bc2..0924bda10 100644
--- a/lib/edgepaint/lab_gamut.c
+++ b/lib/edgepaint/lab_gamut.c
@@ -8,7 +8,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include <lab_gamut.h>
+#include <edgepaint/lab_gamut.h>
 
 const signed char lab_gamut_data[] = {0,0,0,
 1,-2,1,
diff --git a/lib/edgepaint/lab_gamut.vcxproj b/lib/edgepaint/lab_gamut.vcxproj
index b64d03641..831c4f32a 100644
--- a/lib/edgepaint/lab_gamut.vcxproj
+++ b/lib/edgepaint/lab_gamut.vcxproj
@@ -53,7 +53,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)lib\edgepaint;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)lib;$(SolutionDir)lib\edgepaint;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;LAB_GAMUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -75,7 +75,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)lib\edgepaint;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)lib;$(SolutionDir)lib\edgepaint;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;LAB_GAMUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>
diff --git a/lib/edgepaint/node_distinct_coloring.c b/lib/edgepaint/node_distinct_coloring.c
index 5b27fa339..5c3ba5648 100644
--- a/lib/edgepaint/node_distinct_coloring.c
+++ b/lib/edgepaint/node_distinct_coloring.c
@@ -7,13 +7,13 @@
  *
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
-#include "general.h"
-#include "SparseMatrix.h"
-#include "QuadTree.h"
-#include "node_distinct_coloring.h"
-#include "lab.h"
-#include "furtherest_point.h"
-#include "color_palette.h"
+#include <sparse/general.h>
+#include <sparse/SparseMatrix.h>
+#include <sparse/QuadTree.h>
+#include <edgepaint/node_distinct_coloring.h>
+#include <edgepaint/lab.h>
+#include <edgepaint/furtherest_point.h>
+#include <sparse/color_palette.h>
 #include <string.h>
 
 #ifndef _WIN32