Put in SparseMatrix.c, which removes the need for the previous changes to the Makefiles.

diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
index 9b87ccd7233865b8ce5a0916284c93ad89e4b7b8..8a96aeecbb32c7d36f08ff0b5a4f92e0fccd6c5b 100644 (file)
--- 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 8f48634828db43517d6094fdcb96a930e4dc0f98..f84c189b2888c67ea63d9c4c7e3b8764b43e8e95 100644 (file)
--- 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 e903b5c1dec069fe64e353ac6a1b1825e70d82af..2c6914762e0b34f6b3c78715584675b15f0c468c 100644 (file)
--- 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