replacing agraph with cgraph

convince smyrna to at least compile

diff --git a/cmd/smyrna/viewport.h b/cmd/smyrna/viewport.h
index 53ac4dc86c22ed6b6c1ca0cb809a31e20bf739e0..3cc542171029fc2a59da0aeb7d74867152a34526 100755 (executable)
--- a/cmd/smyrna/viewport.h
+++ b/cmd/smyrna/viewport.h
@@ -21,7 +21,7 @@
 #include "smyrnadefs.h"
 #include <gtk/gtk.h>
 #include "xdot.h"
-#include "agraph.h"
+#include "cgraph.h"
 
 void init_viewport(ViewInfo * view);
 void set_viewport_settings_from_template(ViewInfo * view, Agraph_t *);

diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
index ef11dc6e5533ee1e71071682b53aee5d4a2e3452..ade5423b0b258aef28d665006e27920bee53068a 100644 (file)
--- a/cmd/tools/Makefile.am
+++ b/cmd/tools/Makefile.am
@@ -1,19 +1,17 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
+CGRAPH_LIBS=$(top_builddir)/lib/cgraph/libcgraph.la
 if WITH_CGRAPH
-   GRAPH_LIBS=$(top_builddir)/lib/cgraph/libcgraph.la
-   AGRAPH_LIBS=$(top_builddir)/lib/cgraph/libcgraph.la
+   GRAPH_LIBS=$(CGRAPH_LIBS)
 else
    GRAPH_LIBS=$(top_builddir)/lib/graph/libgraph.la
-   AGRAPH_LIBS=$(top_builddir)/lib/agraph/libagraph.la
 endif
 
 AM_CPPFLAGS = \
         -I$(top_srcdir) \
        -I$(top_srcdir)/lib/cgraph \
        -I$(top_srcdir)/lib/graph \
-       -I$(top_srcdir)/lib/agraph \
        -I$(top_srcdir)/lib/cdt \
        -I$(top_srcdir)/lib/pathplan \
        -I$(top_srcdir)/lib/pack \
@@ -54,14 +52,15 @@ gxl2gv_SOURCES = cvtgxl.c gv2gxl.c gxl2gv.c
 
 gxl2gv_LDADD = \
        $(top_builddir)/lib/ingraphs/libingraphs_C.la \
-       $(AGRAPH_LIBS) @EXPAT_LIBS@ \
+       $(CGRAPH_LIBS) @EXPAT_LIBS@ \
        $(GRAPH_LIBS)
 
 sccmap_SOURCES = sccmap.c
 
 sccmap_LDADD = \
        $(top_builddir)/lib/ingraphs/libingraphs_C.la \
-       $(AGRAPH_LIBS)
+       $(CGRAPH_LIBS) @EXPAT_LIBS@ \
+       $(GRAPH_LIBS)
 
 ccomps_SOURCES = ccomps.c
 
@@ -79,7 +78,7 @@ unflatten_SOURCES = unflatten.c
 
 unflatten_LDADD = \
        $(top_builddir)/lib/ingraphs/libingraphs_C.la \
-       $(AGRAPH_LIBS)
+       $(CGRAPH_LIBS)
 
 acyclic_SOURCES = acyclic.c
 
@@ -129,7 +128,7 @@ dijkstra_SOURCES = dijkstra.c
 
 dijkstra_LDADD = \
        $(top_builddir)/lib/ingraphs/libingraphs_C.la \
-       $(AGRAPH_LIBS)
+       $(CGRAPH_LIBS)
 
 .1.pdf:
        - @GROFF@ -Tps -man $< | @PS2PDF@ - - >$@

diff --git a/cmd/tools/unflatten.c b/cmd/tools/unflatten.c
index 2fcf160fa27333a5d2e40b33c2fd3e7871eaa6fc..e9c76d5e01834decc3510a4afecd928cdba8eb80 100644 (file)
--- a/cmd/tools/unflatten.c
+++ b/cmd/tools/unflatten.c
@@ -30,13 +30,13 @@
 #include       <unistd.h>
 #endif
 #ifdef USE_CGRAPH
-#include    <cgraph.h>
+#include    "cgraph.h"
 #define degreeOf(n,I,O) (agdegree(n->root, n, I, O)) 
 #else
-#include    <agraph.h>
+#include    "agraph.h"
 #define degreeOf(n,I,O) (agdegree(n, I, O)) 
 #endif
-#include    <ingraphs.h>
+#include    "ingraphs.h"
 
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>