From 19abe8402ffc0a61ab5c84d92d86e2512b72122b Mon Sep 17 00:00:00 2001 From: Joseph Morrow Date: Tue, 3 Feb 2015 11:28:04 -0500 Subject: [PATCH] Removed extraneous definitions of CA_INT in makefiles and sconscripts. These definitions are no longer needed to run the RI layer on the CA layer. Change-Id: I9751b4d4d7ab0c35f2a277d4f100910070c976f6 Signed-off-by: Joseph Morrow Reviewed-on: https://gerrit.iotivity.org/gerrit/291 Tested-by: jenkins-iotivity Reviewed-by: Sashi Penta Reviewed-by: Sudarshan Prasad --- .../csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript | 2 -- .../csdk/stack/samples/arduino/SimpleClientServer/ocserver/makefile | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript b/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript index c064ae7..02f92e0 100644 --- a/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript +++ b/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript @@ -14,8 +14,6 @@ arduino_simplecs_env.PrependUnique(CPPPATH = [ arduino_simplecs_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')]) arduino_simplecs_env.PrependUnique(LIBS = ['octbstack', 'coap', 'connectivity_abstraction']) -arduino_simplecs_env.AppendUnique(CPPDEFINES = ['CA_INT']) - arduino_simplecs = arduino_simplecs_env.Program('SimpleClientServer', 'ocserver.cpp') env.CreateBin('SimpleClientServer') diff --git a/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/makefile b/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/makefile index 7d4655f..a010c6f 100644 --- a/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/makefile +++ b/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/makefile @@ -45,8 +45,8 @@ LOGGER_DIR = $(ROOT_DIR)/logger STACK_DIR = $(ROOT_DIR)/stack INC_DIRS = -I$(OCSOCK_DIR)/include/ -I$(OC_LOG_DIR)/include -I$(LOGGER_DIR)/include -I$(STACK_DIR)/include -CC_FLAGS.debug := -O1 -g3 -Wall -c -fmessage-length=0 -pedantic -fpic -DCA_INT -CC_FLAGS.release := -Os -Wall -c -fmessage-length=0 -fpic -DCA_INT +CC_FLAGS.debug := -O1 -g3 -Wall -c -fmessage-length=0 -pedantic -fpic +CC_FLAGS.release := -Os -Wall -c -fmessage-length=0 -fpic CFLAGS := $(CC_FLAGS.$(BUILD)) -DTB_LOG -- 2.7.4