From c5f385388ee7c73a991cf1c31c17521df88b5022 Mon Sep 17 00:00:00 2001
From: bustico
Date: Wed, 9 Apr 2008 14:43:42 +0000
Subject: update macosx Makefile for omp lib and tools

---
 tools/Makefile.osx | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'tools/Makefile.osx')

diff --git a/tools/Makefile.osx b/tools/Makefile.osx
index 4591e8e..580a44c 100644
--- a/tools/Makefile.osx
+++ b/tools/Makefile.osx
@@ -8,6 +8,9 @@ GLUTLIB = -L. -lglut -lGLU -lGL -lX11 -lXmu
 
 TARGETS = ivyprobe ivythroughput ivyperf #ivyprobe_efence 
 OMP_TARGET= ivyprobe_omp ivythroughput_omp 
+OMPLIB = -lgomp -lpthread
+OMPCC = gcc-mp-4.3  
+OMPCPP =  g++-mp-4.3
 
 PCRELIB = `pcre-config --libs`
 PCREINCL = `pcre-config --cflags`
@@ -26,27 +29,27 @@ all: $(TARGETS)
 omp: $(OMP_TARGET)
 
 ivyprobe: ivyprobe.o ../src/libivy.a
-	$(CC)  $(CFLAGS) $(EXTRAINC) -o $@ ivyprobe.o -L. -livy $(PCRELIB) $(EXTRALIB) 
+	$(CC)  $(CFLAGS) $(EXTRAINC) -o $@ ivyprobe.o -L../src -livy $(PCRELIB) $(EXTRALIB) 
 
 ivythroughput: ivythroughput.o ../src/libivy.a
-	$(CPP)  $(CFLAGS) $(EXTRAINC) -o $@ ivythroughput.o -L. -livy -lpcrecpp $(PCRELIB) $(EXTRALIB) 
+	$(CPP)  $(CFLAGS) $(EXTRAINC) -o $@ ivythroughput.o -L../src -livy -lpcrecpp $(PCRELIB) $(EXTRALIB) 
 
 ivyprobe_efence: ivyprobe.o ../src/libivy.a
-	$(CPP)  $(CFLAGS) $(EXTRAINC) -o $@ ivyprobe.o -L. -livy -lpcrecpp $(PCRELIB) $(EXTRALIB) -lefence
+	$(CPP)  $(CFLAGS) $(EXTRAINC) -o $@ ivyprobe.o -L../src -livy -lpcrecpp $(PCRELIB) $(EXTRALIB) -lefence
 
 
 
 ivyprobe_omp: ivyprobe.o ../src/libivy_omp.a
-	$(CC)  $(CFLAGS) $(EXTRAINC) $(PCREINCL) -o $@ ivyprobe.o -L. -livy_omp $(PCRELIB) $(EXTRALIB) $(OMPLIB)
+	$(OMPCC)  $(CFLAGS) $(EXTRAINC) $(PCREINCL) -o $@ ivyprobe.o -L../src -livy_omp $(PCRELIB) $(EXTRALIB) $(OMPLIB)
 
 ivythroughput_omp: ivythroughput.o ../src/libivy_omp.a
-	$(CPP)  $(CFLAGS) $(EXTRAINC) $(PCREINCL) -o $@ ivythroughput.o -L. -livy_omp -lpcrecpp $(PCRELIB) $(EXTRALIB) $(OMPLIB)
+	$(OMPCPP)  $(CFLAGS) $(EXTRAINC) $(PCREINCL) -o $@ ivythroughput.o -L../src -livy_omp -lpcrecpp $(PCRELIB) $(EXTRALIB) $(OMPLIB)
 
 ivyprobe.o : ivyprobe.c 
 	$(CC)  $(CFLAGS) $(EXTRAINC) $(REGEXP) -c ivyprobe.c -o $@
 
 ivyperf: ivyperf.o ../src/libivy.a
-	$(CC)  $(CFLAGS) $(EXTRAINC) -o $@ ivyperf.o -L. -livy $(PCRELIB) $(EXTRALIB)
+	$(CC)  $(CFLAGS) $(EXTRAINC) -o $@ ivyperf.o -L../src -livy $(PCRELIB) $(EXTRALIB)
 
 
 installbins: $(TARGETS)
-- 
cgit v1.1