From 3152da9d5a99a95ce75fee6c378a3b0711e28bb3 Mon Sep 17 00:00:00 2001
From: bustico
Date: Wed, 9 Apr 2008 15:28:53 +0000
Subject: fix macos file after failed attempt to use openmp on macos with gcc
 4.3

---
 src/Makefile.osx | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'src/Makefile.osx')

diff --git a/src/Makefile.osx b/src/Makefile.osx
index c95cf90..35e65de 100644
--- a/src/Makefile.osx
+++ b/src/Makefile.osx
@@ -25,9 +25,6 @@ REGEXP= -DUSE_PCRE_REGEX -DPCRE_OPT=$(PCRE_OPT)
 OBJ = ivyloop.o timer.o ivysocket.o ivy.o ivybuffer.o ivyfifo.o ivybind.o intervalRegexp.o
 OMPOBJ = ivyloop.o timer.o ivysocket_omp.o ivy_omp.o ivybuffer.o ivyfifo.o ivybind.o intervalRegexp.o
 
-CC=gcc
-LIBTOOL=ar q # linux and solaris
-CFLAGS = -g -Wall $(FPIC)
 TOOLS_DIR = ../tools
 
 # you should first install gcc version >= 4.3 
@@ -35,9 +32,21 @@ TOOLS_DIR = ../tools
 # using macport greatly simplify gcc install : port install gcc43
 OMPCC = gcc-mp-4.3  
 OMPCPP =  g++-mp-4.3
-OMPCFLAGS = $(CFLAGS) -fopenmp -DOPENMP=1
+OMPLIBTOOL =gar q
+OMPCFLAGS = -g -Wall $(FPIC) -fopenmp -DOPENMP=1
 OMPLIB = -lgomp -lpthread
 
+
+LIBTOOL=ar q # linux and solaris
+CFLAGS = -g -Wall $(FPIC)
+
+CC=gcc
+CPP=g++
+#CC = $(OMPCC)
+#CPP = $(OMPCPP)
+#LIBTOOL = $(OMPLIBTOOL)
+#CFLAGS = $(OMPCFLAGS)
+
 # ------------------------------------------------------------------------------------------
 
 .c.o:
@@ -47,8 +56,9 @@ OMPLIB = -lgomp -lpthread
 	$(CPP) $(CFLAGS)  -c $*.cpp
 
 
-all: static-libs shared-libs tools
+all: static-libs tools # shared-libs 
 libomp: libivy_omp.a 
+
 omp: libomp
 	@(cd $(TOOLS_DIR) && $(MAKE) -f Makefile.osx omp) 
 
-- 
cgit v1.1