graph_t -> Agraph_t

diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index 4d1553139743db5dbe5c5200aa4a1dc84305a3d9..cdbfd38c4d52d6449d4a7cfce846080af6c341ac 100644 (file)
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -55,13 +55,13 @@ libgvc_C_la_DEPENDENCIES = $(top_builddir)/lib/rbtree/librbtree_C.la \
        $(top_builddir)/lib/pack/libpack_C.la
 #For use with plugins.
 #   so it is linked with an empty table of builtins.
-libgvc_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
+libgvc_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined
 libgvc_la_SOURCES = $(libgvc_C_la_SOURCES) no_builtins.c demand_loading.c
 libgvc_la_LIBADD = $(libgvc_C_la_LIBADD) \
        $(top_builddir)/lib/cdt/libcdt.la \
        $(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la \
        $(top_builddir)/lib/pathplan/libpathplan.la \
-       @GTS_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@
+       $(GTS_LIBS) $(EXPAT_LIBS) $(Z_LIBS) $(MATH_LIBS)
 libgvc_la_DEPENDENCIES = $(libgvc_C_la_DEPENDENCIES)
 
 #For use without plugins.
@@ -69,7 +69,7 @@ libgvc_la_DEPENDENCIES = $(libgvc_C_la_DEPENDENCIES)
 #              with either demand_loading.c or no_demand_loading.c,
 #              and with the plugins themselves, e.g.
 #  -lgvplugin_dot_layout -lgvplugin_neato_layout -lgvplugin_gd -lgvplugin_pangocairo
-libgvc_builtins_la_LDFLAGS = -version-info @VERSION_INFO@
+libgvc_builtins_la_LDFLAGS = -version-info $(VERSION_INFO)
 libgvc_builtins_la_SOURCES = $(libgvc_C_la_SOURCES)
 libgvc_builtins_la_LIBADD = $(libgvc_la_LIBADD)
 libgvc_builtins_la_DEPENDENCIES = $(libgvc_la_DEPENDENCIES)

diff --git a/lib/gvc/gvcproc.h b/lib/gvc/gvcproc.h
index 2b24c63c1a499a94018f87b906f324018c9d4feb..2859414b11c04a94a2be5cf22fce3f26c1e03a3c 100644 (file)
--- a/lib/gvc/gvcproc.h
+++ b/lib/gvc/gvcproc.h
@@ -123,8 +123,8 @@ extern "C" {
 /* layout */
 
     extern int gvlayout_select(GVC_t * gvc, const char *str);
-    extern int gvFreeLayout(GVC_t * gvc, graph_t * g);
-    extern int gvLayoutJobs(GVC_t * gvc, graph_t * g);
+    extern int gvFreeLayout(GVC_t * gvc, Agraph_t * g);
+    extern int gvLayoutJobs(GVC_t * gvc, Agraph_t * g);
 
 /* argvlist */
     extern gv_argvlist_t *gvNEWargvlist(void);

diff --git a/lib/gvc/gvlayout.c b/lib/gvc/gvlayout.c
index b1f09cbd7c2ea633b8ffef30e1a8d4803ce5731d..e37efabb3ca77511e345fe3f82c19748b76f9473 100644 (file)
--- a/lib/gvc/gvlayout.c
+++ b/lib/gvc/gvlayout.c
@@ -33,8 +33,8 @@
 #endif
 #include "gvcproc.h"
 
-extern void graph_init(graph_t *g, boolean use_rankdir);
-extern void graph_cleanup(graph_t *g);
+extern void graph_init(Agraph_t *g, boolean use_rankdir);
+extern void graph_cleanup(Agraph_t *g);
 
 int gvlayout_select(GVC_t * gvc, const char *layout)
 {
@@ -58,7 +58,7 @@ int gvlayout_select(GVC_t * gvc, const char *layout)
  * Check that the root graph has been initialized. If not, initialize it.
  * Return 0 on success.
  */
-int gvLayoutJobs(GVC_t * gvc, graph_t * g)
+int gvLayoutJobs(GVC_t * gvc, Agraph_t * g)
 {
     gvlayout_engine_t *gvle;
     char *p;
@@ -97,7 +97,7 @@ int gvLayoutJobs(GVC_t * gvc, graph_t * g)
  * Then, if the root graph has not been cleaned up, clean it up and reset.
  * Only the root graph has GD_drawing non-null.
  */
-int gvFreeLayout(GVC_t * gvc, graph_t * g)
+int gvFreeLayout(GVC_t * gvc, Agraph_t * g)
 {
     if (GD_cleanup(g)) {
        (GD_cleanup(g))(g);