disambiguate lib/rbtree/*.c #includes

Related to #1785.

diff --git a/lib/rbtree/CMakeLists.txt b/lib/rbtree/CMakeLists.txt
index fc3c230a58b77e280fcf908250d14eceb4a8aca0..e815a198749d3dab375fc7870e70c6ff31eaa468 100644 (file)
--- a/lib/rbtree/CMakeLists.txt
+++ b/lib/rbtree/CMakeLists.txt
@@ -1,7 +1,3 @@
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
 add_library(rbtree STATIC
     # Header files
     red_black_tree.h
@@ -12,3 +8,8 @@ add_library(rbtree STATIC
     red_black_tree.c
     stack.c
 )
+
+include_directories(rbtree PRIVATE
+    ${GRAPHVIZ_LIB_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)

diff --git a/lib/rbtree/Makefile.am b/lib/rbtree/Makefile.am
index 378cec74632b5c4958d63f993c74f0662829828a..88797a19ac658c62fe773b838e7cdf3a8d09a907 100644 (file)
--- a/lib/rbtree/Makefile.am
+++ b/lib/rbtree/Makefile.am
@@ -1,7 +1,7 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
-AM_CPPFLAGS =
+AM_CPPFLAGS = -I$(top_srcdir)/lib
 
 noinst_HEADERS = red_black_tree.h stack.h
 noinst_LTLIBRARIES = librbtree_C.la

diff --git a/lib/rbtree/misc.c b/lib/rbtree/misc.c
index 2759909e86cb6d7a30ed729c0dc4fb62a72e80ab..e9e4c8e37b9f75b5e8eb6de2da6c2458107f78bc 100644 (file)
--- a/lib/rbtree/misc.c
+++ b/lib/rbtree/misc.c
@@ -5,7 +5,7 @@
 *      See the LICENSE file for copyright information.     *
 **********************************************************/
 
-#include "red_black_tree.h"
+#include <rbtree/red_black_tree.h>
 
 /*  NullFunction does nothing it is included so that it can be passed */
 /*  as a function to RBTreeCreate when no other suitable function has */

diff --git a/lib/rbtree/rbtree.vcxproj b/lib/rbtree/rbtree.vcxproj
index 687387b28f0682958e6c5cff1c1c6af496fdecc0..cede9f5cacaacc4a741a83f1d82470624c463603 100644 (file)
--- a/lib/rbtree/rbtree.vcxproj
+++ b/lib/rbtree/rbtree.vcxproj
@@ -60,7 +60,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <EnablePREfast>true</EnablePREfast>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;%(AdditionalIncludeDirectories);$(SolutionDir)/lib</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib />
   </ItemDefinitionGroup>
@@ -71,7 +71,7 @@
       <WarningLevel>Level4</WarningLevel>
       <EnablePREfast>true</EnablePREfast>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;%(AdditionalIncludeDirectories);$(SolutionDir)/lib</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib />
   </ItemDefinitionGroup>

diff --git a/lib/rbtree/red_black_tree.c b/lib/rbtree/red_black_tree.c
index f11e811bdd20cadcdd55cbc00e611c7bc2e3ceae..e7e0a85d23b275e5fb87928a3462a5764ec353b4 100644 (file)
--- a/lib/rbtree/red_black_tree.c
+++ b/lib/rbtree/red_black_tree.c
@@ -8,8 +8,8 @@
 #include "config.h"
 
 #include <assert.h>
-#include "red_black_tree.h"
-#include "stdio.h"
+#include <rbtree/red_black_tree.h>
+#include <stdio.h>
 #include <stdlib.h>
 
 /***********************************************************************/

diff --git a/lib/rbtree/stack.c b/lib/rbtree/stack.c
index 9d8802038f112b1b631261c901050fa1f1c20417..d08f449f3fde2f0f814caba3744d96d36409702a 100644 (file)
--- a/lib/rbtree/stack.c
+++ b/lib/rbtree/stack.c
@@ -7,7 +7,7 @@
 
 #include "config.h"
 
-#include "stack.h"
+#include <rbtree/stack.h>
 #include <stdlib.h>
 
 intptr_t StackNotEmpty(stk_stack * theStack) {

diff --git a/lib/rbtree/test_red_black_tree.c b/lib/rbtree/test_red_black_tree.c
index 3881eb60ce5fa13753bc93932b25baccfc248960..b8ac7405720f1a582039dca1062f5ab63e29a274 100644 (file)
--- a/lib/rbtree/test_red_black_tree.c
+++ b/lib/rbtree/test_red_black_tree.c
@@ -7,7 +7,7 @@
 
 #include "config.h"
 
-#include"red_black_tree.h"
+#include<rbtree/red_black_tree.h>
 #include<stdio.h>
 #include<ctype.h>