From: Erwin Janssen Date: Sat, 1 Apr 2017 08:43:46 +0000 (+0200) Subject: Reduce exported symbols for plugin/neato_layout X-Git-Tag: 2.42.0~187^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=352b06f05ebd24899a2531d887ec1f49f36fe3c7;p=graphviz Reduce exported symbols for plugin/neato_layout On Windows, the plugin gvplugin_neato_layout exported a lot of function, also from other libraries that are not being exported, such as ortho and neatogen. This has been reduced to only the varaible `gvplugin_neato_layout_LTX_library`. A minor link change was needed on Windows as a result. --- diff --git a/graphviz.sln b/graphviz.sln index 7d2af076b..34066e0da 100644 --- a/graphviz.sln +++ b/graphviz.sln @@ -31,6 +31,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "circogen", "lib\circogen\gvcircogen.vcxproj", "{3A011065-B75E-49C8-B480-1A7C8EBD6699}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "neatogen", "lib\neatogen\gvneatogen.vcxproj", "{C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F}" + ProjectSection(ProjectDependencies) = postProject + {2D29953F-2D74-471E-A064-5D184E762DFF} = {2D29953F-2D74-471E-A064-5D184E762DFF} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twopigen", "lib\twopigen\gvtwopigen.vcxproj", "{24E8C882-CD11-475A-A383-FF52AC05DFE3}" EndProject @@ -182,6 +185,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvprlib", "lib\gvpr\gvprlib EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dotgen", "lib\dotgen\gvdotgen.vcxproj", "{4B6103EF-590B-4916-92CB-D06934459928}" + ProjectSection(ProjectDependencies) = postProject + {2D29953F-2D74-471E-A064-5D184E762DFF} = {2D29953F-2D74-471E-A064-5D184E762DFF} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvortho", "lib\ortho\gvortho.vcxproj", "{2D29953F-2D74-471E-A064-5D184E762DFF}" EndProject diff --git a/lib/dotgen/gvdotgen.vcxproj b/lib/dotgen/gvdotgen.vcxproj index cea76d9e8..f0a2309f1 100644 --- a/lib/dotgen/gvdotgen.vcxproj +++ b/lib/dotgen/gvdotgen.vcxproj @@ -64,6 +64,10 @@ 4996 + + gvortho.lib + $(OutDir) + @@ -76,6 +80,10 @@ 4996 + + gvortho.lib + $(OutDir) + diff --git a/lib/neatogen/gvneatogen.vcxproj b/lib/neatogen/gvneatogen.vcxproj index 80dfa2907..dfdb089b1 100644 --- a/lib/neatogen/gvneatogen.vcxproj +++ b/lib/neatogen/gvneatogen.vcxproj @@ -64,6 +64,10 @@ 4996 + + gvortho.lib + $(OutDir) + @@ -76,6 +80,10 @@ 4996 + + gvortho.lib + $(OutDir) + diff --git a/plugin/neato_layout/Makefile.am b/plugin/neato_layout/Makefile.am index 747fee460..3f642b128 100644 --- a/plugin/neato_layout/Makefile.am +++ b/plugin/neato_layout/Makefile.am @@ -39,7 +39,7 @@ libgvplugin_neato_layout_la_LIBADD = $(libgvplugin_neato_layout_C_la_LIBADD) \ $(top_builddir)/lib/cdt/libcdt.la \ $(top_builddir)/lib/pathplan/libpathplan.la \ $(GTS_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS) - + if WITH_SFDP libgvplugin_neato_layout_C_la_LIBADD += $(top_builddir)/lib/sfdpgen/libsfdpgen_C.la endif @@ -53,4 +53,4 @@ if WITH_DARWIN9 libgvplugin_neato_layout_la_LDFLAGS += -Wl,-exported_symbol,_gvplugin_neato_layout_LTX_library -Wl,-exported_symbol,_neato_init_node -Wl,-exported_symbol,_init_nop -Wl,-exported_symbol,_user_pos endif -EXTRA_DIST = gvplugin_neato_layout.vcxproj* gvplugin_neato_layout.def +EXTRA_DIST = gvplugin_neato_layout.vcxproj* diff --git a/plugin/neato_layout/gvplugin_neato_layout.def b/plugin/neato_layout/gvplugin_neato_layout.def deleted file mode 100644 index 2b32ba505..000000000 --- a/plugin/neato_layout/gvplugin_neato_layout.def +++ /dev/null @@ -1,52 +0,0 @@ -LIBRARY "gvplugin_neato_layout" -EXPORTS -allow_edits -checkStart -choose_node -circuit_model -D2E -diffeq_model -distvec -final_energy -fpow32 -free_array -free_scan_graph -getPath -gvplugin_neato_layout_LTX_library -heapdown -heapup -init_nop -initial_positions -jitter3d -jitter_d -make_spring -makeObstacle -makeSelfArcs -makeSpline -makeStraightEdge -move_node -neato_cleanup -neato_dequeue -neato_enqueue -neato_init_node -neato_layout -neato_set_aspect -new_array -Plegal_arrangement -randompos -s1 -scan_graph -scan_graph_mode -setSeed -shortest_path -solve_model -solveCircuit -spline_edges -spline_edges0 -spline_edges1 -splineEdges -user_pos -sfdp_layout -sfdp_cleanup -orthoEdges - diff --git a/plugin/neato_layout/gvplugin_neato_layout.vcxproj b/plugin/neato_layout/gvplugin_neato_layout.vcxproj index c81173aa3..82b9f5238 100644 --- a/plugin/neato_layout/gvplugin_neato_layout.vcxproj +++ b/plugin/neato_layout/gvplugin_neato_layout.vcxproj @@ -63,7 +63,6 @@ $(OutDir);$(SolutionDir)windows\dependencies\libraries\lib;%(AdditionalLibraryDirectories) - gvplugin_neato_layout.def true Windows @@ -82,7 +81,6 @@ $(OutDir);$(SolutionDir)windows\dependencies\libraries\lib;%(AdditionalLibraryDirectories) - gvplugin_neato_layout.def No Windows true @@ -96,9 +94,6 @@ - - - {15229511-9f6c-48a5-9194-660ca6492563} diff --git a/plugin/neato_layout/gvplugin_neato_layout.vcxproj.filters b/plugin/neato_layout/gvplugin_neato_layout.vcxproj.filters index d4066d30e..2ab7acfd0 100644 --- a/plugin/neato_layout/gvplugin_neato_layout.vcxproj.filters +++ b/plugin/neato_layout/gvplugin_neato_layout.vcxproj.filters @@ -22,9 +22,4 @@ Source Files - - - Source Files - - \ No newline at end of file