add cgraph variants into the tree - use ./configure --with-cgraph to test

diff --git a/configure.ac b/configure.ac
index bea64e5900d9261cc22ae4a7c8c28bbf8b229e27..79dff6c4a63dc22afc7ca9a2132dbf0d86421ce3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2659,7 +2659,7 @@ if test "x$with_cgraph" != "xyes"; then
   use_cgraph="No"
 else
   use_cgraph="Yes"
-  AC_DEFINE_UNQUOTED(USE_CGRAPH,1,[Define if you want CGRAPH])
+  AC_DEFINE_UNQUOTED(WITH_CGRAPH,1,[Define if you want CGRAPH])
 fi
 AM_CONDITIONAL(WITH_CGRAPH, [test "x$use_cgraph" = "xYes"])
 
@@ -2897,17 +2897,23 @@ AC_CONFIG_FILES(Makefile
        lib/sfio/Sfio_f/Makefile
        lib/vmalloc/Makefile
        lib/dotgen/Makefile
+       lib/dotgen_cgraph/Makefile
        lib/neatogen/Makefile
+       lib/neatogen_cgraph/Makefile
        lib/fdpgen/Makefile
+       lib/fdpgen_cgraph/Makefile
        lib/sparse/Makefile
        lib/sfdpgen/Makefile
        lib/circogen/Makefile
+       lib/circogen_cgraph/Makefile
        lib/twopigen/Makefile
+       lib/twopigen_cgraph/Makefile
        lib/patchwork/Makefile
        lib/pack/Makefile
        lib/expr/Makefile
        lib/expr/libexpr.pc
        lib/common/Makefile
+       lib/common_cgraph/Makefile
        lib/ingraphs/Makefile
        lib/vpsc/Makefile
        lib/gvc/Makefile

diff --git a/lib/Makefile.am b/lib/Makefile.am
index f09a085a870df296f3c0ed7739afec4bac9df19d..fdb9338a6e3720034108d9746d1a92596ac5c1af 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,9 +1,13 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = cdt graph gd pathplan sfio vmalloc ast vpsc rbtree \
-       circogen dotgen fdpgen neatogen twopigen sparse sfdpgen \
-       patchwork inkpot common pack gvc ingraphs expr cgraph \
-       xdot topfish glcomp
+GRAPH_DIRS = circogen common dotgen fdpgen neatogen twopigen
+
+CGRAPH_DIRS = circogen_cgraph common_cgraph dotgen_cgraph \
+       fdpgen_cgraph neatogen_cgraph twopigen_cgraph
+
+SUBDIRS = cdt graph cgraph gd pathplan sfio vmalloc ast vpsc \
+       rbtree sparse sfdpgen patchwork inkpot expr gvc xdot \
+       pack ingraphs topfish glcomp $(GRAPH_DIRS) $(CGRAPH_DIRS)
 
 EXTRA_DIST = Makefile.old

diff --git a/lib/circogen/Makefile.am b/lib/circogen/Makefile.am
index e3d33ea6a807c41e68b30f8ed4272b7a2ce4f9a6..c561e4ecb00bd1caaf4a3e8b7d571afe906029d4 100644 (file)
--- a/lib/circogen/Makefile.am
+++ b/lib/circogen/Makefile.am
@@ -13,10 +13,13 @@ AM_CPPFLAGS = \
         -I$(top_srcdir)/lib/graph \
         -I$(top_srcdir)/lib/cdt
 
+if WITH_CGRAPH
+else
 noinst_HEADERS = block.h blockpath.h blocktree.h circo.h \
        circpos.h circular.h deglist.h edgelist.h nodelist.h \
        nodeset.h stack.h
 noinst_LTLIBRARIES = libcircogen_C.la
+endif
 
 libcircogen_C_la_SOURCES = circularinit.c nodelist.c block.c edgelist.c \
        stack.c circular.c deglist.c blocktree.c blockpath.c \

diff --git a/lib/dotgen/Makefile.am b/lib/dotgen/Makefile.am
index e1e5e853429c3f1de1b57431e3216b4eaf755d77..3c9c2df1d96bc352bc5e39d4eebec7faa5617bda 100644 (file)
--- a/lib/dotgen/Makefile.am
+++ b/lib/dotgen/Makefile.am
@@ -9,8 +9,11 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/cdt \
        -I$(top_srcdir)/lib/pathplan
 
+if WITH_CGRAPH
+else
 noinst_HEADERS = dot.h dotprocs.h
 noinst_LTLIBRARIES = libdotgen_C.la
+endif
 
 libdotgen_C_la_LDFLAGS = -no-undefined
 libdotgen_C_la_SOURCES = acyclic.c class1.c class2.c cluster.c compound.c \

diff --git a/lib/fdpgen/Makefile.am b/lib/fdpgen/Makefile.am
index b18b25c79bf58087532e388c087fca57869e2f41..752ca5b3d08253359ea57040e3faed83d50436c2 100644 (file)
--- a/lib/fdpgen/Makefile.am
+++ b/lib/fdpgen/Makefile.am
@@ -11,9 +11,12 @@ AM_CPPFLAGS = \
         -I$(top_srcdir)/lib/graph \
         -I$(top_srcdir)/lib/cdt
 
+if WITH_CGRAPH
+else
 noinst_HEADERS = comp.h dbg.h fdp.h grid.h tlayout.h xlayout.h \
        clusteredges.h
 noinst_LTLIBRARIES = libfdpgen_C.la
+endif
 
 libfdpgen_C_la_SOURCES = comp.c dbg.c grid.c fdpinit.c layout.c \
        tlayout.c xlayout.c clusteredges.c

diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index 810497571b6ef0f8f051cda614fee63fc4ca3206..bf259ae80da910dc8aecc26b7b2246217e0c8261 100644 (file)
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -1,14 +1,22 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
+if WITH_CGRAPH
+GRAPH = cgraph
+COMMON = common_cgraph
+else
+GRAPH = graph
+COMMON = common
+endif
+
 pdfdir = $(pkgdatadir)/doc/pdf
 pkgconfigdir = $(libdir)/pkgconfig
 
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
-       -I$(top_srcdir)/lib/common \
+       -I$(top_srcdir)/lib/$(COMMON) \
        -I$(top_srcdir)/lib/pathplan \
-       -I$(top_srcdir)/lib/graph \
+       -I$(top_srcdir)/lib/$(GRAPH) \
        -I$(top_srcdir)/lib/cdt \
        $(INCLTDL) -I$(top_srcdir)/libltdl \
        -DGVLIBDIR=\"$(pkglibdir)\" -DGVPLUGIN_CONFIG_FILE=\"$(GVPLUGIN_CONFIG_FILE)\"
@@ -43,7 +51,7 @@ pdf_DATA = gvc.3.pdf
 libgvc_C_la_SOURCES = gvrender.c gvlayout.c gvdevice.c gvloadimage.c \
        gvcontext.c gvjobs.c gvevent.c gvplugin.c gvconfig.c \
        gvtextlayout.c gvusershape.c gvc.c
-libgvc_C_la_LIBADD = $(top_builddir)/lib/common/libcommon_C.la \
+libgvc_C_la_LIBADD = $(top_builddir)/lib/$(COMMON)/libcommon_C.la \
        $(top_builddir)/lib/pack/libpack_C.la
 libgvc_C_la_DEPENDENCIES = $(top_builddir)/lib/rbtree/librbtree_C.la \
        $(top_builddir)/lib/pack/libpack_C.la
@@ -53,7 +61,7 @@ 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/libgraph.la \
+       $(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la \
        $(top_builddir)/lib/pathplan/libpathplan.la \
        @GTS_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@
 libgvc_la_DEPENDENCIES = $(libgvc_C_la_DEPENDENCIES)

diff --git a/lib/ingraphs/Makefile.am b/lib/ingraphs/Makefile.am
index 9a0f9b6a8df5717fdf519241afea39a65f475aa1..35a56985a2199793fadb02a6a82e695438345ea7 100644 (file)
--- a/lib/ingraphs/Makefile.am
+++ b/lib/ingraphs/Makefile.am
@@ -1,9 +1,15 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
+if WITH_CGRAPH 
+GRAPH = cgraph 
+else 
+GRAPH = graph 
+endif 
+
 AM_CPPFLAGS = \
         -I$(top_srcdir) \
-        -I$(top_srcdir)/lib/graph \
+        -I$(top_srcdir)/lib/$(GRAPH) \
        -I$(top_srcdir)/lib/cdt 
 
 noinst_HEADERS = ingraphs.h 

diff --git a/lib/neatogen/Makefile.am b/lib/neatogen/Makefile.am
index b04b4bf5e5d96ff22b3b206534d828bbcaed5430..9bd70ca13be8b463686d3abe9ec6a529cd21a98a 100644 (file)
--- a/lib/neatogen/Makefile.am
+++ b/lib/neatogen/Makefile.am
@@ -9,8 +9,10 @@ AM_CPPFLAGS = \
         -I$(top_srcdir)/lib/pathplan \
         -I$(top_srcdir)/lib/graph \
         -I$(top_srcdir)/lib/sfdpgen \
-        -I$(top_srcdir)/lib/cdt @IPSEPCOLA_INCLUDES@ $(GTS_CFLAGS)
+        -I$(top_srcdir)/lib/cdt $(IPSEPCOLA_INCLUDES) $(GTS_CFLAGS)
 
+if WITH_CGRAPH
+else
 noinst_LTLIBRARIES = libneatogen_C.la
 
 noinst_HEADERS = adjust.h edges.h geometry.h heap.h hedges.h info.h mem.h \
@@ -18,6 +20,7 @@ noinst_HEADERS = adjust.h edges.h geometry.h heap.h hedges.h info.h mem.h \
        bfs.h closest.h conjgrad.h defs.h dijkstra.h embed_graph.h kkutils.h \
        matrix_ops.h pca.h stress.h quad_prog_solver.h digcola.h \
        quad_prog_vpsc.h delaunay.h sparsegraph.h multispline.h fPQ.h
+endif
 
 IPSEPCOLA_SOURCES = constrained_majorization_ipsep.c \
        mosek_quad_solve.c mosek_quad_solve.h quad_prog_vpsc.c 

diff --git a/lib/pack/Makefile.am b/lib/pack/Makefile.am
index 7be46049fa095d6abe26def3a057852a3ba87a92..caa7c772e7c96676bab7e1a82e949e3465334c4a 100644 (file)
--- a/lib/pack/Makefile.am
+++ b/lib/pack/Makefile.am
@@ -4,12 +4,18 @@
 pdfdir = $(pkgdatadir)/doc/pdf
 #pkgconfigdir = $(libdir)/pkgconfig
 
+if WITH_CGRAPH
+GRAPH = cgraph
+else
+GRAPH = graph
+endif
+
 AM_CPPFLAGS = -I$(top_srcdir) \
         -I$(top_srcdir)/lib/common \
        -I$(top_srcdir)/lib/gvc \
        -I$(top_srcdir)/lib/neatogen \
        -I$(top_srcdir)/lib/pathplan \
-       -I$(top_srcdir)/lib/graph \
+       -I$(top_srcdir)/lib/$(GRAPH) \
        -I$(top_srcdir)/lib/cdt
 
 if WITH_WIN32

diff --git a/lib/twopigen/Makefile.am b/lib/twopigen/Makefile.am
index 34327c3b41124898febb350c8aa14d530fe19226..e398e1ee6e1f96de181b015967419abc4139107c 100644 (file)
--- a/lib/twopigen/Makefile.am
+++ b/lib/twopigen/Makefile.am
@@ -11,8 +11,11 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/graph \
        -I$(top_srcdir)/lib/cdt
 
+if WITH_CGRAPH
+else
 noinst_HEADERS = circle.h
 noinst_LTLIBRARIES = libtwopigen_C.la
+endif
 
 libtwopigen_C_la_SOURCES = twopiinit.c circle.c
 

diff --git a/plugin/dot_layout/Makefile.am b/plugin/dot_layout/Makefile.am
index 784137345a9964b952bde9ca15c8da661ba5194b..a32b1eb365cb1c3589f0e387d2a18d8a324cf1ce 100644 (file)
--- a/plugin/dot_layout/Makefile.am
+++ b/plugin/dot_layout/Makefile.am
@@ -1,12 +1,20 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
+if WITH_CGRAPH
+GRAPH = cgraph
+COMMON = common_cgraph
+else
+GRAPH = graph
+COMMON = common
+endif
+
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
-       -I$(top_srcdir)/lib/common \
+       -I$(top_srcdir)/lib/$(COMMON) \
        -I$(top_srcdir)/lib/pathplan \
        -I$(top_srcdir)/lib/gvc \
-       -I$(top_srcdir)/lib/graph \
+       -I$(top_srcdir)/lib/$(GRAPH) \
        -I$(top_srcdir)/lib/cdt \
        $(LIBGVC_CFLAGS)
 
@@ -24,17 +32,17 @@ libgvplugin_dot_layout_C_la_SOURCES = \
 libgvplugin_dot_layout_C_la_LIBADD = \
        $(top_builddir)/lib/dotgen/libdotgen_C.la
 
-libgvplugin_dot_layout_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
+libgvplugin_dot_layout_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
 libgvplugin_dot_layout_la_SOURCES = $(libgvplugin_dot_layout_C_la_SOURCES)
 libgvplugin_dot_layout_la_LIBADD = $(libgvplugin_dot_layout_C_la_LIBADD) \
        $(top_builddir)/lib/gvc/libgvc.la \
-       $(top_builddir)/lib/graph/libgraph.la \
+       $(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la \
        $(top_builddir)/lib/cdt/libcdt.la \
-       $(top_builddir)/lib/pathplan/libpathplan.la @MATH_LIBS@
+       $(top_builddir)/lib/pathplan/libpathplan.la $(MATH_LIBS)
        
 if WITH_WIN32
 libgvplugin_dot_layout_la_LDFLAGS += -no-undefined
-libgvplugin_dot_layout_la_LIBADD += $(top_builddir)/lib/graph/libgraph.la
+libgvplugin_dot_layout_la_LIBADD += $(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la
 endif
 
 if WITH_DARWIN9

diff --git a/plugin/neato_layout/Makefile.am b/plugin/neato_layout/Makefile.am
index 07d931c16bc114c673ac9d36aaec690732ef7b9d..f93c2f99c3aaca540dee5a0c5aad1404f370eb61 100644 (file)
--- a/plugin/neato_layout/Makefile.am
+++ b/plugin/neato_layout/Makefile.am
@@ -1,12 +1,20 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
+if WITH_CGRAPH
+GRAPH = cgraph
+COMMON = common_cgraph
+else
+GRAPH = graph
+COMMON = common
+endif
+
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
-       -I$(top_srcdir)/lib/common \
+       -I$(top_srcdir)/lib/$(COMMON) \
        -I$(top_srcdir)/lib/pathplan \
        -I$(top_srcdir)/lib/gvc \
-       -I$(top_srcdir)/lib/graph \
+       -I$(top_srcdir)/lib/$(GRAPH) \
        -I$(top_srcdir)/lib/cdt \
        $(LIBGVC_CFLAGS)
 
@@ -32,7 +40,7 @@ libgvplugin_neato_layout_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
 libgvplugin_neato_layout_la_SOURCES = $(libgvplugin_neato_layout_C_la_SOURCES)
 libgvplugin_neato_layout_la_LIBADD = $(libgvplugin_neato_layout_C_la_LIBADD) \
        $(top_builddir)/lib/gvc/libgvc.la \
-       $(top_builddir)/lib/graph/libgraph.la \
+       $(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la \
        $(top_builddir)/lib/cdt/libcdt.la \
        $(top_builddir)/lib/pathplan/libpathplan.la \
        $(GTS_LIBS) @IPSEPCOLA_LIBS@ @MATH_LIBS@
@@ -43,7 +51,7 @@ endif
 
 if WITH_WIN32
 libgvplugin_neato_layout_la_LDFLAGS += -no-undefined
-libgvplugin_neato_layout_la_LIBADD += $(top_builddir)/lib/graph/libgraph.la $(top_builddir)/lib/cdt/libcdt.la
+libgvplugin_neato_layout_la_LIBADD += $(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la $(top_builddir)/lib/cdt/libcdt.la
 endif
 
 if WITH_DARWIN9