diambiguate lib/topfish/*.c #includes

Related to #1242 and #1785.

diff --git a/lib/topfish/CMakeLists.txt b/lib/topfish/CMakeLists.txt
index dc6475e4b5519e43e840bc5528218f4c08f6feff..3029641256e48058df9675c92ce25dfb8226961a 100644 (file)
--- a/lib/topfish/CMakeLists.txt
+++ b/lib/topfish/CMakeLists.txt
@@ -1,11 +1,5 @@
 if (with_smyrna)
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${GRAPHVIZ_LIB_DIR}/common
-    ${GRAPHVIZ_LIB_DIR}/neatogen
-)
-
 add_library(topfish STATIC
     # Header files
     hierarchy.h
@@ -15,4 +9,11 @@ add_library(topfish STATIC
     rescale_layout.c
 )
 
+target_include_directories(topfish PRIVATE
+    ${GRAPHVIZ_LIB_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${GRAPHVIZ_LIB_DIR}/common
+    ${GRAPHVIZ_LIB_DIR}/neatogen
+)
+
 endif (with_smyrna)

diff --git a/lib/topfish/Makefile.am b/lib/topfish/Makefile.am
index b20a14bfca642e708849723d9c5ca6ecbe199450..647ecbb44243f0696fcb0c2d1c0bfde673370d16 100644 (file)
--- a/lib/topfish/Makefile.am
+++ b/lib/topfish/Makefile.am
@@ -2,6 +2,7 @@
 # ## Process this file with automake to produce Makefile.in
 #
 AM_CPPFLAGS = \
+       -I$(top_srcdir)/lib \
        -I$(top_srcdir)/lib/neatogen \
        -I$(top_srcdir)/lib/common
 

diff --git a/lib/topfish/hierarchy.c b/lib/topfish/hierarchy.c
index 2ab06636a85e4cfc971befb1ae140aa7a0beab1c..75b91520c9969d200d797b92b0da882c337aa0c6 100644 (file)
--- a/lib/topfish/hierarchy.c
+++ b/lib/topfish/hierarchy.c
@@ -24,9 +24,9 @@
 #include <math.h>
 #include <time.h>
 #include <assert.h>
-#include "memory.h"
-#include "arith.h"
-#include "hierarchy.h"
+#include <common/memory.h>
+#include <common/arith.h>
+#include <topfish/hierarchy.h>
 
 static int cur_level = 0;
 

diff --git a/lib/topfish/rescale_layout.c b/lib/topfish/rescale_layout.c
index 50c511bf53dd85a0a768d70b0a557fb49a19c466..11dc4ec0e20175437dc0f0fabc63ec8b2c936d86 100644 (file)
--- a/lib/topfish/rescale_layout.c
+++ b/lib/topfish/rescale_layout.c
@@ -29,11 +29,10 @@
 #include <string.h>
 #include <math.h>
 #include <time.h>
-#include "matrix_ops.h"
-/* #include "hierarchy.h" */
-#include "delaunay.h"
-#include "memory.h"
-#include "arith.h"
+#include <neatogen/matrix_ops.h>
+#include <neatogen/delaunay.h>
+#include <common/memory.h>
+#include <common/arith.h>
 
 static double *compute_densities(v_data * graph, int n, double *x,
                                 double *y)

diff --git a/lib/topfish/topfish.vcxproj b/lib/topfish/topfish.vcxproj
index 87147e372248731dfce4b07a94ad920ba3a3e883..4879d0a62141d23d67c53a88287da4fb8e933856 100644 (file)
--- a/lib/topfish/topfish.vcxproj
+++ b/lib/topfish/topfish.vcxproj
@@ -60,7 +60,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <EnablePREfast>true</EnablePREfast>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib\common;$(SolutionDir)lib\neatogen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\common;$(SolutionDir)lib\neatogen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib />
   </ItemDefinitionGroup>
@@ -71,7 +71,7 @@
       <WarningLevel>Level4</WarningLevel>
       <EnablePREfast>true</EnablePREfast>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib\common;$(SolutionDir)lib\neatogen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\common;$(SolutionDir)lib\neatogen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib />
   </ItemDefinitionGroup>