From: William Dieter <william.r.dieter@intel.com>
Date: Fri, 22 Aug 2014 00:42:41 +0000 (-0700)
Subject: Merge "Makefile again builds OCProperties."
X-Git-Tag: M1-RC1~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e35ae83a8b648d41eeee8174a572f8d91644851b;p=contrib%2Fiotivity.git

Merge "Makefile again builds OCProperties."
---

e35ae83a8b648d41eeee8174a572f8d91644851b
diff --cc makefile
index 6ec33f7,5dbf6a1..64b4622
--- a/makefile
+++ b/makefile
@@@ -29,11 -31,23 +29,11 @@@ prep_dirs
  c_sdk: 
  	cd csdk && $(MAKE) "BUILD=$(BUILD)"
  
 -simpleserver: OCLib.a examples/simpleserver.cpp
 -	$(CXX) $(CXX_FLAGS.$(BUILD)) -o $(SAMPLES_OUT_DIR)/$@ examples/simpleserver.cpp $(CXX_INC) $(OBJ_DIR)/OCLib.a csdk/$(BUILD)/liboctbstack.a
 -
 -simpleclient: OCLib.a examples/simpleclient.cpp
 -	$(CXX) $(CXX_FLAGS.$(BUILD)) -o $(SAMPLES_OUT_DIR)/$@ examples/simpleclient.cpp $(CXX_INC) $(OBJ_DIR)/OCLib.a csdk/$(BUILD)/liboctbstack.a
 -
 -simpleclientserver: OCLib.a examples/simpleclientserver.cpp
 -	$(CXX) $(CXX_FLAGS.$(BUILD)) -o $(SAMPLES_OUT_DIR)/$@ examples/simpleclientserver.cpp $(CXX_INC) $(OBJ_DIR)/OCLib.a csdk/$(BUILD)/liboctbstack.a
 -
 -roomserver: OCLib.a examples/roomserver.cpp
 -	$(CXX) $(CXX_FLAGS.$(BUILD)) -o $(SAMPLES_OUT_DIR)/$@ examples/roomserver.cpp $(CXX_INC) $(OBJ_DIR)/OCLib.a csdk/$(BUILD)/liboctbstack.a
 -
 -roomclient: OCLib.a examples/roomclient.cpp
 -	$(CXX) $(CXX_FLAGS.$(BUILD)) -o $(SAMPLES_OUT_DIR)/$@ examples/roomclient.cpp $(CXX_INC) $(OBJ_DIR)/OCLib.a csdk/$(BUILD)/liboctbstack.a
 +examples: 
 +	cd examples && $(MAKE) "BUILD=$(BUILD)"
  
- OCLib.a: OCPlatform.o OCResource.o OCReflect.o OCUtilities.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)/OCUtilities.o $(OBJ_DIR)/InProcServerWrapper.o $(OBJ_DIR)/InProcClientWrapper.o
+ OCLib.a: OCPlatform.o OCResource.o OCReflect.o OCUtilities.o OCProperties.o InProcServerWrapper.o InProcClientWrapper.o
+ 	ar -cvq $(OBJ_DIR)/OCLib.a $(OBJ_DIR)/OCPlatform.o $(OBJ_DIR)/OCResource.o $(OBJ_DIR)/OCProperties.o $(OBJ_DIR)/OCReflect.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)