ok, builds up from scratch now

diff --git a/src/Makefile.am b/src/Makefile.am
index dfb5b6af50a93cef3fc87509a3d3d2c10d826cf6..8b0586ea5ec1ad55e2bb1eee32413cdfeb4d2ca2 100644 (file)
--- 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 e5424d9fecbd5c0d98310f45228a70f89f9f8d30..838d7f6690cd4483c9a68cd3b09bc1de2dcf9c31 100755 (executable)
--- a/src/crushtool
+++ b/src/crushtool
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 
-use lib 'crush';
 use CrushWrapper;
 use Config::General;
 use Tie::IxHash;