de-duplicate gvc.def

Closes #1761.

diff --git a/lib/Makefile.am b/lib/Makefile.am
index e6d97445d9368b3ab2b30584bdb6ca1a0400ab4b..12eb862bbe3bc12ae4a0f26424da8426abea84ae 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -6,4 +6,4 @@ SUBDIRS = cdt cgraph pathplan sfio vmalloc ast \
        pack xdot label gvc ingraphs topfish glcomp mingle edgepaint \
        circogen dotgen fdpgen neatogen twopigen sfdpgen osage gvpr spine
 
-EXTRA_DIST = gvc.vcxproj* gvc.def 
+EXTRA_DIST = gvc.vcxproj*

diff --git a/lib/gvc.def b/lib/gvc.def
deleted file mode 100644 (file)
index 668a93b..0000000
--- a/lib/gvc.def
+++ /dev/null
@@ -1,341 +0,0 @@
-LIBRARY    "gvc"
-
-EXPORTS
-add_box    
-addPS    
-arrow_bb    
-arrow_flags    
-arrow_gen    
-arrow_length    
-arrowEndClip    
-arrowStartClip    
-attach_attrs    
-attach_attrs_and_arrows    
-beginpath    
-Bezier    
-bezier_clip    
-bind_shape    
-cat_libfile    
-ccomps    
-cccomps    
-ccwrotatep    
-ccwrotatepf    
-charsetToStr    
-CL_type    
-clearPM    
-clip_and_install    
-CmdName    
-common_init_edge    
-common_init_node    
-compute_bb    
-polyBB
-Concentrate    
-coord    
-cwrotatep    
-cwrotatepf    
-Damping    
-dequeue    
-do_graph_label    
-dotneato_args_initialize    
-dotneato_closest    
-dotneato_postprocess    
-dotneato_usage    
-E_activefillcolor    
-E_activepencolor    
-E_arrowhead    
-E_arrowsz    
-E_arrowtail    
-E_color    
-E_comment    
-E_constr    
-E_decorate    
-E_deletedfillcolor    
-E_deletedpencolor    
-E_dir    
-E_fontcolor    
-E_fontname    
-E_fontsize    
-E_headclip    
-E_headlabel    
-E_label    
-E_xlabel    
-E_label_float    
-E_labelangle    
-E_labeldistance    
-E_labelfontcolor    
-E_labelfontname    
-E_labelfontsize    
-E_layer    
-E_minlen    
-E_penwidth    
-E_samehead    
-E_sametail    
-E_selectedfillcolor    
-E_selectedpencolor    
-E_showboxes    
-E_style    
-E_tailclip    
-E_taillabel    
-E_visitedfillcolor    
-E_visitedpencolor    
-E_weight   
-edgeType    
-elapsed_sec    
-emit_clusters    
-emit_graph    
-emit_label    
-emit_map_rect    
-emit_once    
-endpath    
-enqueue    
-epsf_define    
-epsf_emit_body    
-epsf_free    
-epsf_init    
-Epsilon    
-fdp_parms    
-Fgets    
-Files    
-find_user_shape    
-flip_rec_box    
-flip_rec_boxf    
-free_label    
-free_queue    
-freePM    
-freePS    
-G_activefillcolor    
-G_activepencolor    
-G_deletedfillcolor    
-G_deletedpencolor    
-G_ordering    
-G_penwidth    
-G_peripheries    
-G_selectedfillcolor    
-G_selectedpencolor    
-G_visitedfillcolor    
-G_visitedpencolor    
-gcalloc
-getdouble    
-pack_graph
-getPack    
-getPackMode    
-getsplinepoints    
-get_inputscale
-gmalloc    
-graph_cleanup    
-graph_init    
-graphviz_errors    
-grealloc    
-gv_cleanup_edge    
-gv_cleanup_node    
-gv_free_splines    
-gv_nodesize    
-gvAddLibrary    
-gvcBuildDate    
-gvcInfo    
-gvContext    
-gvcVersion    
-GvExitOnUsage
-Gvfilepath    
-gvCloneGVC
-gvFreeCloneGVC
-gvFreeContext    
-gvFreeLayout    
-gvLayout    
-gvLayoutJobs    
-gvNEWcontext    
-gvNextInputGraph    
-gvParseArgs    
-gvPluginsGraph    
-gvprintdouble    
-gvprintf    
-gvprintpointf    
-gvprintpointflist    
-gvputc    
-gvputs    
-gvRender    
-gvRenderData    
-gvFreeRenderData    
-gvRenderFilename    
-gvRenderJobs    
-gvToggle    
-gvusershape_file_access    
-gvusershape_file_release    
-gvwrite    
-htmlEntityUTF8    
-HTTPServerEnVar    
-Initial_dist    
-initMapData    
-inPS    
-insertPM
-updatePM    
-insertPS    
-isConnected    
-isInPS    
-isPolygon    
-late_bool    
-late_double    
-late_int    
-late_nnstring    
-late_string    
-latin1ToUTF8    
-Lib    
-line_intersect    
-lineToBox    
-make_label    
-make_simple_label    
-makeSelfEdge    
-mapClust
-mapbool    
-maptoken    
-MaxIter    
-MemTest    
-mkbox    
-mkboxf    
-N_activefillcolor    
-N_activepencolor    
-N_color    
-N_comment    
-N_deletedfillcolor    
-N_deletedpencolor    
-N_distortion    
-N_fillcolor    
-N_fixed    
-N_fontcolor    
-N_fontname    
-N_fontsize    
-N_group    
-N_height    
-N_imagescale    
-N_label    
-N_xlabel    
-N_layer    
-N_nojustify    
-N_ordering    
-N_orientation    
-N_penwidth    
-N_peripheries    
-N_selectedfillcolor    
-N_selectedpencolor    
-N_shape    
-N_showboxes    
-N_sides    
-N_skew    
-N_style    
-N_vertices    
-N_visitedfillcolor    
-N_visitedpencolor    
-N_width    
-N_z    
-Ndim    
-neato_closest    
-new_queue    
-new_spline    
-newPM    
-newPS    
-nodeInduce    
-Nop    
-Output_file_name    
-yDir    
-overlap_edge    
-overlap_label    
-overlap_node    
-packGraphs    
-packSubgraphs    
-parse_style    
-pccomps    
-place_graph_label    
-place_portlabel    
-pointsOf    
-pop_obj_state    
-processClusterEdges    
-ps_string    
-PSinputscale    
-ptToLine2    
-push_obj_state    
-putGraphs    
-rank    
-rect2poly    
-Reduce    
-resolvePort    
-resolvePorts    
-round_corners    
-routepolylines    
-routesplines    
-routesplinesinit    
-routesplinesterm    
-safe_dcl    
-safefile    
-scanEntity    
-selfRightSpace    
-setAttr    
-setEdgeType    
-shape_clip    
-shapeOf    
-Show_boxes    
-Show_cnt    
-simpleSplineRoute
-sizeOf    
-specificFlags    
-specificItems    
-spline_at_y    
-start_timer    
-State    
-strdup_and_subst_obj    
-Syntax_errors    
-test_toggle    
-textfont_dict_open
-textfont_dict_close
-textspan_size    
-translate_bb    
-UF_find    
-UF_remove    
-UF_setname    
-UF_singleton    
-UF_union    
-undoClusterEdges    
-update_bb_bz    
-updateBB    
-utf8ToLatin1    
-Verbose    
-Version    
-write_plain    
-xml_string    
-xml_string0    
-xml_url_string    
-Y_invert    
-zmalloc    
-zrealloc    
-strcasecmp
-strncasecmp
-colorxlate
-fix_fc
-gvContextPlugins
-gvfwrite
-gvferror
-getPackInfo
-getPackModeInfo
-parsePackModeInfo
-putRects
-xdotBB
-gvFinalize
-gv_postprocess
-gvRenderContext
-gvflush
-gvrender_ptf
-setColorScheme
-makePortLabels
-addEdgeLabels
-is_a_cluster
-mapBool
-drand48
-gvPluginList
-EdgeLabelsDone
-get_gradient_points
-G_margin
-openIntSet
-mkClustMap
-findCluster
-rank2
-makeStraightEdge
-makeStraightEdges

diff --git a/lib/gvc.vcxproj b/lib/gvc.vcxproj
index 55017621ddfd635ca4c9bbd25dd2eb49372160c8..ab8b9668bcaf635d5ac2be68c5b03d7ba3d46b62 100644 (file)
--- a/lib/gvc.vcxproj
+++ b/lib/gvc.vcxproj
@@ -68,7 +68,7 @@
       <SubSystem>Windows</SubSystem>
       <DataExecutionPrevention />
       <TargetMachine>MachineX86</TargetMachine>
-      <ModuleDefinitionFile>gvc.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>$(SolutionDir)lib\gvc\gvc.def</ModuleDefinitionFile>
       <AdditionalDependencies>cdt.lib;cgraph.lib;xml2.lib;expat.lib;zlib.lib;rxspencer.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
@@ -103,7 +103,7 @@ awk -f $(SolutionDir)awk\colortbl.awk color_lib &gt; common\colortbl.h</Command>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <DataExecutionPrevention />
       <TargetMachine>MachineX86</TargetMachine>
-      <ModuleDefinitionFile>gvc.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>$(SolutionDir)lib\gvc\gvc.def</ModuleDefinitionFile>
       <AdditionalDependencies>cdt.lib;cgraph.lib;xml2.lib;expat.lib;zlib.lib;rxspencer.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
@@ -209,7 +209,7 @@ awk -f $(SolutionDir)awk\colortbl.awk color_lib &gt; common\colortbl.h</Command>
   </ItemGroup>
   <ItemGroup>
     <None Include="common\entities.html" />
-    <None Include="gvc.def" />
+    <None Include="gvc\gvc.def" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="cdt\cdt.vcxproj">

diff --git a/lib/gvc.vcxproj.filters b/lib/gvc.vcxproj.filters
index 9b2c8b09da36cbf5ce67112263e0f5f172a3b81f..85cb0334af26b0d1ad625a5f4386cc2c30d35da2 100644 (file)
--- a/lib/gvc.vcxproj.filters
+++ b/lib/gvc.vcxproj.filters
@@ -265,7 +265,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="gvc.def">
+    <None Include="gvc\gvc.def">
       <Filter>Source Files</Filter>
     </None>
     <None Include="common\entities.html" />

diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index bc07af9ee03ac1cd4085f6a8ff348e7ba3d355d2..cc55be340b21dea1eeff1d224ad576275f1aa444 100644 (file)
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -74,6 +74,6 @@ gvc.3.pdf: gvc.3.ps
 gvc.3.ps: $(srcdir)/gvc.3
        @GROFF@ -Tps -man $< >$@
 
-EXTRA_DIST = $(man_MANS) $(pdf_DATA)
+EXTRA_DIST = $(man_MANS) $(pdf_DATA) gvc.def
 
 DISTCLEANFILES = $(pdf_DATA) gvc.3.ps