disambiguate lib/gvc/*.c #includes

Related to #1242 and #1785.

diff --git a/lib/gvc/CMakeLists.txt b/lib/gvc/CMakeLists.txt
index 7f71db9ab7e38021b93b7281ab7ce1411dc12b79..156cceafd472a3f16e9ad140ba418d33491ff216 100644 (file)
--- a/lib/gvc/CMakeLists.txt
+++ b/lib/gvc/CMakeLists.txt
@@ -1,17 +1,5 @@
 add_definitions(-D_BLD_gvc=1 -DGVC_EXPORTS -DGVLIBDIR="${LIBRARY_INSTALL_DIR}/graphviz")
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${TOP_SOURCE_DIR}
-    ${GRAPHVIZ_LIB_DIR}/ast
-    ${GRAPHVIZ_LIB_DIR}/cdt
-    ${GRAPHVIZ_LIB_DIR}/cgraph
-    ${GRAPHVIZ_LIB_DIR}/common
-    ${GRAPHVIZ_LIB_DIR}/pathplan
-    ${LTDL_INCLUDE_DIRS}
-    ${RxSpencer_INCLUDE_DIRS}
-)
-
 add_library(gvc SHARED
     # Header files
     gvc.h
@@ -48,6 +36,19 @@ add_library(gvc SHARED
     gvc.def
 )
 
+target_include_directories(gvc PRIVATE
+    ${GRAPHVIZ_LIB_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${TOP_SOURCE_DIR}
+    ${GRAPHVIZ_LIB_DIR}/ast
+    ${GRAPHVIZ_LIB_DIR}/cdt
+    ${GRAPHVIZ_LIB_DIR}/cgraph
+    ${GRAPHVIZ_LIB_DIR}/common
+    ${GRAPHVIZ_LIB_DIR}/pathplan
+    ${LTDL_INCLUDE_DIRS}
+    ${RxSpencer_INCLUDE_DIRS}
+)
+
 target_link_libraries(gvc
     cdt
     cgraph

diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index f1de0c9676c69bef55f04fbe102cb5ffe0599fd2..bf4541b168db06662762e3e77935d7284abed47f 100644 (file)
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -7,6 +7,7 @@ pdfdir = $(pkgdatadir)/doc/pdf
 pkgconfigdir = $(libdir)/pkgconfig
 
 AM_CPPFLAGS = \
+       -I$(top_srcdir)/lib \
        -I$(top_srcdir)/lib/common \
        -I$(top_srcdir)/lib/pathplan \
        -I$(top_srcdir)/lib/cgraph \

diff --git a/lib/gvc/gvc.c b/lib/gvc/gvc.c
index 4af9dda04337f9a8b5721db61ed0dd330a2ac859..bc6607ca695bd1ac268b93205433b008b7f7646f 100644 (file)
--- a/lib/gvc/gvc.c
+++ b/lib/gvc/gvc.c
@@ -13,13 +13,13 @@
 
 #include "config.h"
 
-#include "gvc.h"
-#include "const.h"
-#include "gvcjob.h"
-#include "gvcint.h"
-#include "gvcproc.h"
-#include "gvconfig.h"
-#include "gvio.h"
+#include <gvc/gvc.h>
+#include <common/const.h>
+#include <gvc/gvcjob.h>
+#include <gvc/gvcint.h>
+#include <gvc/gvcproc.h>
+#include <gvc/gvconfig.h>
+#include <gvc/gvio.h>
 #include <stdlib.h>
 
 GVC_t *gvContext(void)

diff --git a/lib/gvc/gvconfig.c b/lib/gvc/gvconfig.c
index d2e3325b7feb9129cd69062a67a742f2b7c10151..78eecfa5b1a1644f76d17b5afd79ed1f7165d9d9 100644 (file)
--- a/lib/gvc/gvconfig.c
+++ b/lib/gvc/gvconfig.c
@@ -13,7 +13,7 @@
 
 #include "config.h"
 
-#include "gvconfig.h"
+#include <gvc/gvconfig.h>
 
 #include       <string.h>
 #include    <regex.h>
@@ -49,14 +49,14 @@ static int glob (GVC_t * gvc, char*, int, int (*errfunc)(const char *, int), glo
 #include <mach-o/dyld.h>
 #endif
 
-#include        "memory.h"
-#include        "const.h"
-#include        "types.h"
+#include        <common/memory.h>
+#include        <common/const.h>
+#include        <common/types.h>
 
-#include       "gvplugin.h"
-#include       "gvcjob.h"
-#include       "gvcint.h"
-#include        "gvcproc.h"
+#include       <gvc/gvplugin.h>
+#include       <gvc/gvcjob.h>
+#include       <gvc/gvcint.h>
+#include        <gvc/gvcproc.h>
 
 /* FIXME */
 extern Dt_t * textfont_dict_open(GVC_t *gvc);

diff --git a/lib/gvc/gvcontext.c b/lib/gvc/gvcontext.c
index c29d8e2eff7a48c22aa21171be47ef4a4a4bd4b9..cff05cdd6fa2139baee8ca08108125244f60b9eb 100644 (file)
--- a/lib/gvc/gvcontext.c
+++ b/lib/gvc/gvcontext.c
@@ -24,12 +24,12 @@
 #include <stdlib.h>
 
 #include "builddate.h"
-#include "types.h"
-#include "gvplugin.h"
-#include "gvcjob.h"
-#include "gvcint.h"
-#include "gvcproc.h"
-#include "gvc.h"
+#include <common/types.h>
+#include <gvc/gvplugin.h>
+#include <gvc/gvcjob.h>
+#include <gvc/gvcint.h>
+#include <gvc/gvcproc.h>
+#include <gvc/gvc.h>
 
 /* from common/utils.c */
 extern void *zmalloc(size_t);

diff --git a/lib/gvc/gvdevice.c b/lib/gvc/gvdevice.c
index c290e5cc2d2fde1e375885b4af373633405f8fce..0a995118677c295864fdd0219e7df76fb6c25c91 100644 (file)
--- a/lib/gvc/gvdevice.c
+++ b/lib/gvc/gvdevice.c
@@ -46,14 +46,14 @@ static unsigned int dfallocated;
 static uint64_t crc;
 #endif /* HAVE_LIBZ */
 
-#include "const.h"
-#include "memory.h"
-#include "gvplugin_device.h"
-#include "gvcjob.h"
-#include "gvcint.h"
-#include "gvcproc.h"
-#include "logic.h"
-#include "gvio.h"
+#include <common/const.h>
+#include <common/memory.h>
+#include <gvc/gvplugin_device.h>
+#include <gvc/gvcjob.h>
+#include <gvc/gvcint.h>
+#include <gvc/gvcproc.h>
+#include <common/logic.h>
+#include <gvc/gvio.h>
 
 static const int PAGE_ALIGN = 4095;            /* align to a 4K boundary (less one), typical for Linux, Mac OS X and Windows memory allocation */
 

diff --git a/lib/gvc/gvevent.c b/lib/gvc/gvevent.c
index 1cb2dbc5b011c61b3870c24d965a0d4f658c6a1b..f1a7ec62bd35755a80b4ec988b52e40d1960e40b 100644 (file)
--- a/lib/gvc/gvevent.c
+++ b/lib/gvc/gvevent.c
@@ -17,9 +17,9 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "gvplugin_layout.h"
-#include "gvcint.h"
-#include "gvcproc.h"
+#include <gvc/gvplugin_layout.h>
+#include <gvc/gvcint.h>
+#include <gvc/gvcproc.h>
 
 extern char *strdup_and_subst_obj(char *str, void * n);
 extern void emit_graph(GVJ_t * job, graph_t * g);

diff --git a/lib/gvc/gvjobs.c b/lib/gvc/gvjobs.c
index ec722b002f3fd3b89bc72618c4e24cd08b285616..f09b711f454029f63c5726399f60644232a59225 100644 (file)
--- a/lib/gvc/gvjobs.c
+++ b/lib/gvc/gvjobs.c
@@ -13,12 +13,12 @@
 
 #include "config.h"
 
-#include       "memory.h"
-#include       "types.h"
-#include        "gvplugin.h"
-#include        "gvcjob.h"
-#include        "gvcint.h"
-#include        "gvcproc.h"
+#include       <common/memory.h>
+#include       <common/types.h>
+#include        <gvc/gvplugin.h>
+#include        <gvc/gvcjob.h>
+#include        <gvc/gvcint.h>
+#include        <gvc/gvcproc.h>
 
 static GVJ_t *output_filename_job;
 static GVJ_t *output_langname_job;

diff --git a/lib/gvc/gvlayout.c b/lib/gvc/gvlayout.c
index 07b4a6705b120b06fa7dd9883e4fd2b8a77f788d..53baf446b36408b3821ab049c1b209216d0a9cc7 100644 (file)
--- a/lib/gvc/gvlayout.c
+++ b/lib/gvc/gvlayout.c
@@ -18,12 +18,12 @@
 
 #include "config.h"
 
-#include "const.h"
-#include "gvplugin_layout.h"
-#include "gvcint.h"
-#include "cgraph.h"
-#include "gvcproc.h"
-#include "gvc.h"
+#include <common/const.h>
+#include <gvc/gvplugin_layout.h>
+#include <gvc/gvcint.h>
+#include <cgraph/cgraph.h>
+#include <gvc/gvcproc.h>
+#include <gvc/gvc.h>
 
 extern void graph_init(Agraph_t *g, boolean use_rankdir);
 extern void graph_cleanup(Agraph_t *g);

diff --git a/lib/gvc/gvloadimage.c b/lib/gvc/gvloadimage.c
index 1bb4e83164b1b6d81721db92422df8b0be9414a7..ea119dde777adc2c1ab2cdba69463b19ce05f85b 100644 (file)
--- a/lib/gvc/gvloadimage.c
+++ b/lib/gvc/gvloadimage.c
@@ -21,13 +21,13 @@
 
 #include <string.h>
 
-#include "const.h"
-#include "gvplugin_loadimage.h"
-#include "gvcint.h"
-#include "gvcproc.h"
+#include <common/const.h>
+#include <gvc/gvplugin_loadimage.h>
+#include <gvc/gvcint.h>
+#include <gvc/gvcproc.h>
 
 /* for agerr() */
-#include "cgraph.h"
+#include <cgraph/cgraph.h>
 
 static int gvloadimage_select(GVJ_t * job, char *str)
 {

diff --git a/lib/gvc/gvplugin.c b/lib/gvc/gvplugin.c
index 51b1f75a37be74404d859167378f9b9bfbe5eb23..0fc60408ff00a780be366bcfc2b32ed9aec46085 100644 (file)
--- a/lib/gvc/gvplugin.c
+++ b/lib/gvc/gvplugin.c
@@ -26,17 +26,17 @@
 #include       <ltdl.h>
 #endif
 
-#include       <agxbuf.h>
-#include        "memory.h"
-#include        "types.h"
-#include        "gvplugin.h"
-#include        "gvcjob.h"
-#include        "gvcint.h"
-#include        "gvcproc.h"
-#include        "gvio.h"
-
-#include       "const.h"
-#include "strcasecmp.h"
+#include       <cgraph/agxbuf.h>
+#include        <common/memory.h>
+#include        <common/types.h>
+#include        <gvc/gvplugin.h>
+#include        <gvc/gvcjob.h>
+#include        <gvc/gvcint.h>
+#include        <gvc/gvcproc.h>
+#include        <gvc/gvio.h>
+
+#include       <common/const.h>
+#include <cgraph/strcasecmp.h>
 
 #ifdef _WIN32
 #define strdup(x) _strdup(x)

diff --git a/lib/gvc/gvrender.c b/lib/gvc/gvrender.c
index 8001cc0a21199c30b11b670fb7f0d0f36218432a..9a47173c40af2df0b74c19e682d2badb2149f128 100644 (file)
--- a/lib/gvc/gvrender.c
+++ b/lib/gvc/gvrender.c
@@ -20,17 +20,17 @@
 #include "config.h"
 
 #include <string.h>
-#include "memory.h"
-#include "const.h"
-#include "macros.h"
-#include "colorprocs.h"
-#include "gvplugin_render.h"
-#include "cgraph.h"
-#include "gvcint.h"
-#include "geom.h"
-#include "geomprocs.h"
-#include "gvcproc.h"
-#include "strcasecmp.h"
+#include <common/memory.h>
+#include <common/const.h>
+#include <common/macros.h>
+#include <common/colorprocs.h>
+#include <gvc/gvplugin_render.h>
+#include <cgraph/cgraph.h>
+#include <gvc/gvcint.h>
+#include <common/geom.h>
+#include <common/geomprocs.h>
+#include <gvc/gvcproc.h>
+#include <cgraph/strcasecmp.h>
 
 extern int emit_once(char *str);
 extern shape_desc *find_user_shape(char *name);

diff --git a/lib/gvc/gvtextlayout.c b/lib/gvc/gvtextlayout.c
index 96a569987d7194970946b1ecf78c7024db3c49fe..4b46f2057e032c2ff20d11abd75acd86e8ba0ef3 100644 (file)
--- a/lib/gvc/gvtextlayout.c
+++ b/lib/gvc/gvtextlayout.c
@@ -17,10 +17,10 @@
 
 #include "config.h"
 
-#include "const.h"
-#include "gvplugin_textlayout.h"
-#include "gvcint.h"
-#include "gvcproc.h"
+#include <common/const.h>
+#include <gvc/gvplugin_textlayout.h>
+#include <gvc/gvcint.h>
+#include <gvc/gvcproc.h>
 
 int gvtextlayout_select(GVC_t * gvc)
 {

diff --git a/lib/gvc/gvtool_tred.c b/lib/gvc/gvtool_tred.c
index 763a79d9add1b61e2a6b455c79fc833009372a6d..8931ba52dc6abed2b262fd50985979ea61d6cd40 100644 (file)
--- a/lib/gvc/gvtool_tred.c
+++ b/lib/gvc/gvtool_tred.c
@@ -24,8 +24,8 @@
 
 #include "config.h"
 #include <stdio.h>
-#include "cgraph.h"
-#include "gvc.h"
+#include <cgraph/cgraph.h>
+#include <gvc/gvc.h>
 
 typedef struct {
     Agrec_t h;

diff --git a/lib/gvc/gvusershape.c b/lib/gvc/gvusershape.c
index c793b4b2ca61e67f52d6c139071459f19c8b214f..bf3267a990738e866705f617f71773a6aaab8ce5 100644 (file)
--- a/lib/gvc/gvusershape.c
+++ b/lib/gvc/gvusershape.c
@@ -29,14 +29,14 @@
 #endif
 
 #include <regex.h>
-#include "types.h"
-#include "logic.h"
-#include "memory.h"
-#include "agxbuf.h"
+#include <common/types.h>
+#include <common/logic.h>
+#include <common/memory.h>
+#include <cgraph/agxbuf.h>
 
 #define _BLD_gvc 1
-#include "utils.h"
-#include "gvplugin_loadimage.h"
+#include <common/utils.h>
+#include <gvc/gvplugin_loadimage.h>
 
 extern char *Gvimagepath;
 extern char *HTTPServerEnVar;