Addresses #1376

First attempt at using bundles for ipo_libtokudb.obj
This should allow a not-clean directory to make the optimized lib.

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

src/Makefile

@@ -15,7 +15,9 @@ include $(TOKUROOT)toku_include/Makefile.include
 CPPFLAGS+=-D_GNU_SOURCE -D_THREAD_SAFE
 
 YDB=ydb.$(AEXT)
+YDB_BUNDLE=ydb.bundle
 TYDB=tydb.$(AEXT)
+TYDB=tydb.bundle
 
 LIBNAME=libtokudb
 TLIBNAME=libtokudbtrace
@@ -96,8 +98,8 @@ endif
 static_libtokudb.lib: $(YDB) $(LOCKTREE) $(RANGETREE) $(NEWBRT) $(LIBPORTABILITY)
 	xilib /out:$@ $^
 
-ipo_libtokudb.obj: $(YDB) $(LOCKTREE) $(RANGETREE) $(NEWBRT) $(LIBPORTABILITY)
-	$(CC) -Qipo-c *.obj lock_tree/*.obj range_tree/*.obj ../newbrt/*.obj
+ipo_libtokudb.obj: $(YDB_BUNDLE) $(LOCKTREE_BUNDLE) $(RANGETREE_BUNDLE) $(NEWBRT_BUNDLE) $(LIBPORTABILITY_BUNDLE)
+	$(CC) $(CFLAGS) $(CPPFLAGS) -Qipo-c $(filter %.$(OEXT),$^) $(patsubst %.bundle, %.bundle/*.$(OEXT), $(filter-out %.$(OEXT),$^))
 	mv ipo_out.obj $@
 
 ipo_libtokudb.lib: ipo_libtokudb.obj

toku_include/Makefile.include

@@ -88,7 +88,8 @@ SYMBOLS   = -g3 -ggdb3
 PORTABILITY=
 SKIP_WARNING=
 COMBINE_C = -combine -c
-LIBPORTABILITY   = $(TOKUROOT)lib/libtokuportability.$(AEXT)
+LIBPORTABILITY        = $(TOKUROOT)lib/libtokuportability.$(AEXT)
+LIBPORTABILITY_BUNDLE = $(TOKUROOT)lib/libtokuportability.bundle
 
 PORTABILITY_HEADERS= $(TOKUROOT)linux
 ALWAYS_LINK= $(LIBPORTABILITY) -lz -lpthread 
@@ -326,6 +327,7 @@ endif
 
 ifeq ($(SKIP_LOCKTREERULE),)
 LOCKTREE         = $(TOKUROOT)src/lock_tree/locktree.$(AEXT)
+LOCKTREE_BUNDLE  = $(TOKUROOT)src/lock_tree/locktree.bundle
 LOCKTREE_LINEAR  = $(TOKUROOT)src/lock_tree/locktree_linear.$(AEXT)
 LOCKTREE_TLOG    = $(TOKUROOT)src/lock_tree/locktree_tlog.$(AEXT)
 LOCKTREE_LOG     = $(TOKUROOT)src/lock_tree/locktree_log.$(AEXT)
@@ -335,6 +337,7 @@ endif
 
 ifeq ($(SKIP_RANGETREERULE),)
 RANGETREE        = $(TOKUROOT)src/range_tree/rangetree.$(AEXT)
+RANGETREE_BUNDLE = $(TOKUROOT)src/range_tree/rangetree.bundle
 RANGETREE_LINEAR = $(TOKUROOT)src/range_tree/rangetree_linear.$(AEXT)
 RANGETREE_TLOG   = $(TOKUROOT)src/range_tree/rangetree_tlog.$(AEXT)
 RANGETREE_LOG    = $(TOKUROOT)src/range_tree/rangetree_log.$(AEXT)