From dca22c0656e8b0d723f2e0fb0e71f2f7b62bbe3f Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Fri, 21 Aug 2020 19:54:55 -0700
Subject: [PATCH] disambiguate lib/patchwork/*.c #includes

Related to #1785.
---
 lib/patchwork/CMakeLists.txt      | 25 +++++++++++++------------
 lib/patchwork/Makefile.am         |  1 +
 lib/patchwork/gvpatchwork.vcxproj |  4 ++--
 lib/patchwork/patchwork.c         |  6 +++---
 lib/patchwork/patchworkinit.c     |  8 ++++----
 lib/patchwork/tree_map.c          |  4 ++--
 6 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/lib/patchwork/CMakeLists.txt b/lib/patchwork/CMakeLists.txt
index 3e1b5fbe5..6cb7f69ee 100644
--- 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 c74079193..e055cb173 100644
--- 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 0481ad60d..1009ff227 100644
--- 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 6450906f9..d0a2c689c 100644
--- 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 3e49161f3..e4480e754 100644
--- 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 baa2073d2..cb1fa6230 100644
--- 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){
-- 
2.50.1