disambiguate lib/cdt/*.c #includes

Related to #1785.

diff --git a/lib/cdt/CMakeLists.txt b/lib/cdt/CMakeLists.txt
index 4e9fdb7285b56369f6f5dca70277ae43b57a7486..159f9864afb6b9b387d7d3dd11a7bfac9df0de29 100644 (file)
--- a/lib/cdt/CMakeLists.txt
+++ b/lib/cdt/CMakeLists.txt
@@ -1,7 +1,5 @@
 add_definitions(-DEXPORT_CDT)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-
 add_library(cdt SHARED
     # Header files
     cdt.h
@@ -26,6 +24,10 @@ add_library(cdt SHARED
     dtwalk.c
 )
 
+target_include_directories(cdt PRIVATE
+    ${GRAPHVIZ_LIB_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR})
+
 # Installation location of library files
 install(
     TARGETS cdt

diff --git a/lib/cdt/Makefile.am b/lib/cdt/Makefile.am
index bc350eeb0b1632d3d1aa46a63a3657e98d127d61..e6e345778cc730b6925c3b1bbf47666904276ac2 100644 (file)
--- a/lib/cdt/Makefile.am
+++ b/lib/cdt/Makefile.am
@@ -7,7 +7,7 @@ pdfdir = $(pkgdatadir)/doc/pdf
 pkgextraincludedir = $(pkgincludedir)
 pkgconfigdir = $(libdir)/pkgconfig
 
-AM_CPPFLAGS = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)/lib
 
 pkginclude_HEADERS = cdt.h
 noinst_HEADERS = dthdr.h

diff --git a/lib/cdt/cdt.vcxproj b/lib/cdt/cdt.vcxproj
index af00223956815575c54c3f69b244d02b5769d7db..07321d01373fd72e2c6213cd09f5f218d8f789d7 100644 (file)
--- a/lib/cdt/cdt.vcxproj
+++ b/lib/cdt/cdt.vcxproj
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)lib</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>
@@ -70,7 +70,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)lib</AdditionalIncludeDirectories>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>
       <EnablePREfast>true</EnablePREfast>

diff --git a/lib/cdt/dtclose.c b/lib/cdt/dtclose.c
index d2b1e95dcf89f64d1525cec2eddea67d25706ec7..b945f05cf3083004447cfddf56cf3550d3dbd7a4 100644 (file)
--- a/lib/cdt/dtclose.c
+++ b/lib/cdt/dtclose.c
@@ -1,4 +1,4 @@
-#include       "dthdr.h"
+#include       <cdt/dthdr.h>
 
 /*     Close a dictionary
 **

diff --git a/lib/cdt/dtdisc.c b/lib/cdt/dtdisc.c
index 4df29e37377f304c6e1993bc06e748b81c0ab0c5..b8131f404c0d2b90e8ffcdde38d30aa3c019f2b4 100644 (file)
--- a/lib/cdt/dtdisc.c
+++ b/lib/cdt/dtdisc.c
@@ -1,4 +1,4 @@
-#include       "dthdr.h"
+#include       <cdt/dthdr.h>
 
 /*     Change discipline.
 **     dt :    dictionary

diff --git a/lib/cdt/dtextract.c b/lib/cdt/dtextract.c
index c0586ce8df62b60ee643c6500b62e75cb88265dc..3573b8afd3f18d2c1018940c506da45c476ad249 100644 (file)
--- a/lib/cdt/dtextract.c
+++ b/lib/cdt/dtextract.c
@@ -1,4 +1,4 @@
-#include       "dthdr.h"
+#include       <cdt/dthdr.h>
 
 /*     Extract objects of a dictionary.
 **

diff --git a/lib/cdt/dtflatten.c b/lib/cdt/dtflatten.c
index 9c7aa8b9a20237519420d4a6ccd12cefba0cf1b6..ea928f3c70c330daa14aa0e079d83b707fdd170b 100644 (file)
--- a/lib/cdt/dtflatten.c
+++ b/lib/cdt/dtflatten.c
@@ -1,4 +1,4 @@
-#include       "dthdr.h"
+#include       <cdt/dthdr.h>
 
 /*     Flatten a dictionary into a linked list.
 **     This may be used when many traversals are likely.

diff --git a/lib/cdt/dthash.c b/lib/cdt/dthash.c
index 454bb7dda30182dcde4509e4b87c6c87c43ab297..76b7ea6d0dcd23ee96642242dd31ba759b607902 100644 (file)
--- a/lib/cdt/dthash.c
+++ b/lib/cdt/dthash.c
@@ -1,4 +1,4 @@
-#include       "dthdr.h"
+#include       <cdt/dthdr.h>
 
 /*     Hash table.
 **     dt:     dictionary

diff --git a/lib/cdt/dtlist.c b/lib/cdt/dtlist.c
index 5ba06bbe45727f41034c80d468d677e690cf93ec..07fc2b5abb78b2e9077789db120e1acf2282503c 100644 (file)
--- a/lib/cdt/dtlist.c
+++ b/lib/cdt/dtlist.c
@@ -1,4 +1,4 @@
-#include       "dthdr.h"
+#include       <cdt/dthdr.h>
 
 /*     List, Deque, Stack, Queue.
 **

diff --git a/lib/cdt/dtmethod.c b/lib/cdt/dtmethod.c
index a03fb962a43507a663857780bbd92046d6da0cd4..a03e00ce99fad79bba14771f4bd59d1b35756b4c 100644 (file)
--- a/lib/cdt/dtmethod.c
+++ b/lib/cdt/dtmethod.c
@@ -1,4 +1,4 @@
-#include       "dthdr.h"
+#include       <cdt/dthdr.h>
 
 /*     Change search method.
 **

diff --git a/lib/cdt/dtopen.c b/lib/cdt/dtopen.c
index b3ee0b6c2361a63bdd1763183aa40d966bd816af..0ea5f18b6b2b51724ed65cb440954d7f759cb01b 100644 (file)
--- a/lib/cdt/dtopen.c
+++ b/lib/cdt/dtopen.c
@@ -1,4 +1,4 @@
-#include       "dthdr.h"
+#include       <cdt/dthdr.h>
 
 /*     Make a new dictionary
 **

diff --git a/lib/cdt/dtrenew.c b/lib/cdt/dtrenew.c
index ae9407cd2ca281d2a04afe0d31e4af1c25566fa9..44c14f86c4fb932a5c6c0bf7634d47cbfe11d3bb 100644 (file)
--- a/lib/cdt/dtrenew.c
+++ b/lib/cdt/dtrenew.c
@@ -1,4 +1,4 @@
-#include       "dthdr.h"
+#include       <cdt/dthdr.h>
 
 
 /*     Renew the object at the current finger.

diff --git a/lib/cdt/dtrestore.c b/lib/cdt/dtrestore.c
index 86da681ccac8bbcd2b6aec46e7beeff547228858..e2ae73cc7c58b418a76b4cb65eff66761e6eab0d 100644 (file)
--- a/lib/cdt/dtrestore.c
+++ b/lib/cdt/dtrestore.c
@@ -1,4 +1,4 @@
-#include       "dthdr.h"
+#include       <cdt/dthdr.h>
 
 /*     Restore dictionary from given tree or list of elements.
 **     There are two cases. If called from within, list is nil.

diff --git a/lib/cdt/dtsize.c b/lib/cdt/dtsize.c
index 2a75e4e2362a2fd575f21a5a33a92677f5f4b58e..e0f8fbd13cd5a4ae0d4cf1788525a656f5ca9bd1 100644 (file)
--- a/lib/cdt/dtsize.c
+++ b/lib/cdt/dtsize.c
@@ -1,4 +1,4 @@
-#include       "dthdr.h"
+#include       <cdt/dthdr.h>
 
 /*     Return the # of objects in the dictionary
 **

diff --git a/lib/cdt/dtstat.c b/lib/cdt/dtstat.c
index 09899af446f49b92738e9c15537fd9b6bb5d02b1..a5196ce204e5f2449e7b148bc6b302bff518f79d 100644 (file)
--- a/lib/cdt/dtstat.c
+++ b/lib/cdt/dtstat.c
@@ -1,4 +1,4 @@
-#include       "dthdr.h"
+#include       <cdt/dthdr.h>
 
 /*     Get statistics of a dictionary
 **

diff --git a/lib/cdt/dtstrhash.c b/lib/cdt/dtstrhash.c
index 19f4428990610774d1139cf6128d6e9eb6406ed9..afef982358dc975c52222974119167b0a3d9eb6c 100644 (file)
--- a/lib/cdt/dtstrhash.c
+++ b/lib/cdt/dtstrhash.c
@@ -1,4 +1,4 @@
-#include       "dthdr.h"
+#include       <cdt/dthdr.h>
 
 /* Hashing a string into an unsigned integer.
 ** The basic method is to continuingly accumulate bytes and multiply

diff --git a/lib/cdt/dttree.c b/lib/cdt/dttree.c
index 8803618f407b133b1983065299cc1876ed46a107..c2de68c4508db1cd43c7ad0d2a48721de4443798 100644 (file)
--- a/lib/cdt/dttree.c
+++ b/lib/cdt/dttree.c
@@ -1,4 +1,4 @@
-#include       "dthdr.h"
+#include       <cdt/dthdr.h>
 
 /*     Ordered set/multiset
 **     dt:     dictionary being searched

diff --git a/lib/cdt/dtview.c b/lib/cdt/dtview.c
index bbbe6934acaed149ad681b7fb04918f7c1e24166..4ad36018a9e7b676f6b26609345b9b97dd2b843d 100644 (file)
--- a/lib/cdt/dtview.c
+++ b/lib/cdt/dtview.c
@@ -1,4 +1,4 @@
-#include       "dthdr.h"
+#include       <cdt/dthdr.h>
 
 /*     Set a view path from dict to view.
 **

diff --git a/lib/cdt/dtwalk.c b/lib/cdt/dtwalk.c
index 3238f16c4a8a16913d832867f1aa3e52fe544092..9cb172d2bf30d2322e1d20c45986b2daeb84028c 100644 (file)
--- a/lib/cdt/dtwalk.c
+++ b/lib/cdt/dtwalk.c
@@ -1,4 +1,4 @@
-#include       "dthdr.h"
+#include       <cdt/dthdr.h>
 
 /*     Walk a dictionary and all dictionaries viewed through it.
 **     userf:  user function