From ca5e5b0b40925ddbce06fb0fd9a7bc7ee860190d Mon Sep 17 00:00:00 2001
From: Yoni Fogel <yoni@tokutek.com>
Date: Tue, 11 Mar 2008 16:09:03 +0000
Subject: [PATCH] Working on getting new range tree library

git-svn-id: file:///svn/tokudb@2732 c7de825b-a66e-492c-adef-691d508d4ae1
---
 src/range_tree/Makefile           |  2 +-
 src/range_tree/rangeexport.map    | 13 +++++++++++++
 src/range_tree/redblackexport.map | 14 --------------
 src/range_tree/tests/Makefile     |  6 +++---
 4 files changed, 17 insertions(+), 18 deletions(-)
 create mode 100644 src/range_tree/rangeexport.map
 delete mode 100644 src/range_tree/redblackexport.map

diff --git a/src/range_tree/Makefile b/src/range_tree/Makefile
index 0fdfc943d7d..ac065bf161c 100644
--- a/src/range_tree/Makefile
+++ b/src/range_tree/Makefile
@@ -5,7 +5,7 @@ OPTFLAGS = -O2
 
 LIBNAME=libtokurange
 
-EXPORTMAP = -Wl,--version-script=export.map
+EXPORTMAP = -Wl,--version-script=rangeexport.map
 VISIBILITY = -fvisibility=hidden
 
 ifneq ($(OSX),)
diff --git a/src/range_tree/rangeexport.map b/src/range_tree/rangeexport.map
new file mode 100644
index 00000000000..8a066fb11d1
--- /dev/null
+++ b/src/range_tree/rangeexport.map
@@ -0,0 +1,13 @@
+{
+ global:
+   toku_rbt_init;
+   toku_rbt_destroy;
+   toku_rbt_lookup;
+   toku_rbt_finger_successor;
+   toku_rbt_finger_insert;
+   toku_rbt_finger_delete;
+   toku_rbt_finger_predecessor;
+
+ local: *;
+};
+
diff --git a/src/range_tree/redblackexport.map b/src/range_tree/redblackexport.map
deleted file mode 100644
index 0db392727d7..00000000000
--- a/src/range_tree/redblackexport.map
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- global:
-   db_create;
-   db_env_create; 
-   db_strerror;
-   db_version;
-   log_compare;
-   db_env_set_func_fsync;   
-
-   toku_ydb_error_all_cases;
-
- local: *;
-};
-
diff --git a/src/range_tree/tests/Makefile b/src/range_tree/tests/Makefile
index f9941699e85..caf2a0a18c2 100644
--- a/src/range_tree/tests/Makefile
+++ b/src/range_tree/tests/Makefile
@@ -86,14 +86,14 @@ endif
 	$(MAYBEATSIGN) $(VGRIND) ./$< $(VERBVERBOSE)
 
 LINEAR_BINS = ../linear.o
-TLOG_BINS   = ../log_nooverlap.o ../tokuredblack.o
+TLOG_BINS   = ../log_nooverlap.o
 LOG_BINS    = ../log.o
 HEADERS=../rangetree.h ../rangetree-internal.h test.h
 
 %.lin: %.c  $(HEADERS) $(LINEAR_BINS)
 	cc  -DDIR=\"dir.$<.lin\" $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINEAR_BINS)
-%.tlog: %.c $(HEADERS) $(TLOG_BINS)
-	cc  -DDIR=\"dir.$<.log\" $(CFLAGS) $(CPPFLAGS) $< -o $@ $(TLOG_BINS) -DTOKU_RT_NOOVERLAPS
+%.tlog: %.c $(HEADERS) $(TLOG_BINS) ../libtokurange.so
+	cc  -L../ -ltokurange -Wl,-rpath,.. -DDIR=\"dir.$<.log\" $(CFLAGS) $(CPPFLAGS) $< -o $@ $(TLOG_BINS) -DTOKU_RT_NOOVERLAPS
 %.log: %.c  $(HEADERS) $(LOG_BINS)
 	cc  -DDIR=\"dir.$<.log\" $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LOG_BINS)