Added workaround to enable security in CA branch

[platform/upstream/iotivity.git] / resource / makefile

diff --git a/resource/makefile b/resource/makefile
index b6b1833..fa22f75 100644 (file)
--- a/resource/makefile
+++ b/resource/makefile
@@ -38,18 +38,17 @@ OUT_DIR       := $(ROOT_DIR)/$(BUILD)
 OBJ_DIR          := $(OUT_DIR)/obj
 
 #TODO-CA Need to remove flag later
-CXX_FLAGS.debug     := -g3 -std=c++0x -Wall -pthread -O0 -DCA_INT
-CXX_FLAGS.release   := -std=c++0x -Wall -pthread -O3 -DCA_INT
+CXX_FLAGS.debug     := -g3 -std=c++0x -Wall -pthread -O0
+CXX_FLAGS.release   := -std=c++0x -Wall -pthread -O3
 
 CXX_INC          := -I./include/
 CXX_INC          += -I./oc_logger/include
 
 CXX_INC          += -I./csdk/stack/include
-CXX_INC          += -I./csdk/ocsocket/include
 CXX_INC          += -I./csdk/ocrandom/include
 CXX_INC          += -I./csdk/logger/include
-CXX_INC          += -I./csdk/libcoap
-CXX_INC   += -I$(CEREAL_DIR)/include
+CXX_INC   += -I./csdk/connectivity/lib/libcoap-4.1.1
+
 # Force metatargets to build:
 all.PHONY: applyDepPatches prep_dirs c_sdk oc_logger_target liboc.a examples
 
@@ -88,8 +87,8 @@ cpp_sdk: prep_dirs c_sdk liboc.a
 examples: liboc.a
        cd examples && $(MAKE) apps "BUILD=$(BUILD)"
 
-liboc.a: OCPlatform_impl.o OCPlatform.o OCResource.o OCException.o OCUtilities.o InProcServerWrapper.o InProcClientWrapper.o OCRepresentation.o
-       ar -cvq $(OBJ_DIR)/liboc.a $(OBJ_DIR)/OCPlatform_impl.o $(OBJ_DIR)/OCPlatform.o $(OBJ_DIR)/OCResource.o $(OBJ_DIR)/OCException.o $(OBJ_DIR)/OCUtilities.o $(OBJ_DIR)/InProcServerWrapper.o $(OBJ_DIR)/InProcClientWrapper.o $(OBJ_DIR)/OCRepresentation.o
+liboc.a: OCPlatform_impl.o OCPlatform.o OCResource.o OCException.o OCUtilities.o InProcServerWrapper.o InProcClientWrapper.o OCRepresentation.o OCResourceRequest.o
+       ar -cvq $(OBJ_DIR)/liboc.a $(OBJ_DIR)/OCPlatform_impl.o $(OBJ_DIR)/OCPlatform.o $(OBJ_DIR)/OCResource.o $(OBJ_DIR)/OCException.o $(OBJ_DIR)/OCUtilities.o $(OBJ_DIR)/InProcServerWrapper.o $(OBJ_DIR)/InProcClientWrapper.o $(OBJ_DIR)/OCRepresentation.o $(OBJ_DIR)/OCResourceRequest.o
 
 OCPlatform_impl.o: src/OCPlatform_impl.cpp
        $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c src/OCPlatform_impl.cpp $(CXX_INC)
@@ -98,7 +97,7 @@ OCPlatform.o: src/OCPlatform.cpp
        $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c src/OCPlatform.cpp $(CXX_INC)
 
 OCRepresentation.o: src/OCRepresentation.cpp
-       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c src/OCRepresentation.cpp $(CXX_INC)
+       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c src/OCRepresentation.cpp $(CXX_INC) -I$(CEREAL_DIR)/include
 
 OCResource.o: src/OCResource.cpp
        $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c src/OCResource.cpp $(CXX_INC)
@@ -113,7 +112,10 @@ InProcServerWrapper.o: src/InProcServerWrapper.cpp
        $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c src/InProcServerWrapper.cpp $(CXX_INC)
 
 InProcClientWrapper.o: src/InProcClientWrapper.cpp
-       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c src/InProcClientWrapper.cpp $(CXX_INC)
+       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c src/InProcClientWrapper.cpp $(CXX_INC) -I$(CEREAL_DIR)/include
+
+OCResourceRequest.o: src/OCResourceRequest.cpp
+       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c src/OCResourceRequest.cpp $(CXX_INC) -I$(CEREAL_DIR)/include
 
 clean: clean_legacy
        -rm -rf release