makefile improvements

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

newbrt/Makefile

@@ -3,7 +3,10 @@
 .DEFAULT_GOAL= build
 TOKUROOT=../
 INCLUDEDIRS=-I. -I../include
+ifneq ($(COMBINE),0)
 COMBINE=1
+endif
+
 #TODO: Replace DEPEND_COMPILE with auto-dependancy generation.
 DEPEND_COMPILE += \
   $(wildcard *.h) \

toku_include/Makefile.include

@@ -98,11 +98,14 @@ else
 WERROR    = -Werror
 endif
 
-# -Wno-deprecated is needed on gcc 4.4.2 to make the #ident complaints go away.
+# -Wno-deprecated is needed on gcc 4.4.{1,2} to make the #ident complaints go away.
 # -Wno-strict-aliasing is needed on gcc 4.4.2 to make certain gratuitous warnings go away.
 ifeq ($(GCCVERSION),4.4.2)
  GCC_VERSION_SPECIFIC = -Wno-deprecated 
 endif
+ifeq ($(GCCVERSION),4.4.1)
+ GCC_VERSION_SPECIFIC = -Wno-deprecated
+endif
 WALL      = $(GCC_VERSION_SPECIFIC) -Wall -Wextra -Wcast-align -Wbad-function-cast -Wno-missing-noreturn -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
 
 FORMAT    = -Wmissing-format-attribute #-Wformat=2 #Stronger printf warnings once logger.c cleaned up