From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 15 Aug 2020 19:42:14 +0000 (-0700)
Subject: disambiguate lib/common/*.c #includes
X-Git-Tag: 2.46.0~20^2^2~90^2~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=83964dcb6721a37d8e6c92b58b84d9992c048e2a;p=graphviz

disambiguate lib/common/*.c #includes

Related to #1242 and #1785.
---

diff --git a/lib/common/CMakeLists.txt b/lib/common/CMakeLists.txt
index fa9b302d2..5fee446c0 100644
--- a/lib/common/CMakeLists.txt
+++ b/lib/common/CMakeLists.txt
@@ -15,24 +15,6 @@ add_custom_command(
 
 add_definitions(-DGVC_EXPORTS -D_BLD_gvc=1)
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${TOP_SOURCE_DIR}
-    ${GRAPHVIZ_LIB_DIR}/cdt
-    ${GRAPHVIZ_LIB_DIR}/cgraph
-    ${GRAPHVIZ_LIB_DIR}/gvc
-    ${GRAPHVIZ_LIB_DIR}/label
-    ${GRAPHVIZ_LIB_DIR}/pack
-    ${GRAPHVIZ_LIB_DIR}/pathplan
-    ${GRAPHVIZ_LIB_DIR}/fdpgen
-    ${GRAPHVIZ_LIB_DIR}/xdot
-)
-
-if (WIN32)
-    include_directories(${WINDOWS_DEPENDENCY_DIR}/include)
-endif()
-
 # Generate colortbl.h from sources
 add_custom_command(
     OUTPUT svgcolor_lib
@@ -135,6 +117,24 @@ add_library(common STATIC
     ${BISON_HTMLparse_OUTPUTS}
 )
 
+target_include_directories(common PRIVATE
+    ${GRAPHVIZ_LIB_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${GRAPHVIZ_LIB_DIR}/cdt
+    ${GRAPHVIZ_LIB_DIR}/cgraph
+    ${GRAPHVIZ_LIB_DIR}/gvc
+    ${GRAPHVIZ_LIB_DIR}/label
+    ${GRAPHVIZ_LIB_DIR}/pack
+    ${GRAPHVIZ_LIB_DIR}/pathplan
+    ${GRAPHVIZ_LIB_DIR}/fdpgen
+    ${GRAPHVIZ_LIB_DIR}/xdot
+)
+
+if (WIN32)
+    target_include_directories(common PRIVATE ${WINDOWS_DEPENDENCY_DIR}/include)
+endif()
+
 # From https://gitlab.com/graphviz/graphviz/-/issues/1613 @mdwies 20093010
 if(APPLE)
     target_compile_options(common PRIVATE "-fno-common")
diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am
index fdc8f42c6..2e2049c9a 100644
--- a/lib/common/Makefile.am
+++ b/lib/common/Makefile.am
@@ -2,6 +2,7 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/lib \
         -I$(top_srcdir)/libltdl \
 	-I$(top_srcdir)/lib/gvc \
 	-I$(top_srcdir)/lib/pack \
diff --git a/lib/common/args.c b/lib/common/args.c
index 902656f9c..716bd5115 100644
--- a/lib/common/args.c
+++ b/lib/common/args.c
@@ -21,10 +21,10 @@
  */
 
 #include <ctype.h>
-#include "render.h"
-#include "tlayout.h"
-#include "gvc.h"
-#include "fdp.h"
+#include <common/render.h>
+#include <fdpgen/tlayout.h>
+#include <gvc/gvc.h>
+#include <fdpgen/fdp.h>
 
 /* neato_extra_args:
  * Handle special neato arguments.
diff --git a/lib/common/arrows.c b/lib/common/arrows.c
index 8e59496ec..1bc16c231 100644
--- a/lib/common/arrows.c
+++ b/lib/common/arrows.c
@@ -12,7 +12,7 @@
  *************************************************************************/
 
 
-#include "render.h"
+#include <common/render.h>
 
 #define EPSILON .0001
 
diff --git a/lib/common/colxlate.c b/lib/common/colxlate.c
index a773677b4..74e7169a1 100644
--- a/lib/common/colxlate.c
+++ b/lib/common/colxlate.c
@@ -22,12 +22,12 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "arith.h"
-#include "color.h"
-#include "colorprocs.h"
+#include <common/arith.h>
+#include <common/color.h>
+#include <common/colorprocs.h>
 #include "colortbl.h"
-#include "memory.h"
-#include "strcasecmp.h"
+#include <common/memory.h>
+#include <cgraph/strcasecmp.h>
 
 static char* colorscheme;
 
diff --git a/lib/common/diagen.c b/lib/common/diagen.c
index 15d563b4c..f7da76a95 100644
--- a/lib/common/diagen.c
+++ b/lib/common/diagen.c
@@ -13,7 +13,7 @@
 
 #include "config.h"
 
-#include "render.h"
+#include <common/render.h>
 
 #include <stdarg.h>
 #ifdef HAVE_UNISTD_H
diff --git a/lib/common/ellipse.c b/lib/common/ellipse.c
index 538e7ff94..4362990ce 100644
--- a/lib/common/ellipse.c
+++ b/lib/common/ellipse.c
@@ -77,8 +77,8 @@ typedef struct Ppoly_t {
 
 typedef Ppoly_t Ppolyline_t;
 #else
-#include "render.h"
-#include "pathplan.h"
+#include <common/render.h>
+#include <pathplan/pathplan.h>
 #endif
 
 #define TWOPI (2*M_PI)
diff --git a/lib/common/emit.c b/lib/common/emit.c
index 29d9a19be..8ae88d51e 100644
--- a/lib/common/emit.c
+++ b/lib/common/emit.c
@@ -20,12 +20,12 @@
 #include <string.h>
 #include <ctype.h>
 #include <locale.h>
-#include "render.h"
-#include "agxbuf.h"
-#include "htmltable.h"
-#include "gvc.h"
-#include "cdt.h"
-#include "xdot.h"
+#include <common/render.h>
+#include <cgraph/agxbuf.h>
+#include <common/htmltable.h>
+#include <gvc/gvc.h>
+#include <cdt/cdt.h>
+#include <xdot/xdot.h>
 
 #ifdef _WIN32
 #define strtok_r strtok_s
diff --git a/lib/common/geom.c b/lib/common/geom.c
index 46f6dfcca..40dccd459 100644
--- a/lib/common/geom.c
+++ b/lib/common/geom.c
@@ -16,8 +16,8 @@
 
 #include "config.h"
 
-#include "geom.h"
-#include "geomprocs.h"
+#include <common/geom.h>
+#include <common/geomprocs.h>
 #ifdef _WIN32
 #define inline 
 #endif
diff --git a/lib/common/globals.c b/lib/common/globals.c
index 47067fc45..ccfbae0d0 100644
--- a/lib/common/globals.c
+++ b/lib/common/globals.c
@@ -14,9 +14,9 @@
 #include "config.h"
 
 #define EXTERN
-#include "types.h"
-#include "globals.h"
-#include "fdp.h"
+#include <common/types.h>
+#include <common/globals.h>
+#include <fdpgen/fdp.h>
 
 /* Default layout values, possibly set via command line; -1 indicates unset */
 static fdpParms_t fdpParms = {
diff --git a/lib/common/hpglgen.c b/lib/common/hpglgen.c
index da9667850..746220e67 100644
--- a/lib/common/hpglgen.c
+++ b/lib/common/hpglgen.c
@@ -16,7 +16,7 @@
  *  Use encoded form for polyline and polygon
  */
 #include <ctype.h>
-#include "render.h"
+#include <common/render.h>
 
 #define SOLID  0
 #define DOTTED 1
diff --git a/lib/common/htmllex.c b/lib/common/htmllex.c
index 2ad4c558a..a4c865913 100644
--- a/lib/common/htmllex.c
+++ b/lib/common/htmllex.c
@@ -12,13 +12,13 @@
  *************************************************************************/
 
 
-#include "render.h"
-#include "htmltable.h"
+#include <common/render.h>
+#include <common/htmltable.h>
 #include "htmlparse.h"
-#include "htmllex.h"
-#include "cdt.h"
+#include <common/htmllex.h>
+#include <cdt/cdt.h>
 #include <ctype.h>
-#include "strcasecmp.h"
+#include <cgraph/strcasecmp.h>
 
 #ifdef HAVE_EXPAT
 #include <expat.h>
diff --git a/lib/common/htmlparse.y b/lib/common/htmlparse.y
index ef11e382d..6e92deeb7 100644
--- a/lib/common/htmlparse.y
+++ b/lib/common/htmlparse.y
@@ -13,9 +13,9 @@
 
 %{
 
-#include "render.h"
-#include "htmltable.h"
-#include "htmllex.h"
+#include <common/render.h>
+#include <common/htmltable.h>
+#include <common/htmllex.h>
 
 extern int yyparse(void);
 
diff --git a/lib/common/htmltable.c b/lib/common/htmltable.c
index 6775abb2a..39750dac9 100644
--- a/lib/common/htmltable.c
+++ b/lib/common/htmltable.c
@@ -32,13 +32,13 @@
  */
 
 #include <assert.h>
-#include "render.h"
-#include "htmltable.h"
-#include "agxbuf.h"
-#include "pointset.h"
-#include "intset.h"
-#include "cdt.h"
-#include "strcasecmp.h"
+#include <common/render.h>
+#include <common/htmltable.h>
+#include <cgraph/agxbuf.h>
+#include <common/pointset.h>
+#include <common/intset.h>
+#include <cdt/cdt.h>
+#include <cgraph/strcasecmp.h>
 
 #define DEFAULT_BORDER    1
 #define DEFAULT_CELLPADDING  2
diff --git a/lib/common/input.c b/lib/common/input.c
index a2eb4e1f6..6b91cb58d 100644
--- a/lib/common/input.c
+++ b/lib/common/input.c
@@ -12,12 +12,12 @@
  *************************************************************************/
 
 #include <ctype.h>
-#include "render.h"
-#include "htmltable.h"
-#include "gvc.h"
-#include "xdot.h"
-#include "agxbuf.h"
-#include "strcasecmp.h"
+#include <common/render.h>
+#include <common/htmltable.h>
+#include <gvc/gvc.h>
+#include <xdot/xdot.h>
+#include <cgraph/agxbuf.h>
+#include <cgraph/strcasecmp.h>
 
 static char *usageFmt =
     "Usage: %s [-Vv?] [-(GNE)name=val] [-(KTlso)<val>] <dot files>\n";
diff --git a/lib/common/intset.c b/lib/common/intset.c
index edd3e3fbb..138e0272d 100644
--- a/lib/common/intset.c
+++ b/lib/common/intset.c
@@ -14,8 +14,8 @@
 #include "config.h"
 
 #include <stddef.h>
-#include <intset.h>
-#include <memory.h>
+#include <common/intset.h>
+#include <common/memory.h>
 
 static void*
 mkIntItem(Dt_t* d,intitem* obj,Dtdisc_t* disc)
diff --git a/lib/common/labels.c b/lib/common/labels.c
index 9be55d809..e2d666ea3 100644
--- a/lib/common/labels.c
+++ b/lib/common/labels.c
@@ -11,9 +11,9 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "agxbuf.h"
-#include "render.h"
-#include "htmltable.h"
+#include <cgraph/agxbuf.h>
+#include <common/render.h>
+#include <common/htmltable.h>
 #include <limits.h>
 
 static char *strdup_and_subst_obj0 (char *str, void *obj, int escBackslash);
diff --git a/lib/common/memory.c b/lib/common/memory.c
index 53bb083af..1c31af2c8 100644
--- a/lib/common/memory.c
+++ b/lib/common/memory.c
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "memory.h"
+#include <common/memory.h>
 
 void *zmalloc(size_t nbytes)
 {
diff --git a/lib/common/mifgen.c b/lib/common/mifgen.c
index de0171184..c82c4bd3b 100644
--- a/lib/common/mifgen.c
+++ b/lib/common/mifgen.c
@@ -12,8 +12,8 @@
  *************************************************************************/
 
 
-#include "render.h"
-#include "strcasecmp.h"
+#include <common/render.h>
+#include <cgraph/strcasecmp.h>
 
 #define	NONE	0
 #define	NODE	1
diff --git a/lib/common/mpgen.c b/lib/common/mpgen.c
index cf8d26a57..189fd45c3 100644
--- a/lib/common/mpgen.c
+++ b/lib/common/mpgen.c
@@ -14,7 +14,7 @@
 /* mpgen.c 1999-Feb-23 Jim Hefferon jim@joshua.smcvt.edu 
  *  Adapted from psgen.c.  See 1st_read.mp.
  */
-#include "render.h"
+#include <common/render.h>
 #ifndef _WIN32
 #include <unistd.h>
 #endif
diff --git a/lib/common/ns.c b/lib/common/ns.c
index 4869272f7..a0de10ab7 100644
--- a/lib/common/ns.c
+++ b/lib/common/ns.c
@@ -16,7 +16,7 @@
  * Network Simplex Algorithm for Ranking Nodes of a DAG
  */
 
-#include "render.h"
+#include <common/render.h>
 #include <setjmp.h>
 
 static int init_graph(graph_t *);
diff --git a/lib/common/output.c b/lib/common/output.c
index c4d32b83d..9d9e6769b 100644
--- a/lib/common/output.c
+++ b/lib/common/output.c
@@ -11,8 +11,8 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "render.h"
-#include "agxbuf.h"
+#include <common/render.h>
+#include <cgraph/agxbuf.h>
 #include <stdarg.h>
 #include <string.h>
 
diff --git a/lib/common/picgen.c b/lib/common/picgen.c
index c963fdc40..e0dd695b9 100644
--- a/lib/common/picgen.c
+++ b/lib/common/picgen.c
@@ -12,7 +12,7 @@
  *************************************************************************/
 
 
-#include "render.h"
+#include <common/render.h>
 
 #define PIC_COORDS_PER_LINE (16)	/* to avoid stdio BUF overflow */
 
diff --git a/lib/common/pointset.c b/lib/common/pointset.c
index 257d189d2..949e3557d 100644
--- a/lib/common/pointset.c
+++ b/lib/common/pointset.c
@@ -12,8 +12,8 @@
  *************************************************************************/
 
 
-#include "render.h"
-#include "pointset.h"
+#include <common/render.h>
+#include <common/pointset.h>
 
 typedef struct {
     Dtlink_t link;
diff --git a/lib/common/postproc.c b/lib/common/postproc.c
index 104ab458e..9aefb1c2f 100644
--- a/lib/common/postproc.c
+++ b/lib/common/postproc.c
@@ -12,8 +12,8 @@
  *************************************************************************/
 
 
-#include "render.h"
-#include "xlabels.h"
+#include <common/render.h>
+#include <label/xlabels.h>
 
 static int Rankdir;
 static boolean Flip;
diff --git a/lib/common/psusershape.c b/lib/common/psusershape.c
index d33bca46f..6be0f84a3 100644
--- a/lib/common/psusershape.c
+++ b/lib/common/psusershape.c
@@ -17,9 +17,9 @@
 
 #include <sys/stat.h>
 
-#include "render.h"
-#include "gvio.h"
-#include "strcasecmp.h"
+#include <common/render.h>
+#include <gvc/gvio.h>
+#include <cgraph/strcasecmp.h>
 
 static int N_EPSF_files;
 static Dict_t *EPSF_contents;
diff --git a/lib/common/routespl.c b/lib/common/routespl.c
index 44b733c31..390059c6a 100644
--- a/lib/common/routespl.c
+++ b/lib/common/routespl.c
@@ -13,9 +13,9 @@
 
 #include "config.h"
 
-#include "render.h"
+#include <common/render.h>
 #include <math.h>
-#include "pathplan.h"
+#include <pathplan/pathplan.h>
 #include <setjmp.h>
 #include <stdlib.h>
 
diff --git a/lib/common/shapes.c b/lib/common/shapes.c
index 9dca9ba6e..2a6a32b58 100644
--- a/lib/common/shapes.c
+++ b/lib/common/shapes.c
@@ -11,8 +11,8 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "render.h"
-#include "htmltable.h"
+#include <common/render.h>
+#include <common/htmltable.h>
 #include <limits.h>
 
 #define RBCONST 12
diff --git a/lib/common/splines.c b/lib/common/splines.c
index 66d7e5558..b232bd79c 100644
--- a/lib/common/splines.c
+++ b/lib/common/splines.c
@@ -17,7 +17,7 @@
  */
 
 #include <math.h>
-#include "render.h"
+#include <common/render.h>
 
 #ifdef DEBUG
 static int debugleveln(edge_t* e, int i)
diff --git a/lib/common/taper.c b/lib/common/taper.c
index fe0ca4c80..6c634d3e3 100644
--- a/lib/common/taper.c
+++ b/lib/common/taper.c
@@ -21,10 +21,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <types.h>
-#include <memory.h>
-#include <logic.h>
-#include <agxbuf.h>
-#include <utils.h>
+#include <common/memory.h>
+#include <common/logic.h>
+#include <cgraph/agxbuf.h>
+#include <common/utils.h>
 
   /* sample point size; should be dynamic based on dpi or under user control */
 #define BEZIERSUBDIVISION 20
diff --git a/lib/common/textspan.c b/lib/common/textspan.c
index 8e6b0fd57..8038eaa03 100644
--- a/lib/common/textspan.c
+++ b/lib/common/textspan.c
@@ -14,9 +14,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "cdt.h"
-#include "render.h"
-#include "strcasecmp.h"
+#include <cdt/cdt.h>
+#include <common/render.h>
+#include <cgraph/strcasecmp.h>
 
 static double timesFontWidth[] = {
     0.2500, 0.2500, 0.2500, 0.2500, 0.2500, 0.2500, 0.2500, 0.2500,	/*          */
diff --git a/lib/common/timing.c b/lib/common/timing.c
index dc684d290..bc23c7654 100644
--- a/lib/common/timing.c
+++ b/lib/common/timing.c
@@ -30,8 +30,8 @@ typedef struct tms mytime_t;
 #else
 
 #include	<time.h>
-#include "render.h"
-#include    "utils.h"
+#include <common/render.h>
+#include    <common/utils.h>
 
 typedef clock_t mytime_t;
 #define GET_TIME(S) S = clock()
diff --git a/lib/common/utils.c b/lib/common/utils.c
index 35efa9733..e92629506 100644
--- a/lib/common/utils.c
+++ b/lib/common/utils.c
@@ -11,14 +11,14 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "render.h"
-#include "agxbuf.h"
-#include "htmltable.h"
-#include "entities.h"
-#include "logic.h"
+#include <common/render.h>
+#include <cgraph/agxbuf.h>
+#include <common/htmltable.h>
+#include <common/entities.h>
+#include <common/logic.h>
 #include <math.h>
-#include "gvc.h"
-#include "strcasecmp.h"
+#include <gvc/gvc.h>
+#include <cgraph/strcasecmp.h>
 
 #ifdef _WIN32
 #define R_OK 4
diff --git a/lib/common/vtxgen.c b/lib/common/vtxgen.c
index 09de98b55..d079ebb5e 100644
--- a/lib/common/vtxgen.c
+++ b/lib/common/vtxgen.c
@@ -24,11 +24,11 @@
  */
 #define SUPPORT_WRITEDATE
 
-#include "render.h"
+#include <common/render.h>
 #ifdef SUPPORT_WRITEDATE
 #include <time.h>
 #endif
-#include "strcasecmp.h"
+#include <cgraph/strcasecmp.h>
 
 
 /* VTX font modifiers */
diff --git a/lib/gvc.vcxproj b/lib/gvc.vcxproj
index 64b88f898..1d51c05d8 100644
--- a/lib/gvc.vcxproj
+++ b/lib/gvc.vcxproj
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\GTK2\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir);$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\fdpgen;$(SolutionDir)lib\label;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\gvc;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\GTK2\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\fdpgen;$(SolutionDir)lib\label;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\gvc;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GVC_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -88,7 +88,7 @@ awk -f $(SolutionDir)awk\colortbl.awk color_lib &gt; common\colortbl.h</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\GTK2\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir);$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\fdpgen;$(SolutionDir)lib\label;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\gvc;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\GTK2\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\fdpgen;$(SolutionDir)lib\label;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\gvc;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;GVC_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>