rename libdb.so to libtokudb.so. closes #150

git-svn-id: file:///svn/tokudb@2230 c7de825b-a66e-492c-adef-691d508d4ae1

cxx/Makefile

@@ -7,7 +7,7 @@ LDFLAGS = -lz
 SRCS = $(wildcard *.cpp)
 OBJS = $(patsubst %.cpp, %.o, $(SRCS))
 
-LIBNAME = libtdb_cxx
+LIBNAME = libtokudb_cxx
 
 default: install
 install: $(LIBNAME).a

cxx/tests/Makefile

@@ -5,7 +5,7 @@ TARGETS = $(patsubst %.cpp,%,$(SRCS))
 # GCOV_FLAGS = -fprofile-arcs -ftest-coverage
 CPPFLAGS = -I../ -I../../include
 CXXFLAGS = -Wall $(OPTFLAGS) -g $(GCOV_FLAGS)
-LDLIBS = ../../lib/libtdb_cxx.a ../../lib/libdb.a -lz
+LDLIBS = ../../lib/libtokudb_cxx.a ../../lib/libtokudb.a -lz
 
 ifneq ($(OSX),)
  VGRIND=

db-benchmark-test-cxx/Makefile

@@ -35,10 +35,9 @@ check-x: $(TARGET_TDB)
 clean:
 	rm -rf $(TARGETS) $(BENCHDBS) *.gcno *.gcda *.gcov
 
-db-benchmark-test-tokudb: ../lib/libtdb_cxx.a
+db-benchmark-test-tokudb: ../lib/libtokudb_cxx.a
 db-benchmark-test-tokudb: db-benchmark-test.cpp
-#	$(CXX) $(CXXFLAGS) -I../include $< -o $@ -DDIRSUF=tokudb ../lib/libdb.a ../lib/libtdb_cxx.a -lz
-	$(CXX) $(CXXFLAGS) -I../include -L../lib -Wl,-rpath,$(PWD)/../lib $< -o $@ -ldb -ltdb_cxx -DDIRSUF=tokudb
+	$(CXX) $(CXXFLAGS) -I../include -L../lib -Wl,-rpath,$(PWD)/../lib $< -o $@ -ltokudb -ltokudb_cxx -DDIRSUF=tokudb
 
 db-benchmark-test-bdb: db-benchmark-test.cpp
 	$(CXX) $(CXXFLAGS) $(BDB_CPPFLAGS) $(BDB_LDFLAGS)                      $< -o $@ -DDIRSUF=bdb

db-benchmark-test/Makefile

@@ -19,7 +19,7 @@ BDB_CPPFLAGS =
 BDB_LDFLAGS = -ldb
 endif
 TDB_CPPFLAGS = -I../include
-TDB_LDFLAGS = -L../lib -ldb -Wl,-rpath=$(PWD)/../lib
+TDB_LDFLAGS = -L../lib -ltokudb -Wl,-rpath=$(PWD)/../lib
 
 TARGET_BDB = db-benchmark-test-bdb
 TARGET_TDB = db-benchmark-test-tokudb

install.bash

@@ -40,6 +40,7 @@ cp include/db_cxx.h $targetdir/include
 
 mkdir $targetdir/lib
 cp lib/libtokudb.so $targetdir/lib
+cp lib/libtokudb_cxx.a $targetdir/lib
 
 mkdir $targetdir/bin
 cp utils/tokudb_load_static $targetdir/bin/tokudb_load

src/Makefile

 # On OSX do:
 #   make OSX=OSX
 
-LIBNAME=libdb
+LIBNAME=libtokudb
 
 OPTFLAGS = -O2
 # GCOV_FLAGS = -fprofile-arcs -ftest-coverage
@@ -55,4 +55,4 @@ $(LIBNAME).$(LIBEXT): $(DBBINS) $(LOCKTREE_BINS)
 $(LIBNAME).a: $(DBBINS) $(LOCKTREE_BINS)
 	$(AR) rv $@ $^
 
-libdb.a(ydb.o): ydb.o
+$(LIBNAME).a(ydb.o): ydb.o

src/tests/Makefile

@@ -17,7 +17,7 @@ ifneq ($(OSX),)
  LIBEXT=dylib
  VGRIND=
  BDB_SUPPRESSIONS=
- TDB_LOADLIBES = -L../ -ldb
+ TDB_LOADLIBES = -L../ -ltokudb
  SETTOKUENV=export DYLD_LIBRARY_PATH=.. ;
  UNSETTOKUENV=unset DYLD_LIBRARY_PATH ;
 else
@@ -29,7 +29,7 @@ else
   BDB_LDFLAGS += -Wl,-rpath,$(BDBDIR)/lib
  endif
  BDB_LDFLAGS += -lpthread
- TDB_LOADLIBES = -L../ -ldb -Wl,-rpath,.. -lpthread
+ TDB_LOADLIBES = -L../ -ltokudb -Wl,-rpath,.. -lpthread
  VGRIND=valgrind --quiet --error-exitcode=1 --leak-check=yes
 endif
 ifeq ($(VGRIND),)

utils/Makefile

@@ -26,11 +26,11 @@ else
  SETTOKUENV=
  UNSETTOKUENV=
 endif
-LDFLAGS = -L../lib -ldb -lpthread $(TDB_LOADLIBES)
+LDFLAGS = -L../lib -ltokudb -lpthread $(TDB_LOADLIBES)
 
-# vars to compile bins that handle tokudb using libdb.a
+# vars to compile bins that handle tokudb using libtokudb.a
 STATIC_CPPFLAGS = -I../include 
-STATIC_LDFLAGS = ../lib/libdb.a -lz
+STATIC_LDFLAGS = ../lib/libtokudb.a -lz
 
 # vars to compile bins that handle bdb
 BDB_CPPFLAGS = -I$(BDBDIR)/include