disambiguate cmd/dot #includes

Related to #1785.

diff --git a/cmd/dot/CMakeLists.txt b/cmd/dot/CMakeLists.txt
index 78640068b23e88c9d4f2d39b972ad5d26a8268d3..4fcf9fcff3002c8642b5e522ab401a7825bd09d1 100644 (file)
--- 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 7662304e1fc7b1c19b03a9d97a2c14a5f39118ab..9c9084cc5c27fd423b7f8d33a049532bbad5bc66 100644 (file)
--- 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 04baa9eeaf1aa89f39869656ff76ee54733bb5f2..631448663307c0991d4f66182767f07078c99dba 100644 (file)
--- 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 439a325b54637943347f83792d953dd8ff5b5481..3d0224a672bd32c33532beb6bb3ed56f6f47aea3 100644 (file)
--- 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 27e8c71fca7be359ce70fd24dbbc5c86c2aa9ce1..d02e75b9047242cac17429a5933709df70f334b7 100644 (file)
--- 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 20500934520e46cd8055fdf4b6987986e4d530b6..eeb5110a28df732243f527a35c800e4466f70e7e 100644 (file)
--- 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 } };