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 7d2af076b5c5ce954ecbbd915ad3ca85045586bd..34066e0da81f9b153392c1a0216ef623be97ed78 100644 (file)
--- 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 cea76d9e8783fcb3a3bac151cfd2f5ea76ea63ff..f0a2309f1f5ba57e1346414b9d02ef8cf30d366b 100644 (file)
--- a/lib/dotgen/gvdotgen.vcxproj
+++ b/lib/dotgen/gvdotgen.vcxproj
@@ -64,6 +64,10 @@
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <Lib />
+    <Lib>
+      <AdditionalDependencies>gvortho.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -76,6 +80,10 @@
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <Lib />
+    <Lib>
+      <AdditionalDependencies>gvortho.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="aspect.h" />

diff --git a/lib/neatogen/gvneatogen.vcxproj b/lib/neatogen/gvneatogen.vcxproj
index 80dfa290754798d8866d064995b5edcc52d28772..dfdb089b130c7eada4ad99df3581a8d818c56e87 100644 (file)
--- a/lib/neatogen/gvneatogen.vcxproj
+++ b/lib/neatogen/gvneatogen.vcxproj
@@ -64,6 +64,10 @@
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <Lib />
+    <Lib>
+      <AdditionalDependencies>gvortho.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -76,6 +80,10 @@
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <Lib />
+    <Lib>
+      <AdditionalDependencies>gvortho.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="adjust.h" />

diff --git a/plugin/neato_layout/Makefile.am b/plugin/neato_layout/Makefile.am
index 747fee460527098aabfcabceb9bdbdc126a3f226..3f642b128e44928dde01742c6a2840d494b06a80 100644 (file)
--- 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 (file)
index 2b32ba5..0000000
--- 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 c81173aa35bbaa9106d89226fa99349a0772f82a..82b9f5238449735086a1a39cc5fa3ca07cec184e 100644 (file)
--- a/plugin/neato_layout/gvplugin_neato_layout.vcxproj
+++ b/plugin/neato_layout/gvplugin_neato_layout.vcxproj
@@ -63,7 +63,6 @@
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\dependencies\libraries\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>gvplugin_neato_layout.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <DataExecutionPrevention />
@@ -82,7 +81,6 @@
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\dependencies\libraries\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>gvplugin_neato_layout.def</ModuleDefinitionFile>
       <GenerateDebugInformation>No</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -96,9 +94,6 @@
     <ClCompile Include="gvlayout_neato_layout.c" />
     <ClCompile Include="gvplugin_neato_layout.c" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="gvplugin_neato_layout.def" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\lib\gvc.vcxproj">
       <Project>{15229511-9f6c-48a5-9194-660ca6492563}</Project>

diff --git a/plugin/neato_layout/gvplugin_neato_layout.vcxproj.filters b/plugin/neato_layout/gvplugin_neato_layout.vcxproj.filters
index d4066d30ea301d29686defebf8eacf4741cf03a4..2ab7acfd09d752ee3acb895ff00d1f64ac84b242 100644 (file)
--- a/plugin/neato_layout/gvplugin_neato_layout.vcxproj.filters
+++ b/plugin/neato_layout/gvplugin_neato_layout.vcxproj.filters
@@ -22,9 +22,4 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="gvplugin_neato_layout.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
 </Project>
\ No newline at end of file