Add cgraph specific makefiles for dotgen2

diff --git a/lib/Makefile.am b/lib/Makefile.am
index ae3083375c2b3c82d7d8abbf6bf0d01272c77d61..57e2861c2c3b17826ff9580427a6e067584586c4 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,9 +1,17 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
+
+if WITH_CGRAPH
+SUBDIRS = cdt graph cgraph gd pathplan sfio vmalloc ast \
+       vpsc rbtree ortho sparse patchwork expr common \
+       pack xdot gvc ingraphs topfish glcomp \
+       circogen dotgen2 fdpgen neatogen twopigen sfdpgen osage gvpr
+else
 SUBDIRS = cdt graph cgraph gd pathplan sfio vmalloc ast \
        vpsc rbtree ortho sparse patchwork expr common \
        pack xdot gvc ingraphs topfish glcomp \
        circogen dotgen fdpgen neatogen twopigen sfdpgen osage gvpr
+endif
 
 EXTRA_DIST = Makefile.old gvc.vcproj gvc.def

diff --git a/plugin/dot_layout/Makefile.am b/plugin/dot_layout/Makefile.am
index c8a3ded56e8da26f5c4c15a019b091ef6c8dbf8e..ef843fb523963e9839c3d3d7242d285a1b9d300c 100644 (file)
--- a/plugin/dot_layout/Makefile.am
+++ b/plugin/dot_layout/Makefile.am
@@ -27,8 +27,13 @@ endif
 libgvplugin_dot_layout_C_la_SOURCES = \
        gvplugin_dot_layout.c \
        gvlayout_dot_layout.c
+if WITH_CGRAPH
+libgvplugin_dot_layout_C_la_LIBADD = \
+       $(top_builddir)/lib/dotgen2/libdotgen2_C.la
+else
 libgvplugin_dot_layout_C_la_LIBADD = \
-       $(top_builddir)/lib/dotgen/libdotgen_C.la
+       $(top_builddir)/lib/dotgen/libdotgen_C.la 
+endif
 
 libgvplugin_dot_layout_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
 libgvplugin_dot_layout_la_SOURCES = $(libgvplugin_dot_layout_C_la_SOURCES)