Remove unused variable

[platform/upstream/iotivity.git] / makefile

diff --git a/makefile b/makefile
index 7e1374a..f60fc1b 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,66 +1,79 @@
-# override with `make BUILD=release`
+# //******************************************************************
+# //
+# // Copyright 2014 Intel Mobile Communications GmbH All Rights Reserved.
+# //
+# //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+# //
+# // Licensed under the Apache License, Version 2.0 (the "License");
+# // you may not use this file except in compliance with the License.
+# // You may obtain a copy of the License at
+# //
+# //      http://www.apache.org/licenses/LICENSE-2.0
+# //
+# // Unless required by applicable law or agreed to in writing, software
+# // distributed under the License is distributed on an "AS IS" BASIS,
+# // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# // See the License for the specific language governing permissions and
+# // limitations under the License.
+# //
+# //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+#
+# override with `make BUILD=debug`
 # default to release build
 BUILD    := release
-CXX      := g++
+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
-
-CXX_FLAGS.release   := -std=c++0x -Wall -pthread
+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./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
 
 # Force metatargets to build:
-.PHONY: prep_dirs c_sdk simpleserver simpleclient
+.PHONY: prep_dirs c_sdk liboc.a examples
 
 all:   .PHONY
 
 prep_dirs:
-       -mkdir $(OUT_DIR)
-       -mkdir $(OBJ_DIR)
-       -mkdir $(SAMPLES_OUT_DIR)
+       -mkdir -p $(OUT_DIR)
+       -mkdir -p $(OBJ_DIR)
 
 c_sdk:
        cd csdk && $(MAKE) "BUILD=$(BUILD)"
 
-examples:
+examples: liboc.a
        cd examples && $(MAKE) "BUILD=$(BUILD)"
 
-simpleserver: OCLib.a
-       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(SAMPLES_OUT_DIR)/$@ examples/simpleserver.cpp $(CXX_INC) $(OBJ_DIR)/OCLib.a csdk/liboctbstack.a
-
-simpleclient: OCLib.a
-       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(SAMPLES_OUT_DIR)/$@ examples/simpleclient.cpp $(CXX_INC) $(OBJ_DIR)/OCLib.a csdk/liboctbstack.a
-
-OCLib.a: OCPlatform.o OCResource.o OCReflect.o InProcServerWrapper.o InProcClientWrapper.o
-       ar -cvq $(OBJ_DIR)/OCLib.a $(OBJ_DIR)/OCPlatform.o $(OBJ_DIR)/OCResource.o $(OBJ_DIR)/OCReflect.o $(OBJ_DIR)/InProcServerWrapper.o $(OBJ_DIR)/InProcClientWrapper.o
+liboc.a: OCPlatform.o OCResource.o OCUtilities.o InProcServerWrapper.o InProcClientWrapper.o
+       ar -cvq $(OBJ_DIR)/liboc.a $(OBJ_DIR)/OCPlatform.o $(OBJ_DIR)/OCResource.o $(OBJ_DIR)/OCUtilities.o $(OBJ_DIR)/InProcServerWrapper.o $(OBJ_DIR)/InProcClientWrapper.o
 
-OCReflect.o: OCLib/OCReflect.cpp
-       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c OCLib/OCReflect.cpp $(CXX_INC)
+OCPlatform.o: src/OCPlatform.cpp
+       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c src/OCPlatform.cpp $(CXX_INC)
 
-OCPlatform.o: OCLib/OCPlatform.cpp
-       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c OCLib/OCPlatform.cpp $(CXX_INC)
+OCResource.o: src/OCResource.cpp
+       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c src/OCResource.cpp $(CXX_INC)
 
-OCResource.o: OCLib/OCResource.cpp
-       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c OCLib/OCResource.cpp $(CXX_INC)
+OCUtilities.o: src/OCUtilities.cpp
+       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c src/OCUtilities.cpp $(CXX_INC)
 
-InProcServerWrapper.o: OCLib/InProcServerWrapper.cpp
-       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c OCLib/InProcServerWrapper.cpp $(CXX_INC)
+InProcServerWrapper.o: src/InProcServerWrapper.cpp
+       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c src/InProcServerWrapper.cpp $(CXX_INC)
 
-InProcClientWrapper.o: OCLib/InProcClientWrapper.cpp
-       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c OCLib/InProcClientWrapper.cpp $(CXX_INC)
+InProcClientWrapper.o: src/InProcClientWrapper.cpp
+       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c src/InProcClientWrapper.cpp $(CXX_INC)
 
 clean: clean_legacy
        -rm -rf release
        -rm -rf debug
        cd csdk && $(MAKE) clean
        cd csdk && $(MAKE) deepclean
+       cd examples && $(MAKE) clean
 clean_legacy:
-       -rm -f -v OCLib.a *.o simpleserver simpleclient
+       -rm -f -v $(OBJ_DIR)/liboc.a $(OBJ_DIR)/*.o