From 12fe5a1e8260220540e177efa88f28dc416848ea Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 23 Aug 2020 14:37:15 -0700
Subject: [PATCH] disambiguate cmd/dot #includes

Related to #1785.
---
 cmd/dot/CMakeLists.txt | 1 +
 cmd/dot/Makefile.am    | 1 +
 cmd/dot/dot.c          | 6 +++---
 cmd/dot/dot.vcxproj    | 4 ++--
 cmd/dot/dot_builtins.c | 2 +-
 cmd/dot/no_builtins.c  | 2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/cmd/dot/CMakeLists.txt b/cmd/dot/CMakeLists.txt
index 78640068b..4fcf9fcff 100644
--- a/cmd/dot/CMakeLists.txt
+++ b/cmd/dot/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_definitions(-DDEMAND_LOADING=1)
 
 include_directories(
+    ${GRAPHVIZ_LIB_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${GRAPHVIZ_LIB_DIR}/cdt
diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index 7662304e1..9c9084cc5 100644
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -15,6 +15,7 @@ linkedprogram += sfdp$(EXEEXT)
 endif
 
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/lib \
         -I$(top_srcdir)/lib/common \
         -I$(top_srcdir)/lib/gvc \
 	-I$(top_srcdir)/lib/pathplan \
diff --git a/cmd/dot/dot.c b/cmd/dot/dot.c
index 04baa9eea..631448663 100644
--- a/cmd/dot/dot.c
+++ b/cmd/dot/dot.c
@@ -17,15 +17,15 @@
 
 #include "config.h"
 
-#include "gvc.h"
-#include "gvio.h"
+#include <gvc/gvc.h>
+#include <gvc/gvio.h>
 
 #ifdef WIN32_DLL
 __declspec(dllimport) boolean MemTest;
 __declspec(dllimport) int GvExitOnUsage;
 /*gvc.lib cgraph.lib*/
 #else   /* not WIN32_DLL */
-#include "globals.h"
+#include <common/globals.h>
 #endif
 
 #include <stdlib.h>
diff --git a/cmd/dot/dot.vcxproj b/cmd/dot/dot.vcxproj
index 439a325b5..3d0224a67 100644
--- a/cmd/dot/dot.vcxproj
+++ b/cmd/dot/dot.vcxproj
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32_DLL;DEMAND_LOADING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -73,7 +73,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32_DLL;DEMAND_LOADING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>
diff --git a/cmd/dot/dot_builtins.c b/cmd/dot/dot_builtins.c
index 27e8c71fc..d02e75b90 100644
--- a/cmd/dot/dot_builtins.c
+++ b/cmd/dot/dot_builtins.c
@@ -13,7 +13,7 @@
 
 #include "config.h"
 
-#include "gvplugin.h"
+#include <gvc/gvplugin.h>
 
 #if defined(GVDLL) && !defined(ENABLE_LTDL)
 #define extern	__declspec(dllimport)
diff --git a/cmd/dot/no_builtins.c b/cmd/dot/no_builtins.c
index 205009345..eeb5110a2 100644
--- a/cmd/dot/no_builtins.c
+++ b/cmd/dot/no_builtins.c
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "gvplugin.h"
+#include <gvc/gvplugin.h>
 
 lt_symlist_t lt_preloaded_symbols[] = { { 0, 0 } };
 
-- 
2.40.0