Makefile changes req'd for a global build script. Also, global build

[platform/upstream/iotivity.git] / csdk / stack / samples / linux / SimpleClientServer / makefile

diff --git a/csdk/stack/samples/linux/SimpleClientServer/makefile b/csdk/stack/samples/linux/SimpleClientServer/makefile
index 7a08517..e525ebd 100644 (file)
--- a/csdk/stack/samples/linux/SimpleClientServer/makefile
+++ b/csdk/stack/samples/linux/SimpleClientServer/makefile
@@ -23,29 +23,29 @@
 BUILD   := release
 PLATFORM := linux
 CC      := g++
-OUT_DIR          := $(PWD)/$(BUILD)
+OUT_DIR          := $(BUILD)
 OBJ_DIR          := $(OUT_DIR)/obj
 
 ifeq ($(ROOT_DIR), )
-ROOT_DIR       = $(PWD)/../../../..
+ROOT_DIR       = ../../../..
 endif
 
-OUT_DIR        = $(PWD)
+OUT_DIR        = .
 
 OCLOGGER_DIR   = $(ROOT_DIR)/logger
 OC_LOG_DIR = $(ROOT_DIR)/../oc_logger
 OCRANDOM_DIR   = $(ROOT_DIR)/ocrandom
 OCSOCKET_DIR   = $(ROOT_DIR)/ocsocket
-LCOAP_DIR              = $(ROOT_DIR)/libcoap-4.1.1
-OCCOAP_DIR             = $(ROOT_DIR)/occoap
+LCOAP_DIR      = $(ROOT_DIR)/libcoap-4.1.1
+OCCOAP_DIR     = $(ROOT_DIR)/occoap
 OCTBSTACK_DIR  = $(ROOT_DIR)/stack
 
 OCLOGGER_INC   = $(OCLOGGER_DIR)/include
 OC_LOG_INC     = $(OC_LOG_DIR)/include
 OCRANDOM_INC   = $(OCRANDOM_DIR)/include
 OCSOCKET_INC   = $(OCSOCKET_DIR)/include
-LCOAP_INC              = $(LCOAP_DIR)
-OCCOAP_INC             = $(OCCOAP_DIR)/include
+LCOAP_INC      = $(LCOAP_DIR)
+OCCOAP_INC     = $(OCCOAP_DIR)/include
 OCTBSTACK_INC  = $(OCTBSTACK_DIR)/include
 
 INC_DIRS       := -I$(OCLOGGER_INC)
@@ -56,10 +56,10 @@ INC_DIRS    += -I$(LCOAP_INC)
 INC_DIRS       += -I$(OCCOAP_INC)
 INC_DIRS       += -I$(OCTBSTACK_INC)
 
-CC_FLAGS.debug      := -O0 -g3 -Wall -ffunction-sections -fdata-sections -fno-exceptions \
-                        -std=c++0x -pedantic $(INC_DIRS) -L$(ROOT_DIR)/$(BUILD) -DTB_LOG
-CC_FLAGS.release    := -Os -Wall -fdata-sections -Wl,--gc-sections -Wl,-s -fno-exceptions \
-                        -std=c++0x $(INC_DIRS) -L$(ROOT_DIR)/$(BUILD) -DTB_LOG
+CC_FLAGS.debug   := -O0 -g3 -Wall -ffunction-sections -fdata-sections -fno-exceptions \
+                        -std=c++0x -pedantic $(INC_DIRS) -L$(ROOT_DIR)/linux/$(BUILD) -DTB_LOG
+CC_FLAGS.release := -Os -Wall -fdata-sections -Wl,--gc-sections -Wl,-s -fno-exceptions \
+                        -std=c++0x $(INC_DIRS) -L$(ROOT_DIR)/linux/$(BUILD) -DTB_LOG
 
 LDLIBS         += -loctbstack -lpthread
 CPPFLAGS       += $(CC_FLAGS.$(BUILD)) $(LDLIBS)