From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 16 Aug 2020 22:35:15 +0000 (-0700)
Subject: disambiguate lib/fdpgen/*.c #includes
X-Git-Tag: 2.46.0~20^2^2~90^2~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=63d25585dd19cd9340a313244f4d668dc76dc87e;p=graphviz

disambiguate lib/fdpgen/*.c #includes

Related to #1785.
---

diff --git a/lib/fdpgen/CMakeLists.txt b/lib/fdpgen/CMakeLists.txt
index 992204232..dffbc1a83 100644
--- a/lib/fdpgen/CMakeLists.txt
+++ b/lib/fdpgen/CMakeLists.txt
@@ -1,15 +1,3 @@
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${GRAPHVIZ_LIB_DIR}/cdt
-    ${GRAPHVIZ_LIB_DIR}/cgraph
-    ${GRAPHVIZ_LIB_DIR}/common
-    ${GRAPHVIZ_LIB_DIR}/gvc
-    ${GRAPHVIZ_LIB_DIR}/neatogen
-    ${GRAPHVIZ_LIB_DIR}/pack
-    ${GRAPHVIZ_LIB_DIR}/pathplan
-    ${GRAPHVIZ_LIB_DIR}/sparse
-)
-
 add_library(fdpgen STATIC
     # Header files
     clusteredges.h
@@ -30,3 +18,16 @@ add_library(fdpgen STATIC
     tlayout.c
     xlayout.c
 )
+
+target_include_directories(fdpgen PRIVATE
+    ${GRAPHVIZ_LIB_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${GRAPHVIZ_LIB_DIR}/cdt
+    ${GRAPHVIZ_LIB_DIR}/cgraph
+    ${GRAPHVIZ_LIB_DIR}/common
+    ${GRAPHVIZ_LIB_DIR}/gvc
+    ${GRAPHVIZ_LIB_DIR}/neatogen
+    ${GRAPHVIZ_LIB_DIR}/pack
+    ${GRAPHVIZ_LIB_DIR}/pathplan
+    ${GRAPHVIZ_LIB_DIR}/sparse
+)
diff --git a/lib/fdpgen/Makefile.am b/lib/fdpgen/Makefile.am
index 4c5f5d4b9..d2f792e68 100644
--- a/lib/fdpgen/Makefile.am
+++ b/lib/fdpgen/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/fdpgen/clusteredges.c b/lib/fdpgen/clusteredges.c
index 11f04e907..db31a6c9d 100644
--- a/lib/fdpgen/clusteredges.c
+++ b/lib/fdpgen/clusteredges.c
@@ -23,11 +23,11 @@
 
 #include "config.h"
 
-#include <clusteredges.h>
-#include <fdp.h>
-#include <neatoprocs.h>
-#include "vispath.h"
-#include "pack.h"
+#include <fdpgen/clusteredges.h>
+#include <fdpgen/fdp.h>
+#include <neatogen/neatoprocs.h>
+#include <pathplan/vispath.h>
+#include <pack/pack.h>
 
 typedef struct {
     int cnt;
diff --git a/lib/fdpgen/comp.c b/lib/fdpgen/comp.c
index f16bcd7d6..591a5f988 100644
--- a/lib/fdpgen/comp.c
+++ b/lib/fdpgen/comp.c
@@ -23,9 +23,9 @@
 /* use PRIVATE interface */
 #define FDP_PRIVATE 1
 
-#include <fdp.h>
-#include <comp.h>
-#include <pack.h>
+#include <fdpgen/fdp.h>
+#include <fdpgen/comp.h>
+#include <pack/pack.h>
 #include <assert.h>
 
 #define MARK(n) (marks[ND_id(n)])
diff --git a/lib/fdpgen/dbg.c b/lib/fdpgen/dbg.c
index ca0a9693a..4460b664c 100644
--- a/lib/fdpgen/dbg.c
+++ b/lib/fdpgen/dbg.c
@@ -21,9 +21,9 @@
 
 #define FDP_PRIVATE
 
-#include <dbg.h>
-#include <neatoprocs.h>
-#include <fdp.h>
+#include <fdpgen/dbg.h>
+#include <neatogen/neatoprocs.h>
+#include <fdpgen/fdp.h>
 #include <math.h>
 
 static int indent = -1;
diff --git a/lib/fdpgen/fdpinit.c b/lib/fdpgen/fdpinit.c
index 81ab0754b..b18faff01 100644
--- a/lib/fdpgen/fdpinit.c
+++ b/lib/fdpgen/fdpinit.c
@@ -21,9 +21,9 @@
 /* uses PRIVATE interface */
 #define FDP_PRIVATE 1
 
-#include    "tlayout.h"
-#include    "neatoprocs.h"
-#include    "agxbuf.h"
+#include    <fdpgen/tlayout.h>
+#include    <neatogen/neatoprocs.h>
+#include    <cgraph/agxbuf.h>
 
 static void initialPositions(graph_t * g)
 {
diff --git a/lib/fdpgen/grid.c b/lib/fdpgen/grid.c
index 8a14e9cf8..ae01bc8cb 100644
--- a/lib/fdpgen/grid.c
+++ b/lib/fdpgen/grid.c
@@ -24,9 +24,9 @@
 /* uses PRIVATE interface for NOTUSED */
 #define FDP_PRIVATE 1
 
-#include <fdp.h>
-#include <grid.h>
-#include <macros.h>
+#include <fdpgen/fdp.h>
+#include <fdpgen/grid.h>
+#include <common/macros.h>
 
   /* structure for maintaining a free list of cells */
 typedef struct _block {
diff --git a/lib/fdpgen/gvfdpgen.vcxproj b/lib/fdpgen/gvfdpgen.vcxproj
index 3caabd266..826ea612d 100644
--- a/lib/fdpgen/gvfdpgen.vcxproj
+++ b/lib/fdpgen/gvfdpgen.vcxproj
@@ -51,7 +51,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\neatogen;$(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\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>
diff --git a/lib/fdpgen/layout.c b/lib/fdpgen/layout.c
index 24d9a0e71..9cb8cf129 100644
--- a/lib/fdpgen/layout.c
+++ b/lib/fdpgen/layout.c
@@ -35,13 +35,13 @@
 #include <limits.h>
 #include <inttypes.h>
 #include <assert.h>
-#include "tlayout.h"
-#include "neatoprocs.h"
-#include "adjust.h"
-#include "comp.h"
-#include "pack.h"
-#include "clusteredges.h"
-#include "dbg.h"
+#include <fdpgen/tlayout.h>
+#include <neatogen/neatoprocs.h>
+#include <neatogen/adjust.h>
+#include <fdpgen/comp.h>
+#include <pack/pack.h>
+#include <fdpgen/clusteredges.h>
+#include <fdpgen/dbg.h>
 #include <setjmp.h>
 
 static jmp_buf jbuf;
diff --git a/lib/fdpgen/tlayout.c b/lib/fdpgen/tlayout.c
index 524be3a71..be8deea45 100644
--- a/lib/fdpgen/tlayout.c
+++ b/lib/fdpgen/tlayout.c
@@ -39,9 +39,9 @@
 #include <unistd.h>
 #endif
 #include <ctype.h>
-#include <dbg.h>
-#include <grid.h>
-#include <neato.h>
+#include <fdpgen/dbg.h>
+#include <fdpgen/grid.h>
+#include <neatogen/neato.h>
 
 #ifndef HAVE_SRAND48
 #define srand48 srand
@@ -50,8 +50,8 @@
 extern double drand48(void);
 #endif
 
-#include "tlayout.h"
-#include "globals.h"
+#include <fdpgen/tlayout.h>
+#include <common/globals.h>
 
 #define D_useGrid   (fdp_parms->useGrid)
 #define D_useNew    (fdp_parms->useNew)
diff --git a/lib/fdpgen/xlayout.c b/lib/fdpgen/xlayout.c
index f93bcc33c..1348b48dc 100644
--- a/lib/fdpgen/xlayout.c
+++ b/lib/fdpgen/xlayout.c
@@ -27,9 +27,9 @@ Increase less between tries
 /* uses PRIVATE interface */
 #define FDP_PRIVATE 1
 
-#include <xlayout.h>
-#include <adjust.h>
-#include <dbg.h>
+#include <fdpgen/xlayout.h>
+#include <neatogen/adjust.h>
+#include <fdpgen/dbg.h>
 #include <ctype.h>
 
 /* Use bbox based force function */