coinor-csdp (6.1.1-1) Makefile.patch

Summary

 Makefile         |   12 +++++++-----
 example/Makefile |    4 ++--
 lib/Makefile     |    2 +-
 solver/Makefile  |    4 ++--
 theta/Makefile   |    4 ++--
 5 files changed, 14 insertions(+), 12 deletions(-)

    
download this patch

Patch contents

Index: coinor-csdp-6.1.0/Makefile
===================================================================
--- coinor-csdp-6.1.0.orig/Makefile	2006-11-03 20:29:50.000000000 +0100
+++ coinor-csdp-6.1.0/Makefile	2010-03-03 12:27:48.000000000 +0100
@@ -7,6 +7,8 @@
 #
 # Generic. On most systems, this should handle everything.
 #
+DESTDIR=/usr/local/bin
+
 all:
 	cd lib; make libsdp.a
 	cd solver; make csdp
@@ -25,11 +27,11 @@
 #
 
 install:
-	cp -f solver/csdp /usr/local/bin
-	cp -f theta/theta /usr/local/bin
-	cp -f theta/graphtoprob /usr/local/bin
-	cp -f theta/complement /usr/local/bin
-	cp -f theta/rand_graph /usr/local/bin
+	cp -f solver/csdp $(DESTDIR)
+	cp -f theta/theta $(DESTDIR)
+	cp -f theta/graphtoprob $(DESTDIR)
+	cp -f theta/complement $(DESTDIR)
+	cp -f theta/rand_graph $(DESTDIR)
 
 #
 # Clean out all of the directories.
Index: coinor-csdp-6.1.0/example/Makefile
===================================================================
--- coinor-csdp-6.1.0.orig/example/Makefile	2009-12-30 06:17:22.000000000 +0100
+++ coinor-csdp-6.1.0/example/Makefile	2010-03-03 12:28:51.000000000 +0100
@@ -19,7 +19,7 @@
 #
 # The default settings for gcc:
 #
-CFLAGS=-O3 -ansi -Wall -DNOSHORTS -I../include 
+CFLAGS=-O3 -ansi -fopenmp -Wall -DNOSHORTS -DUSEOPENMP -I../include
 #
 # Notes on CFLAGS.
 #
@@ -88,7 +88,7 @@
 # The default settings for a Linux system with gcc3, lapack, blas, and 
 # gfortran:
 #
-LIBS=-L../lib -lsdp -llapack -lblas -lgfortran -lm
+LIBS=-L../lib -lsdp -llapack -lblas -lm
 #
 # 1. Warning about debian systems.  For some absurb reason, the BLAS
 # package in debian has the BLAS library named libblas-3.a, rather than
Index: coinor-csdp-6.1.0/solver/Makefile
===================================================================
--- coinor-csdp-6.1.0.orig/solver/Makefile	2010-01-06 00:05:04.000000000 +0100
+++ coinor-csdp-6.1.0/solver/Makefile	2010-03-03 12:32:33.000000000 +0100
@@ -21,7 +21,7 @@
 #
 # The default settings for gcc:
 #
-CFLAGS=-O3 -ansi -Wall -DNOSHORTS -DUSEGETTIME -I../include 
+CFLAGS=-O3 -ansi -fopenmp -Wall -DNOSHORTS -DUSEGETTIME -DUSEOPENMP -I../include
 #
 # Notes on CFLAGS.
 #
@@ -94,7 +94,7 @@
 # The default settings for a Linux system with gcc3, lapack, blas, and 
 # gfortran:
 #
-LIBS=-L../lib -lsdp -llapack -lblas -lgfortran -lm
+LIBS=-fopenmp -L../lib -lsdp -llapack -lblas -lm
 #
 # 1. Warning about debian systems.  For some absurb reason, the BLAS
 # package in debian has the BLAS library named libblas-3.a, rather than
Index: coinor-csdp-6.1.0/theta/Makefile
===================================================================
--- coinor-csdp-6.1.0.orig/theta/Makefile	2009-12-30 06:17:22.000000000 +0100
+++ coinor-csdp-6.1.0/theta/Makefile	2010-03-03 12:31:04.000000000 +0100
@@ -19,7 +19,7 @@
 #
 # The default settings for gcc:
 #
-CFLAGS=-O3 -ansi -Wall -DNOSHORTS -I../include 
+CFLAGS=-O3 -ansi -fopenmp -Wall -DNOSHORTS -DUSEOPENMP -I../include
 #
 # Notes on CFLAGS.
 #
@@ -87,7 +87,7 @@
 #
 # The default settings for a Linux system with gcc3, lapack, blas, and g2c:
 #
-LIBS=-L../lib -lsdp -llapack -lblas -lgfortran -lm
+LIBS=-fopenmp -L../lib -lsdp -llapack -lblas -lm
 #
 # 1. Warning about debian systems.  For some absurb reason, the BLAS
 # package in debian has the BLAS library named libblas-3.a, rather than
Index: coinor-csdp-6.1.0/lib/Makefile
===================================================================
--- coinor-csdp-6.1.0.orig/lib/Makefile	2009-11-22 00:19:48.000000000 +0100
+++ coinor-csdp-6.1.0/lib/Makefile	2010-03-03 12:31:59.000000000 +0100
@@ -24,7 +24,7 @@
 #
 # The default settings for gcc:
 #
-CFLAGS=-O3 -ansi -Wall -DNOSHORTS -DUSEGETTIME -I../include
+CFLAGS=-O3 -ansi -fopenmp -Wall -DNOSHORTS -DUSEGETTIME -DUSEOPENMP -I../include
 #
 # Notes on CFLAGS.
 #