disambiguate lib/patchwork/*.c #includes

Related to #1785.

diff --git a/lib/patchwork/CMakeLists.txt b/lib/patchwork/CMakeLists.txt
index 3e1b5fbe578c64219a7ac2365da8470c96896283..6cb7f69eeecadd76cb7e5773a8c069aa7a5cada2 100644 (file)
--- a/lib/patchwork/CMakeLists.txt
+++ b/lib/patchwork/CMakeLists.txt
@@ -1,4 +1,16 @@
-include_directories(
+add_library(patchwork STATIC
+    # Header files
+    patchwork.h
+    tree_map.h
+
+    # Source files
+    patchwork.c
+    patchworkinit.c
+    tree_map.c
+)
+
+target_include_directories(patchwork PRIVATE
+    ${GRAPHVIZ_LIB_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${GRAPHVIZ_LIB_DIR}/cdt
     ${GRAPHVIZ_LIB_DIR}/cgraph
@@ -10,14 +22,3 @@ include_directories(
     ${GRAPHVIZ_LIB_DIR}/pathplan
     ${GRAPHVIZ_LIB_DIR}/sparse
 )
-
-add_library(patchwork STATIC
-    # Header files
-    patchwork.h
-    tree_map.h
-
-    # Source files
-    patchwork.c
-    patchworkinit.c
-    tree_map.c
-)

diff --git a/lib/patchwork/Makefile.am b/lib/patchwork/Makefile.am
index c74079193fb89662972a28806d994ea578662f2b..e055cb1734546f348077fe1a965f8d3d07c1fabd 100644 (file)
--- a/lib/patchwork/Makefile.am
+++ b/lib/patchwork/Makefile.am
@@ -2,6 +2,7 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
+       -I$(top_srcdir)/lib \
         -I$(top_srcdir)/lib/common \
        -I$(top_srcdir)/lib/gvc \
        -I$(top_srcdir)/lib/neatogen \

diff --git a/lib/patchwork/gvpatchwork.vcxproj b/lib/patchwork/gvpatchwork.vcxproj
index 0481ad60df7ea3adf220d7e4ab2c8c4263653551..1009ff227620647129976c245efa075faeb48970 100644 (file)
--- a/lib/patchwork/gvpatchwork.vcxproj
+++ b/lib/patchwork/gvpatchwork.vcxproj
@@ -52,7 +52,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\fdpgen;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\fdpgen;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -67,7 +67,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\fdpgen;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\fdpgen;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/patchwork/patchwork.c b/lib/patchwork/patchwork.c
index 6450906f9ef2803f06a677c60d5df83e74620c2e..d0a2c689cb94371bdc31061d900ee1748ea86617 100644 (file)
--- a/lib/patchwork/patchwork.c
+++ b/lib/patchwork/patchwork.c
@@ -13,9 +13,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <patchwork.h>
-#include <tree_map.h>
-#include "render.h"
+#include <patchwork/patchwork.h>
+#include <patchwork/tree_map.h>
+#include <common/render.h>
 
 typedef struct treenode_t treenode_t;
 struct treenode_t {

diff --git a/lib/patchwork/patchworkinit.c b/lib/patchwork/patchworkinit.c
index 3e49161f3911bffdeb67716b17f5a88f3a3fc778..e4480e7547e964057e078e34aa0a0db586eddfd8 100644 (file)
--- a/lib/patchwork/patchworkinit.c
+++ b/lib/patchwork/patchworkinit.c
@@ -11,10 +11,10 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include    "patchwork.h"
-#include    "adjust.h"
-#include    "pack.h"
-#include    "neatoprocs.h"
+#include    <patchwork/patchwork.h>
+#include    <neatogen/adjust.h>
+#include    <pack/pack.h>
+#include    <neatogen/neatoprocs.h>
 
 /* the following code shamelessly copied from lib/fdpgen/layout.c
 and should be extracted and made into a common function */

diff --git a/lib/patchwork/tree_map.c b/lib/patchwork/tree_map.c
index baa2073d2b60fbcde4bb89070ca5e1433a5597d0..cb1fa623011d02f1faf4344655ed664971fc8158 100644 (file)
--- a/lib/patchwork/tree_map.c
+++ b/lib/patchwork/tree_map.c
@@ -11,8 +11,8 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "render.h"
-#include "tree_map.h"
+#include <common/render.h>
+#include <patchwork/tree_map.h>
 
 static void squarify(int n, real *area, rectangle *recs, int nadded, real maxarea, real minarea, real totalarea,
                     real asp, rectangle fillrec){