cgraph fixes

diff --git a/lib/circogen/Makefile.am b/lib/circogen/Makefile.am
index c561e4ecb00bd1caaf4a3e8b7d571afe906029d4..8fc7cfcfba8b87f0261be6d1308049623674d4c9 100644 (file)
--- a/lib/circogen/Makefile.am
+++ b/lib/circogen/Makefile.am
@@ -1,6 +1,12 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
+if WITH_CGRAPH
+GRAPH = cgraph
+else
+GRAPH = graph
+endif
+
 pkgconfigdir = $(libdir)/pkgconfig
 
 AM_CPPFLAGS = \
@@ -10,16 +16,13 @@ AM_CPPFLAGS = \
         -I$(top_srcdir)/lib/neatogen \
         -I$(top_srcdir)/lib/pack \
         -I$(top_srcdir)/lib/pathplan \
-        -I$(top_srcdir)/lib/graph \
+        -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/fdpgen/Makefile.am b/lib/fdpgen/Makefile.am
index 752ca5b3d08253359ea57040e3faed83d50436c2..fe435d29c3d10e1d3f2a58bee29e58ee975ed3ec 100644 (file)
--- a/lib/fdpgen/Makefile.am
+++ b/lib/fdpgen/Makefile.am
@@ -1,6 +1,12 @@
 # $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/common \
@@ -8,15 +14,12 @@ AM_CPPFLAGS = \
         -I$(top_srcdir)/lib/neatogen \
         -I$(top_srcdir)/lib/pack \
         -I$(top_srcdir)/lib/pathplan \
-        -I$(top_srcdir)/lib/graph \
+        -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/twopigen/Makefile.am b/lib/twopigen/Makefile.am
index e398e1ee6e1f96de181b015967419abc4139107c..562276b9a143c85433061dfeba5737876185ebbb 100644 (file)
--- a/lib/twopigen/Makefile.am
+++ b/lib/twopigen/Makefile.am
@@ -1,6 +1,12 @@
 # $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/common \
@@ -8,14 +14,11 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/neatogen \
        -I$(top_srcdir)/lib/pack \
        -I$(top_srcdir)/lib/pathplan \
-       -I$(top_srcdir)/lib/graph \
+       -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