From 1bdd32e4ae5bb7f4e5ab8f50e04e6405a98c6735 Mon Sep 17 00:00:00 2001 From: Kai Ni Date: Fri, 4 Jun 2010 20:27:37 +0000 Subject: [PATCH] add the long integer version of the object to prevent the conflict with SuiteSparse --- colamd/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/colamd/Makefile b/colamd/Makefile index e91b5567e..987b41b80 100755 --- a/colamd/Makefile +++ b/colamd/Makefile @@ -11,17 +11,17 @@ CXXFLAGS += -fPIC sources = $(shell ls *.c) -objects = $(sources:.c=.o) library = libcolamd.a #Note: hack was added to ensure that flags are acutally used for compilation # This should probably be fixed, but will work for 64 bit machines now -$(library): $(objects) - $(CXX) $(CXXFLAGS) -c -o colamd.o colamd.c +$(library): + $(CXX) $(CXXFLAGS) -c -o colamd.o colamd.c + $(CXX) $(CXXFLAGS) -c -DDLONG -o colamd_l.o colamd.c $(CXX) $(CXXFLAGS) -c -o colamd_global.o colamd_global.c - ar crsv $@ $(objects) + ar crsv $@ colamd.o colamd_l.o colamd_global.o ranlib $(library) clean: