From 8a9c22785d658d0150407a9a9319a009e14d4626 Mon Sep 17 00:00:00 2001 From: Rich Prohaska <prohaska@tokutek.com> Date: Fri, 21 Nov 2008 12:33:12 +0000 Subject: [PATCH] imp make DEBUG=0 or DEBUG=1. closes #1272 git-svn-id: file:///svn/toku/tokudb.1032b@8075 c7de825b-a66e-492c-adef-691d508d4ae1 --- include/Makefile.include | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/include/Makefile.include b/include/Makefile.include index 5d18a77788..833a3af6f0 100644 --- a/include/Makefile.include +++ b/include/Makefile.include @@ -41,6 +41,8 @@ # To make warnings be warnngs instead of errors do # make WERROR= +DEBUG = 0 + .DELETE_ON_ERROR: ifneq ($(GCOV),) @@ -186,10 +188,10 @@ ifneq ($(CYGWIN),) ifeq ($(CC),icc) #Cygwin icc only ifeq ($(CRUNTIME),) - ifneq ($(DEBUG),) - CRUNTIME=MDd - else + ifeq ($(DEBUG),0) CRUNTIME=MD + else + CRUNTIME=MDd endif endif ALWAYS_LINK=$(LIBPORTABILITY) $(TOKUROOT)windows/lib/$(CRUNTIME)/zlib.lib Ws2_32.lib psapi.lib @@ -229,12 +231,12 @@ ifneq ($(CYGWIN),) endif endif -ifneq ($(DEBUG),) - OPTFLAGS = $(DBG_OPTFLAGS) - ARFLAGS = $(DBG_ARFLAGS) -else +ifeq ($(DEBUG),0) OPTFLAGS = $(OPT_OPTFLAGS) ARFLAGS = $(OPT_ARFLAGS) +else + OPTFLAGS = $(DBG_OPTFLAGS) + ARFLAGS = $(DBG_ARFLAGS) endif CFLAGS = $(WALL) $(W64) $(WERROR) $(FORMAT) $(VISIBILITY) $(FPICFLAGS) $(SHADOW) @@ -356,7 +358,7 @@ EXPORTMAP = -Wl,--version-script=$(EXPORTMAPFILE) SHARED=-shared endif ifeq ($(SOEXT),dll) - ifeq ($(DEBUG),) + ifeq ($(DEBUG),0) SHARED=/LD else SHARED=/LDd -- 2.30.9