From: Matthew Fernandez Date: Sun, 30 Aug 2020 22:49:48 +0000 (-0700) Subject: remove lib/sfdpgen from include paths X-Git-Tag: 2.46.0~20^2^2~52^2~14 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8f35a3a0f9e8ba2a78a33ed8838821c5c4d654f;p=graphviz remove lib/sfdpgen from include paths --- diff --git a/cmd/edgepaint/Makefile.am b/cmd/edgepaint/Makefile.am index 36a4a9a28..0c9a202a4 100644 --- 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 ab5aa6840..7883d1104 100644 --- 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 ab606f654..3cb30e92f 100644 --- a/cmd/gvmap/gvmap.vcxproj +++ b/cmd/gvmap/gvmap.vcxproj @@ -51,7 +51,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -72,7 +72,7 @@ - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Level4 diff --git a/cmd/mingle/Makefile.am b/cmd/mingle/Makefile.am index ccf2de8e7..78820ce05 100644 --- 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 ad057d043..e3a8acb90 100644 --- 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 cf2afbd8a..b9898a973 100644 --- 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 7a5ec484b..ab0eb638c 100644 --- 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 da00df4cf..c1e0b07e2 100644 --- 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 3c320af6e..37f3af495 100644 --- 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 572fa3c14..0e90d96d9 100644 --- a/lib/neatogen/gvneatogen.vcxproj +++ b/lib/neatogen/gvneatogen.vcxproj @@ -52,7 +52,7 @@ Disabled - $(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 + $(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 _DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -71,7 +71,7 @@ - $(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 + $(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 NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) Level4 diff --git a/lib/osage/CMakeLists.txt b/lib/osage/CMakeLists.txt index fea9124f1..b0c91e968 100644 --- 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 945c1b80d..f8596a945 100644 --- 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 7323b46c4..d897e1a5c 100644 --- 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 8421a3824..6ef053115 100644 --- 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