From: Sashi Penta <sashi.kumar.penta@intel.com>
Date: Thu, 21 Aug 2014 22:58:17 +0000 (-0700)
Subject: examples are created in just release/debug folder.
X-Git-Tag: 1.2.0+RC1~2305^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0bddabfd6f190848211648bce1084b69785e86a6;p=platform%2Fupstream%2Fiotivity.git

examples are created in just release/debug folder.

Change-Id: I9da8aab784d98fca7273dc2e9f03ba8dd8bda35c
---

diff --git a/examples/makefile b/examples/makefile
index cc123af..3ab1dcc 100644
--- a/examples/makefile
+++ b/examples/makefile
@@ -4,8 +4,6 @@ BUILD	  := release
 CXX	      := g++
 #CXX	  := clang
 OUT_DIR	  := $(PWD)/$(BUILD)
-OBJ_DIR	  := $(OUT_DIR)/obj
-SAMPLES_OUT_DIR := $(OUT_DIR)/samples
 
 CXX_FLAGS.debug     := -g3 -std=c++0x -Wall -pthread
 
@@ -24,24 +22,22 @@ CXX_INC	  += -I../csdk/libcoap
 all: .PHONY
 
 prep_dirs:
-	-mkdir $(OUT_DIR)
-	-mkdir $(OBJ_DIR)
-	-mkdir $(SAMPLES_OUT_DIR)
+	-mkdir -p $(OUT_DIR)
 
 simpleserver: simpleserver.cpp
-	$(CXX) $(CXX_FLAGS.$(BUILD)) -o $(SAMPLES_OUT_DIR)/$@ simpleserver.cpp $(CXX_INC) ../$(BUILD)/obj/OCLib.a ../csdk/$(BUILD)/liboctbstack.a
+	$(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OUT_DIR)/$@ simpleserver.cpp $(CXX_INC) ../$(BUILD)/obj/OCLib.a ../csdk/$(BUILD)/liboctbstack.a
 
 simpleclient: simpleclient.cpp
-	$(CXX) $(CXX_FLAGS.$(BUILD)) -o $(SAMPLES_OUT_DIR)/$@ simpleclient.cpp $(CXX_INC) ../$(BUILD)/obj/OCLib.a ../csdk/$(BUILD)/liboctbstack.a
+	$(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OUT_DIR)/$@ simpleclient.cpp $(CXX_INC) ../$(BUILD)/obj/OCLib.a ../csdk/$(BUILD)/liboctbstack.a
 
 simpleclientserver: simpleclientserver.cpp
-	$(CXX) $(CXX_FLAGS.$(BUILD)) -o $(SAMPLES_OUT_DIR)/$@ simpleclientserver.cpp $(CXX_INC) ../$(BUILD)/obj/OCLib.a ../csdk/$(BUILD)/liboctbstack.a
+	$(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OUT_DIR)/$@ simpleclientserver.cpp $(CXX_INC) ../$(BUILD)/obj/OCLib.a ../csdk/$(BUILD)/liboctbstack.a
 
 roomserver: roomserver.cpp
-	$(CXX) $(CXX_FLAGS.$(BUILD)) -o $(SAMPLES_OUT_DIR)/$@ roomserver.cpp $(CXX_INC) ../$(BUILD)/obj/OCLib.a ../csdk/$(BUILD)/liboctbstack.a
+	$(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OUT_DIR)/$@ roomserver.cpp $(CXX_INC) ../$(BUILD)/obj/OCLib.a ../csdk/$(BUILD)/liboctbstack.a
 
 roomclient: roomclient.cpp
-	$(CXX) $(CXX_FLAGS.$(BUILD)) -o $(SAMPLES_OUT_DIR)/$@ roomclient.cpp $(CXX_INC) ../$(BUILD)/obj/OCLib.a ../csdk/$(BUILD)/liboctbstack.a
+	$(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OUT_DIR)/$@ roomclient.cpp $(CXX_INC) ../$(BUILD)/obj/OCLib.a ../csdk/$(BUILD)/liboctbstack.a
 
 clean: 
 	rm -rf $(OUT_DIR)/*
diff --git a/makefile b/makefile
index 02cda20..6ec33f7 100644
--- a/makefile
+++ b/makefile
@@ -23,8 +23,8 @@ CXX_INC	  += -I./csdk/libcoap
 all:	.PHONY
 
 prep_dirs:
-	-mkdir $(OUT_DIR)
-	-mkdir $(OBJ_DIR)
+	-mkdir -p $(OUT_DIR)
+	-mkdir -p $(OBJ_DIR)
 
 c_sdk: 
 	cd csdk && $(MAKE) "BUILD=$(BUILD)"