From 5ceb78fa507cb0d85026370c5359c40cd6a69143 Mon Sep 17 00:00:00 2001 From: "Emden R. Gansner" Date: Thu, 8 Aug 2013 13:37:05 -0400 Subject: [PATCH] Put in SparseMatrix.c, which removes the need for the previous changes to the Makefiles. --- cmd/tools/Makefile.am | 1 - lib/sparse/Makefile.am | 1 - lib/sparse/SparseMatrix.c | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am index 9b87ccd72..8a96aeecb 100644 --- a/cmd/tools/Makefile.am +++ b/cmd/tools/Makefile.am @@ -153,7 +153,6 @@ mm2gv_SOURCES = mm2gv.c matrix_market.c mmio.c mm2gv_LDADD = \ $(top_builddir)/lib/common/libcommon_C.la \ - $(top_builddir)/lib/sfdpgen/libsfdpgen_C.la \ $(top_builddir)/lib/sparse/libsparse_C.la \ $(top_builddir)/lib/cgraph/libcgraph.la @MATH_LIBS@ diff --git a/lib/sparse/Makefile.am b/lib/sparse/Makefile.am index 8f4863482..f84c189b2 100644 --- a/lib/sparse/Makefile.am +++ b/lib/sparse/Makefile.am @@ -3,7 +3,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ - -I$(top_srcdir)/lib/sfdpgen \ -I$(top_srcdir)/lib/common noinst_HEADERS = SparseMatrix.h general.h BinaryHeap.h IntStack.h diff --git a/lib/sparse/SparseMatrix.c b/lib/sparse/SparseMatrix.c index e903b5c1d..2c6914762 100644 --- a/lib/sparse/SparseMatrix.c +++ b/lib/sparse/SparseMatrix.c @@ -20,8 +20,8 @@ #include "arith.h" #include "SparseMatrix.h" #include "BinaryHeap.h" -#include "LinkedList.h" #if PQ +#include "LinkedList.h" #include "PriorityQueue.h" #endif -- 2.40.0