prune: disambiguate #includes

diff --git a/contrib/prune/Makefile.am b/contrib/prune/Makefile.am
index 7042c192d4250cdead1226a2d54008a90a831085..66c0bb908833b407b0096633459850136c9e696e 100644 (file)
--- 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 32bc73796279d45ba5b833ca9d339b07afd1ccc4..afe464fc013d17b65060af6a31c05cac3e853b6a 100644 (file)
--- 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 b8722ebadc8bf89b341f37fba09cefc3b3a0cabe..3f9fca402ee2efe7450130513fb6dbdd2ad5ccc5 100644 (file)
--- 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 8431eda98906bb233aebc09edbb685408327bb64..c69c03f1778e2a346f2b83fcef2520db6589722e 100644 (file)
--- 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>