From 2a45d6fcf07833e0604bc5dd0afc53b03fd1c5a1 Mon Sep 17 00:00:00 2001
From: sageweil <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
Date: Fri, 31 Aug 2007 18:08:08 +0000
Subject: [PATCH] llnl mpi fixups

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1762 29311d96-e01e-0410-9327-a35deaab8ce9
---
 trunk/ceph/Makefile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/trunk/ceph/Makefile b/trunk/ceph/Makefile
index d4144d3fa6ca3..dccaa2e16c7a0 100644
--- a/trunk/ceph/Makefile
+++ b/trunk/ceph/Makefile
@@ -13,10 +13,10 @@
 #  on issdm, it's /usr/local/mpich2/bin.
 
 # Hook for extra -I options, etc.
-EXTRA_CFLAGS = -I${HOME}/include -L${HOME}/lib
+EXTRA_CFLAGS = #-I${HOME}/include -L${HOME}/lib
 
 # base
-CFLAGS = -pg -g -Wall -I. -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE ${EXTRA_CFLAGS}
+CFLAGS = -O3 -pg -g -Wall -I. -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE ${EXTRA_CFLAGS}
 LDINC = ld -i -o
 CC = g++
 LIBS = -pthread
@@ -41,7 +41,7 @@ MPILIBS = ${LIBS}
 
 #for LLNL boxes without mpicxx
 #MPICC = g++
-#MPICFLAGS = ${CFLAGS} -I/usr/lib/mpi/include -L/usr/lib/mpi/mpi_gnu/lib
+#MPICFLAGS = ${CFLAGS} -I/usr/lib/mpi/mpi_gnu/include -L/usr/lib/mpi/mpi_gnu/lib
 #MPILIBS = ${LIBS} -lelan -lmpi
 
 EBOFS_OBJS= \
@@ -230,6 +230,10 @@ testos: test/testos.o ebofs.o osbdb.o common.o
 	${CC} ${CFLAGS} ${LIBS} ${OSBDB_LIBS} -o $@ $^
 
 
+# misc
+gprof-helper.so: test/gprof-helper.c
+	gcc -shared -fPIC test/gprof-helper.c -o gprof-helper.so -lpthread -ldl 
+
 # bits
 common.o: ${COMMON_OBJS}
 	${LDINC} $@ $^
@@ -261,7 +265,7 @@ osbdb.o: ${OSBDB_OBJS}
 	${CC} -shared -fPIC ${CFLAGS} $< -o $@
 
 %.o: %.cc
-	${CC} -fPIC ${CFLAGS} -c $< -o $@
+	${CC} ${CFLAGS} -c $< -o $@
 
 %.po: %.cc
 	${CC} -fPIC ${CFLAGS} -c $< -o $@
-- 
2.39.5