From fae688d66c0c32d2b46242cd6e68416a9f3be237 Mon Sep 17 00:00:00 2001 From: erg Date: Tue, 29 Apr 2008 21:59:17 +0000 Subject: [PATCH] Integrate topfish and sfdp into main tree, using GTS for triangulation; remove duplicated code --- lib/Makefile.am | 2 +- lib/neatogen/Makefile.am | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/Makefile.am b/lib/Makefile.am index 539194af5..7d17ae059 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2,7 +2,7 @@ ## Process this file with automake to produce Makefile.in SUBDIRS = cdt graph agraph gd pathplan agutil sfio vmalloc ast vpsc \ - circogen dotgen fdpgen neatogen twopigen common pack gvc \ + circogen dotgen fdpgen neatogen twopigen sfdpgen common pack gvc \ ingraphs expr cgraph xdot topfish glcomp EXTRA_DIST = Makefile.old diff --git a/lib/neatogen/Makefile.am b/lib/neatogen/Makefile.am index 604863530..660b0a6d9 100644 --- a/lib/neatogen/Makefile.am +++ b/lib/neatogen/Makefile.am @@ -8,7 +8,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/pack \ -I$(top_srcdir)/lib/pathplan \ -I$(top_srcdir)/lib/graph \ - -I$(top_srcdir)/lib/cdt @IPSEPCOLA_INCLUDES@ + -I$(top_srcdir)/lib/sfdpgen \ + -I$(top_srcdir)/lib/cdt @IPSEPCOLA_INCLUDES@ $(GTS_CFLAGS) noinst_LTLIBRARIES = libneatogen_C.la @@ -16,7 +17,7 @@ noinst_HEADERS = adjust.h edges.h geometry.h heap.h hedges.h info.h mem.h \ neato.h poly.h neatoprocs.h simple.h site.h voronoi.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 sparsegraph.h + quad_prog_vpsc.h delaunay.h sparsegraph.h IPSEPCOLA_SOURCES = constrained_majorization_ipsep.c \ mosek_quad_solve.c mosek_quad_solve.h quad_prog_vpsc.c @@ -31,6 +32,6 @@ libneatogen_C_la_SOURCES = adjust.c circuit.c edges.c find_ints.c geometry.c \ voronoi.c stress.c kkutils.c matrix_ops.c embed_graph.c dijkstra.c \ conjgrad.c pca.c closest.c bfs.c constraint.c quad_prog_solve.c \ smart_ini_x.c constrained_majorization.c opt_arrangement.c \ - compute_hierarchy.c $(WITH_IPSEPCOLA_SOURCES) + compute_hierarchy.c delaunay.c $(WITH_IPSEPCOLA_SOURCES) EXTRA_DIST = Makefile.old $(IPSEPCOLA_SOURCES) -- 2.40.0