From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Mon, 24 Aug 2020 00:27:04 +0000 (-0700)
Subject: disambiguate cmd/mingle #includes
X-Git-Tag: 2.46.0~20^2^2~79^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=230c19aeb4689886dc55e93a5e2fd390c04478ab;p=graphviz

disambiguate cmd/mingle #includes

Related to #1785.
---

diff --git a/cmd/mingle/Makefile.am b/cmd/mingle/Makefile.am
index 1e71930c1..32c209784 100644
--- a/cmd/mingle/Makefile.am
+++ b/cmd/mingle/Makefile.am
@@ -4,6 +4,7 @@
 pdfdir = $(pkgdatadir)/doc/pdf
 
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/sparse \
 	-I$(top_srcdir)/lib/sfdpgen \
 	-I$(top_srcdir)/lib/mingle \
diff --git a/cmd/mingle/mingle.vcxproj b/cmd/mingle/mingle.vcxproj
index 42130c8f4..a14549514 100644
--- a/cmd/mingle/mingle.vcxproj
+++ b/cmd/mingle/mingle.vcxproj
@@ -54,7 +54,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\mingle;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\mingle;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -78,7 +78,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\mingle;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\mingle;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader />
diff --git a/cmd/mingle/minglemain.c b/cmd/mingle/minglemain.c
index 581a530e8..31013c650 100644
--- a/cmd/mingle/minglemain.c
+++ b/cmd/mingle/minglemain.c
@@ -10,15 +10,15 @@
 
 #include "config.h"
 
-#include <cgraph.h>
-#include <agxbuf.h>
-#include <ingraphs.h>
-#include <pointset.h>
+#include <cgraph/cgraph.h>
+#include <cgraph/agxbuf.h>
+#include <ingraphs/ingraphs.h>
+#include <common/pointset.h>
 #include <getopt.h>
 
-#include "DotIO.h"
-#include "edge_bundling.h"
-#include "nearest_neighbor_graph.h"
+#include <sparse/DotIO.h>
+#include <mingle/edge_bundling.h>
+#include <mingle/nearest_neighbor_graph.h>
 
 typedef enum {
 	FMT_GV,