From c892f0850dc9a96d9805d3b7c42ca153475a4ebe Mon Sep 17 00:00:00 2001
From: topher <topher@29311d96-e01e-0410-9327-a35deaab8ce9>
Date: Sat, 30 Apr 2005 21:36:37 +0000
Subject: [PATCH] Second try: Update for MPICH2; use $@ & $^ to eliminate
 redundancy.

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@186 29311d96-e01e-0410-9327-a35deaab8ce9
---
 ceph/Makefile | 84 +++++++++++++++++++++++----------------------------
 1 file changed, 38 insertions(+), 46 deletions(-)

diff --git a/ceph/Makefile b/ceph/Makefile
index d0b0524281412..af93235e7cfba 100644
--- a/ceph/Makefile
+++ b/ceph/Makefile
@@ -1,68 +1,60 @@
 
-CC=g++
-#CC=distcc g++
-CFLAGS=-g -I. -pg -D_FILE_OFFSET_BITS=64
+# mpicxx must be on your path; on Szilard, this means that
+# /usr/local/mpich2-1.0.1/bin must be on your path.
+CC=mpicxx
+MPICC=mpicxx
+CFLAGS=-g -I. -pg -D_FILE_OFFSET_BITS=64 -DMPICH_IGNORE_CXX_SEEK
 LIBS=-lpthread
 
-#
-# i give up, use MPI provided compile scripts, like you're supposed to.
-#
-MPIDIR=/usr/local/mpich-1.2.6
-MPICC=${MPIDIR}/bin/mpicxx
-MPICFLAGS=${CFLAGS} -I${MPIDIR}/include -L${MPIDIR}/lib
-MPILIBS=${LIBS}
-
-LEAKTRACER=
-#LEAKTRACER=$(HOME)/lib/LeakTracer.o
-
-SRCS=*.cc */*.cc
-OBJS=osd/OSD.o\
- msg/Messenger.o\
- mds/MDBalancer.o\
- mds/MDS.o\
- mds/CDentry.o\
- mds/CDir.o\
- mds/CInode.o\
- mds/MDCache.o\
- mds/MDStore.o\
- mds/LogStream.o\
- mds/IdAllocator.o\
- mds/MDLog.o\
- mds/MDCluster.o\
- fakeclient/FakeClient.o\
- Logger.o\
- clock.o\
- config.o
-
-TARGETS=test import mpitest
+PMDS_OBJS= \
+	osd/OSD.o\
+	msg/Messenger.o\
+	mds/MDBalancer.o\
+	mds/MDS.o\
+	mds/CDentry.o\
+	mds/CDir.o\
+	mds/CInode.o\
+	mds/MDCache.o\
+	mds/MDStore.o\
+	mds/LogStream.o\
+	mds/IdAllocator.o\
+	mds/MDLog.o\
+	mds/MDCluster.o\
+	fakeclient/FakeClient.o\
+	Logger.o\
+	clock.o\
+	config.o
+
+TARGETS=test import mpitest singleclient
 
 all: depend ${TARGETS}
 
 
-test: test.cc msg/FakeMessenger.o pmds.o msg/MTMessenger.o msg/support.o
-	test ! -e leak.out || rm leak.out
-	${CC} ${CFLAGS} ${LIBS} pmds.o msg/FakeMessenger.o test.cc ${LEAKTRACER} -o test
+test: test.cc msg/FakeMessenger.o pmds.o  msg/MTMessenger.o msg/support.o
+	${CC} ${CFLAGS} ${LIBS} $^ -o $@
 
 import: pmds.o msg/FakeMessenger.o import.cc
-	${CC} ${CFLAGS} ${LIBS} pmds.o msg/FakeMessenger.o import.cc ${LEAKTRACER} -o import
+	${CC} ${CFLAGS} ${LIBS} $^ -o $@
 
 mpitest: mpitest.o msg/MPIMessenger.cc pmds.o
-	${MPICC} ${CFLAGS} ${MPILIBS} mpitest.o msg/MPIMessenger.cc pmds.o  -o mpitest
+	${MPICC} ${CFLAGS} $^ -o $@
 
-singleclient: pmds.o fakesingleclient.o client/Client.o msg/CheesySerializer.o msg/FakeMessenger.o fsck.o
-	${CC} ${CFLAGS} ${LIBS} pmds.o client/Client.o msg/FakeMessenger.o msg/CheesySerializer.o fakesingleclient.o fsck.o ${LEAKTRACER} -o singleclient
+singleclient: pmds.o fakesingleclient.o client/Client.o \
+msg/CheesySerializer.o msg/FakeMessenger.o 
+	${CC} ${CFLAGS} ${LIBS} $^ -o $@
 
-fuseclient: client/Client.o client/fuse.o msg/CheesySerializer.o msg/FakeMessenger.o 
-	${CC} ${CFLAGS} ${LIBS} pmds.o client/fuse.o client/Client.o msg/FakeMessenger.o msg/CheesySerializer.o ${LEAKTRACER} -o fuseclient
+fuseclient: client/Client.o client/fuse.o msg/CheesySerializer.o \
+msg/FakeMessenger.o 
+	${CC} ${CFLAGS} ${LIBS} $^ -o $@
 
 clean:
-	rm *.o */*.o ${TARGETS}
+	rm -f *.o */*.o ${TARGETS}
 
 %.o: %.cc
 	${CC} ${CFLAGS} -c $< -o $@
 
-pmds.o: ${OBJS}
-	ld -i -o pmds.o ${OBJS} 
+pmds.o: ${PMDS_OBJS}
+	ld -i -o pmds.o $^
 
 .depend:
 	touch .depend
-- 
2.39.5