Make the dynamic library work with COMBINE=0 mode also. (Since on Ubunto 9.10...

Make the dynamic library work with COMBINE=0 mode also.  (Since on Ubunto 9.10 with gcc 4.4.1, -combine doesn't work.  Refs #2848. [t:2848]

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

newbrt/Makefile

@@ -122,8 +122,8 @@ endif
 
 $(NEWBRT_O_FILES): VISIBILITY=
 $(NEWBRT): $(NEWBRT_O_FILES)
-$(NEWBRT_SO): $(NEWBRT_O_FILES)
-	$(TOKULINKER) $(SHARED) $(SYMBOLS) $(NEWBRT_O_FILES) -o$(NEWBRT_SO)
+$(NEWBRT_SO): newbrt.bundle
+	$(TOKULINKER) $(SHARED) $(SYMBOLS) newbrt.bundle/*.o -o$(NEWBRT_SO)
 
 $(NEWBRT_BUNDLE): log_code.c log_header.h
 
@@ -151,7 +151,7 @@ logformat$(BINSUF): logformat.c $(LIBPORTABILITY)
 	$(CC) $< $(BIN_FROM_O_FLAGS_NOLIB) $(ALWAYS_LINK) $(LINK_MUST_BE_LAST)
 
 
-libs: $(NEWBRT) $(NEWBRT_BUNDLE)
+libs: $(NEWBRT_SO) $(NEWBRT) $(NEWBRT_BUNDLE)
 bins: $(BINS)
 
 # Put the benchmarktest_256 first since it takes the longest (and we want to use parallelism in the make)

toku_include/Makefile.include

@@ -511,7 +511,7 @@ CXXFLAGS=$(filter-out -Wbad-function-cast -Wstrict-prototypes -Wmissing-prototyp
 	$(AR) $(ARFLAGS) $(AROUTPUT)$@ $(filter %.$(OEXT),$^) $(patsubst %.bundle, %.bundle/*.$(OEXT), $(filter-out %.$(OEXT),$^))
 ifeq ($(AEXT),a)
 %.bundle: %.$(AEXT)
-	mkdir -p $@ && cd $@ && $(AR) x ../$(<F)
+	rm -f $@/*.$(OEXT) && mkdir -p $@ && cd $@ && $(AR) x ../$(<F)
 	touch $@
 else
 #Windows lib cannot extract everything.