From 1ccd5d9eeeda2b1822b8db0a7e6ce282ef875afe Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Wed, 12 Mar 2008 19:51:05 -0700
Subject: [PATCH] ok, builds up from scratch now

---
 src/Makefile.am | 10 +++++-----
 src/crushtool   |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index dfb5b6af50a93..8b0586ea5ec1a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -61,7 +61,7 @@ streamtest_LDADD = libosd.a libebofs.a libcommon.a
 # crushwrapper
 SWIG_FILES = crush/CrushWrapper.i crush/CrushWrapper.h
 crush/CrushWrapper_wrap.cxx: ${SWIG_FILES}
-	${SWIG} -perl5 -c++ -shadow $<
+	${SWIG} -perl5 -c++ -shadow -outdir . $<
 
 crush/mapper.fpicco: crush/mapper.c
 	${CC} -fPIC ${CFLAGS} -I. -c $< -o $@
@@ -73,10 +73,10 @@ crush/crush.fpicco: crush/crush.c
 	${CC} -fPIC ${CFLAGS} -I. -c $< -o $@
 
 CRUSH_FILES = crush/mapper.fpicco crush/builder.fpicco crush/crush.fpicco
-libcrushwrapper.so: crush/CrushWrapper_wrap.cxx ${CRUSH_FILES}
-	${CXX} ${CXXFLAGS} ${SWIG_PL_INCLUDES} -I. -shared -fPIC crush/CrushWrapper_wrap.cxx config.cc ${CRUSH_FILES} -o libcrushwrapper.so
+libCrushWrapper.so: crush/CrushWrapper_wrap.cxx ${CRUSH_FILES}
+	${CXX} ${CXXFLAGS} ${SWIG_PL_INCLUDES} -I. -shared -fPIC crush/CrushWrapper_wrap.cxx config.cc ${CRUSH_FILES} -o $@
 
-BUILT_SOURCES = libcrushwrapper.so
+BUILT_SOURCES = libCrushWrapper.so
 
 ##
 INCLUDES = 
@@ -89,7 +89,7 @@ AM_LDFLAGS =
 bin_PROGRAMS = \
 	cmon cmds cosd csyn \
 	cmonctl \
-	mkmonfs monmaptool osdmaptool crushtool \
+	mkmonfs monmaptool osdmaptool \
 	fakesyn \
 	streamtest \
 	$(FUSEBIN) $(NEWSYN)
diff --git a/src/crushtool b/src/crushtool
index e5424d9fecbd5..838d7f6690cd4 100755
--- a/src/crushtool
+++ b/src/crushtool
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 
-use lib 'crush';
 use CrushWrapper;
 use Config::General;
 use Tie::IxHash;
-- 
2.39.5