From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 5 Nov 2022 15:37:23 +0000 (-0700)
Subject: prune: disambiguate #includes
X-Git-Tag: 7.0.2~17^2~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=76fc65211ce08f154cb1c17c154dd65574a3c787;p=graphviz

prune: disambiguate #includes
---

diff --git a/contrib/prune/Makefile.am b/contrib/prune/Makefile.am
index 7042c192d..66c0bb908 100644
--- a/contrib/prune/Makefile.am
+++ b/contrib/prune/Makefile.am
@@ -2,6 +2,7 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
+	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/ingraphs \
 	-I$(top_srcdir)/lib/cgraph \
 	-I$(top_srcdir)/lib/cdt
diff --git a/contrib/prune/generic_list.c b/contrib/prune/generic_list.c
index 32bc73796..afe464fc0 100644
--- a/contrib/prune/generic_list.c
+++ b/contrib/prune/generic_list.c
@@ -14,7 +14,7 @@
 #include <inttypes.h>
 #include <errno.h>
 
-#include <generic_list.h>
+#include "generic_list.h"
 
 #define DFLT_SIZE 100
 
diff --git a/contrib/prune/prune.c b/contrib/prune/prune.c
index b8722ebad..3f9fca402 100644
--- a/contrib/prune/prune.c
+++ b/contrib/prune/prune.c
@@ -15,9 +15,9 @@
 
 #include <getopt.h>
 
-#include "cgraph.h"
-#include "exit.h"
-#include "ingraphs.h"
+#include <cgraph/cgraph.h>
+#include <cgraph/exit.h>
+#include <ingraphs/ingraphs.h>
 #include "generic_list.h"
 
 /* structure to hold an attribute specified on the commandline */
diff --git a/contrib/prune/prune.vcxproj b/contrib/prune/prune.vcxproj
index 8431eda98..c69c03f17 100644
--- a/contrib/prune/prune.vcxproj
+++ b/contrib/prune/prune.vcxproj
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\vcpkg\installed\x86-windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\vcpkg\installed\x86-windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -75,7 +75,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\vcpkg\installed\x86-windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\vcpkg\installed\x86-windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>