From 7f1364ccebf85771d308149ae897f7758cfe58d0 Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Wed, 12 Aug 2020 20:07:21 -0700 Subject: [PATCH] disambiguate lib/cdt/*.c #includes Related to #1785. --- lib/cdt/CMakeLists.txt | 6 ++++-- lib/cdt/Makefile.am | 2 +- lib/cdt/cdt.vcxproj | 4 ++-- lib/cdt/dtclose.c | 2 +- lib/cdt/dtdisc.c | 2 +- lib/cdt/dtextract.c | 2 +- lib/cdt/dtflatten.c | 2 +- lib/cdt/dthash.c | 2 +- lib/cdt/dtlist.c | 2 +- lib/cdt/dtmethod.c | 2 +- lib/cdt/dtopen.c | 2 +- lib/cdt/dtrenew.c | 2 +- lib/cdt/dtrestore.c | 2 +- lib/cdt/dtsize.c | 2 +- lib/cdt/dtstat.c | 2 +- lib/cdt/dtstrhash.c | 2 +- lib/cdt/dttree.c | 2 +- lib/cdt/dtview.c | 2 +- lib/cdt/dtwalk.c | 2 +- 19 files changed, 23 insertions(+), 21 deletions(-) diff --git a/lib/cdt/CMakeLists.txt b/lib/cdt/CMakeLists.txt index 4e9fdb728..159f9864a 100644 --- 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 bc350eeb0..e6e345778 100644 --- 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 af0022395..07321d013 100644 --- a/lib/cdt/cdt.vcxproj +++ b/lib/cdt/cdt.vcxproj @@ -51,7 +51,7 @@ Disabled - $(ProjectDir) + $(ProjectDir);$(SolutionDir)lib MultiThreadedDebugDLL Level4 @@ -70,7 +70,7 @@ - $(ProjectDir) + $(ProjectDir);$(SolutionDir)lib Level4 true diff --git a/lib/cdt/dtclose.c b/lib/cdt/dtclose.c index d2b1e95dc..b945f05cf 100644 --- a/lib/cdt/dtclose.c +++ b/lib/cdt/dtclose.c @@ -1,4 +1,4 @@ -#include "dthdr.h" +#include /* Close a dictionary ** diff --git a/lib/cdt/dtdisc.c b/lib/cdt/dtdisc.c index 4df29e373..b8131f404 100644 --- a/lib/cdt/dtdisc.c +++ b/lib/cdt/dtdisc.c @@ -1,4 +1,4 @@ -#include "dthdr.h" +#include /* Change discipline. ** dt : dictionary diff --git a/lib/cdt/dtextract.c b/lib/cdt/dtextract.c index c0586ce8d..3573b8afd 100644 --- a/lib/cdt/dtextract.c +++ b/lib/cdt/dtextract.c @@ -1,4 +1,4 @@ -#include "dthdr.h" +#include /* Extract objects of a dictionary. ** diff --git a/lib/cdt/dtflatten.c b/lib/cdt/dtflatten.c index 9c7aa8b9a..ea928f3c7 100644 --- a/lib/cdt/dtflatten.c +++ b/lib/cdt/dtflatten.c @@ -1,4 +1,4 @@ -#include "dthdr.h" +#include /* 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 454bb7dda..76b7ea6d0 100644 --- a/lib/cdt/dthash.c +++ b/lib/cdt/dthash.c @@ -1,4 +1,4 @@ -#include "dthdr.h" +#include /* Hash table. ** dt: dictionary diff --git a/lib/cdt/dtlist.c b/lib/cdt/dtlist.c index 5ba06bbe4..07fc2b5ab 100644 --- a/lib/cdt/dtlist.c +++ b/lib/cdt/dtlist.c @@ -1,4 +1,4 @@ -#include "dthdr.h" +#include /* List, Deque, Stack, Queue. ** diff --git a/lib/cdt/dtmethod.c b/lib/cdt/dtmethod.c index a03fb962a..a03e00ce9 100644 --- a/lib/cdt/dtmethod.c +++ b/lib/cdt/dtmethod.c @@ -1,4 +1,4 @@ -#include "dthdr.h" +#include /* Change search method. ** diff --git a/lib/cdt/dtopen.c b/lib/cdt/dtopen.c index b3ee0b6c2..0ea5f18b6 100644 --- a/lib/cdt/dtopen.c +++ b/lib/cdt/dtopen.c @@ -1,4 +1,4 @@ -#include "dthdr.h" +#include /* Make a new dictionary ** diff --git a/lib/cdt/dtrenew.c b/lib/cdt/dtrenew.c index ae9407cd2..44c14f86c 100644 --- a/lib/cdt/dtrenew.c +++ b/lib/cdt/dtrenew.c @@ -1,4 +1,4 @@ -#include "dthdr.h" +#include /* Renew the object at the current finger. diff --git a/lib/cdt/dtrestore.c b/lib/cdt/dtrestore.c index 86da681cc..e2ae73cc7 100644 --- a/lib/cdt/dtrestore.c +++ b/lib/cdt/dtrestore.c @@ -1,4 +1,4 @@ -#include "dthdr.h" +#include /* 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 2a75e4e23..e0f8fbd13 100644 --- a/lib/cdt/dtsize.c +++ b/lib/cdt/dtsize.c @@ -1,4 +1,4 @@ -#include "dthdr.h" +#include /* Return the # of objects in the dictionary ** diff --git a/lib/cdt/dtstat.c b/lib/cdt/dtstat.c index 09899af44..a5196ce20 100644 --- a/lib/cdt/dtstat.c +++ b/lib/cdt/dtstat.c @@ -1,4 +1,4 @@ -#include "dthdr.h" +#include /* Get statistics of a dictionary ** diff --git a/lib/cdt/dtstrhash.c b/lib/cdt/dtstrhash.c index 19f442899..afef98235 100644 --- a/lib/cdt/dtstrhash.c +++ b/lib/cdt/dtstrhash.c @@ -1,4 +1,4 @@ -#include "dthdr.h" +#include /* 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 8803618f4..c2de68c45 100644 --- a/lib/cdt/dttree.c +++ b/lib/cdt/dttree.c @@ -1,4 +1,4 @@ -#include "dthdr.h" +#include /* Ordered set/multiset ** dt: dictionary being searched diff --git a/lib/cdt/dtview.c b/lib/cdt/dtview.c index bbbe6934a..4ad36018a 100644 --- a/lib/cdt/dtview.c +++ b/lib/cdt/dtview.c @@ -1,4 +1,4 @@ -#include "dthdr.h" +#include /* Set a view path from dict to view. ** diff --git a/lib/cdt/dtwalk.c b/lib/cdt/dtwalk.c index 3238f16c4..9cb172d2b 100644 --- a/lib/cdt/dtwalk.c +++ b/lib/cdt/dtwalk.c @@ -1,4 +1,4 @@ -#include "dthdr.h" +#include /* Walk a dictionary and all dictionaries viewed through it. ** userf: user function -- 2.40.0