remove lib/sfdpgen from include paths

diff --git a/cmd/edgepaint/Makefile.am b/cmd/edgepaint/Makefile.am
index 36a4a9a28206f6970a44a8cb0885bac767d7de6c..0c9a202a40975a315b0b1ece33d187e907e64ea4 100644 (file)
--- a/cmd/edgepaint/Makefile.am
+++ b/cmd/edgepaint/Makefile.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib \
        -I$(top_srcdir)/lib/common \
        -I$(top_srcdir)/lib/sparse \
-       -I$(top_srcdir)/lib/sfdpgen \
        -I$(top_srcdir)/lib/cgraph \
        -I$(top_srcdir)/lib/cdt
 

diff --git a/cmd/gvmap/Makefile.am b/cmd/gvmap/Makefile.am
index ab5aa6840d4246227e00b3315f58573c9266b01c..7883d110481ec117ddbdcac365913acb63750e8f 100644 (file)
--- a/cmd/gvmap/Makefile.am
+++ b/cmd/gvmap/Makefile.am
@@ -6,7 +6,6 @@ pdfdir = $(pkgdatadir)/doc/pdf
 AM_CPPFLAGS = \
        -I$(top_srcdir)/lib \
        -I$(top_srcdir)/lib/common \
-       -I$(top_srcdir)/lib/sfdpgen \
        -I$(top_srcdir)/lib/sparse \
        -I$(top_srcdir)/lib/cgraph \
        -I$(top_srcdir)/lib/cdt

diff --git a/cmd/gvmap/gvmap.vcxproj b/cmd/gvmap/gvmap.vcxproj
index ab606f6540eed7af51b3346b395727f4a9377eff..3cb30e92ffc530d7a1aea30b92f9237b8b87852b 100644 (file)
--- a/cmd/gvmap/gvmap.vcxproj
+++ b/cmd/gvmap/gvmap.vcxproj
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -72,7 +72,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/cmd/mingle/Makefile.am b/cmd/mingle/Makefile.am
index ccf2de8e71b1d181cb82c7617ee5330421366546..78820ce0581dc7c71765456956497eb9f941a891 100644 (file)
--- a/cmd/mingle/Makefile.am
+++ b/cmd/mingle/Makefile.am
@@ -6,7 +6,6 @@ pdfdir = $(pkgdatadir)/doc/pdf
 AM_CPPFLAGS = \
        -I$(top_srcdir)/lib \
        -I$(top_srcdir)/lib/sparse \
-       -I$(top_srcdir)/lib/sfdpgen \
        -I$(top_srcdir)/lib/common \
        -I$(top_srcdir)/lib/cgraph \
        -I$(top_srcdir)/lib/cdt

diff --git a/lib/edgepaint/Makefile.am b/lib/edgepaint/Makefile.am
index ad057d0432fec157de4a296612e2b0948113a8da..e3a8acb9003254cce77da9f898660fbe0950add9 100644 (file)
--- a/lib/edgepaint/Makefile.am
+++ b/lib/edgepaint/Makefile.am
@@ -11,7 +11,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/sparse \
        -I$(top_srcdir)/lib/gvc \
        -I$(top_srcdir)/lib/pathplan \
-       -I$(top_srcdir)/lib/sfdpgen \
        -I$(top_srcdir)/lib/cgraph \
        -I$(top_srcdir)/lib/cdt $(ANN_CFLAGS)
 

diff --git a/lib/mingle/CMakeLists.txt b/lib/mingle/CMakeLists.txt
index cf2afbd8ad5ec016b58872947716f16fe302463d..b9898a973b2a75592b3706a976bdfde662089ce9 100644 (file)
--- a/lib/mingle/CMakeLists.txt
+++ b/lib/mingle/CMakeLists.txt
@@ -23,7 +23,6 @@ target_include_directories(libmingle PRIVATE
     ${GRAPHVIZ_LIB_DIR}/common
     ${GRAPHVIZ_LIB_DIR}/gvc
     ${GRAPHVIZ_LIB_DIR}/pathplan
-    ${GRAPHVIZ_LIB_DIR}/sfdpgen
     ${GRAPHVIZ_LIB_DIR}/sparse
     ${ANN_INCLUDE_DIR}
 )

diff --git a/lib/mingle/Makefile.am b/lib/mingle/Makefile.am
index 7a5ec484b7072f8327615dc3e1fb74894dd448e4..ab0eb638c5c1457559cffbf5f80de40a61a71647 100644 (file)
--- a/lib/mingle/Makefile.am
+++ b/lib/mingle/Makefile.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/sparse \
        -I$(top_srcdir)/lib/gvc \
        -I$(top_srcdir)/lib/pathplan \
-       -I$(top_srcdir)/lib/sfdpgen \
        -I$(top_srcdir)/lib/cgraph \
        -I$(top_srcdir)/lib/cdt $(ANN_CFLAGS)
 

diff --git a/lib/neatogen/CMakeLists.txt b/lib/neatogen/CMakeLists.txt
index da00df4cfb62f853c4d3e45f69e26ba1d7bfdf59..c1e0b07e28e80bb13c0dcaec2671c3e8b58b1c8d 100644 (file)
--- a/lib/neatogen/CMakeLists.txt
+++ b/lib/neatogen/CMakeLists.txt
@@ -100,6 +100,5 @@ target_include_directories(neatogen PRIVATE
     ${GRAPHVIZ_LIB_DIR}/gvc
     ${GRAPHVIZ_LIB_DIR}/pack
     ${GRAPHVIZ_LIB_DIR}/pathplan
-    ${GRAPHVIZ_LIB_DIR}/sfdpgen
     ${GRAPHVIZ_LIB_DIR}/sparse
 )

diff --git a/lib/neatogen/Makefile.am b/lib/neatogen/Makefile.am
index 3c320af6ec7064abd9746cf082f4a2f0cc28d642..37f3af4951d31a210c64c571f8d401c7bbea5b23 100644 (file)
--- a/lib/neatogen/Makefile.am
+++ b/lib/neatogen/Makefile.am
@@ -9,7 +9,6 @@ AM_CPPFLAGS = \
         -I$(top_srcdir)/lib/pathplan \
         -I$(top_srcdir)/lib/cgraph \
        -I$(top_srcdir)/lib/sparse \
-        -I$(top_srcdir)/lib/sfdpgen \
         -I$(top_srcdir)/lib/cdt $(IPSEPCOLA_INCLUDES) $(GTS_CFLAGS)
 
 noinst_LTLIBRARIES = libneatogen_C.la

diff --git a/lib/neatogen/gvneatogen.vcxproj b/lib/neatogen/gvneatogen.vcxproj
index 572fa3c1464b6771763341349a8bcb9e98d7d165..0e90d96d9fadb2701874315d225e7fa4489dad8c 100644 (file)
--- a/lib/neatogen/gvneatogen.vcxproj
+++ b/lib/neatogen/gvneatogen.vcxproj
@@ -52,7 +52,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;$(SolutionDir)lib\vpsc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;$(SolutionDir)lib\vpsc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -71,7 +71,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;$(SolutionDir)lib\vpsc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;$(SolutionDir)lib\vpsc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/osage/CMakeLists.txt b/lib/osage/CMakeLists.txt
index fea9124f19a8fd8602dba5850f98203f5d4ce2b1..b0c91e968db2e0d45ead58074b7e2ebc6ef0369f 100644 (file)
--- a/lib/osage/CMakeLists.txt
+++ b/lib/osage/CMakeLists.txt
@@ -14,6 +14,5 @@ target_include_directories(osage PRIVATE
     ${GRAPHVIZ_LIB_DIR}/gvc
     ${GRAPHVIZ_LIB_DIR}/pack
     ${GRAPHVIZ_LIB_DIR}/pathplan
-    ${GRAPHVIZ_LIB_DIR}/sfdpgen
     ${GRAPHVIZ_LIB_DIR}/sparse
 )

diff --git a/lib/sfdpgen/CMakeLists.txt b/lib/sfdpgen/CMakeLists.txt
index 945c1b80dcb64711a5f1ea711a2fe9269b7dcc16..f8596a945a6b472d31a8c3055d1489fb9b594a7c 100644 (file)
--- a/lib/sfdpgen/CMakeLists.txt
+++ b/lib/sfdpgen/CMakeLists.txt
@@ -25,7 +25,6 @@ add_library(sfdpgen STATIC
 
 target_include_directories(sfdpgen PRIVATE
     ${GRAPHVIZ_LIB_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}
     ${GRAPHVIZ_LIB_DIR}/cdt
     ${GRAPHVIZ_LIB_DIR}/cgraph
     ${GRAPHVIZ_LIB_DIR}/common

diff --git a/lib/sparse/CMakeLists.txt b/lib/sparse/CMakeLists.txt
index 7323b46c4fc980e36a3dc7eb0b15de1d5048b30f..d897e1a5c72f83ddf1ed181d52433436bf0c9fa3 100644 (file)
--- a/lib/sparse/CMakeLists.txt
+++ b/lib/sparse/CMakeLists.txt
@@ -34,7 +34,6 @@ target_include_directories(sparse PRIVATE
     ${GRAPHVIZ_LIB_DIR}/cdt
     ${GRAPHVIZ_LIB_DIR}/cgraph
     ${GRAPHVIZ_LIB_DIR}/common
-    ${GRAPHVIZ_LIB_DIR}/sfdpgen
 )
 
 target_link_libraries(sparse

diff --git a/lib/sparse/Makefile.am b/lib/sparse/Makefile.am
index 8421a38248234cc3b6a33480d05bdc2f00a9367f..6ef053115a778c72cf6bb8546b3fedc0b8d0479f 100644 (file)
--- a/lib/sparse/Makefile.am
+++ b/lib/sparse/Makefile.am
@@ -3,7 +3,6 @@
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/lib \
-       -I$(top_srcdir)/lib/sfdpgen \
        -I$(top_srcdir)/lib/common \
        -I$(top_srcdir)/lib/cgraph \
        -I$(top_srcdir)/lib/cdt