From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 22 Aug 2020 01:46:43 +0000 (-0700)
Subject: disambiguate lib/pack/*.c #includes
X-Git-Tag: 2.46.0~20^2^2~90^2~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6896049eb6bd09e1b6166ae0f500b9b0c0020c36;p=graphviz

disambiguate lib/pack/*.c #includes

Related to #1785.
---

diff --git a/lib/pack/CMakeLists.txt b/lib/pack/CMakeLists.txt
index 890886295..54dc9523a 100644
--- a/lib/pack/CMakeLists.txt
+++ b/lib/pack/CMakeLists.txt
@@ -1,15 +1,5 @@
 add_definitions(-DGVC_EXPORTS)
 
-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}/pathplan
-)
-
 add_library(pack STATIC
     # Header files
     pack.h
@@ -19,6 +9,17 @@ add_library(pack STATIC
     pack.c
 )
 
+target_include_directories(pack 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}/pathplan
+)
+
 # Specify headers to be installed
 install(
     FILES pack.h
diff --git a/lib/pack/Makefile.am b/lib/pack/Makefile.am
index 085e2de81..a959fea8e 100644
--- a/lib/pack/Makefile.am
+++ b/lib/pack/Makefile.am
@@ -5,6 +5,7 @@ pdfdir = $(pkgdatadir)/doc/pdf
 #pkgconfigdir = $(libdir)/pkgconfig
 
 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/pack/ccomps.c b/lib/pack/ccomps.c
index ce88da109..2726e5851 100644
--- a/lib/pack/ccomps.c
+++ b/lib/pack/ccomps.c
@@ -15,8 +15,8 @@
 #include <ctype.h>
 #include <setjmp.h>
 #include <stdlib.h>
-#include "render.h"
-#include "pack.h"
+#include <common/render.h>
+#include <pack/pack.h>
 
 static jmp_buf jbuf;
 
diff --git a/lib/pack/pack.c b/lib/pack/pack.c
index 215644eec..91bc7445e 100644
--- a/lib/pack/pack.c
+++ b/lib/pack/pack.c
@@ -19,9 +19,9 @@
 
 #include <math.h>
 #include <assert.h>
-#include "render.h"
-#include "pack.h"
-#include "pointset.h"
+#include <common/render.h>
+#include <pack/pack.h>
+#include <common/pointset.h>
 #include <assert.h>
 
 #define strneq(a,b,n)		(!strncmp(a,b,n))
diff --git a/lib/pack/ptest.c b/lib/pack/ptest.c
index 99bc9b3c3..2060ba05c 100644
--- a/lib/pack/ptest.c
+++ b/lib/pack/ptest.c
@@ -12,9 +12,9 @@
  *************************************************************************/
 
 #include <assert.h>
-#include "render.h"
-#include "neatoprocs.h"
-#include "pack.h"
+#include <common/render.h>
+#include <neatogen/neatoprocs.h>
+#include <pack/pack.h>
 
 /* Test driver for libpack library.
  * Input consists of graphs in dot format.