OCLib is now called src. Now liboc.a is generated instead OCLib.a .

Change-Id: Id9aa7652987a0915842fa6441efa118809a0b01b

diff --git a/examples/makefile b/examples/makefile
index b483d5f..513fa68 100644 (file)
--- a/examples/makefile
+++ b/examples/makefile
@@ -25,25 +25,25 @@ prep_dirs:
        -mkdir -p $(OUT_DIR)
 
 simpleserver: simpleserver.cpp
-       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(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/liboc.a ../csdk/$(BUILD)/liboctbstack.a
 
 simpleclient: simpleclient.cpp
-       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(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/liboc.a ../csdk/$(BUILD)/liboctbstack.a
 
 presenceserver: presenceserver.cpp
-       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OUT_DIR)/$@ presenceserver.cpp $(CXX_INC) ../$(BUILD)/obj/OCLib.a ../csdk/$(BUILD)/liboctbstack.a
+       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OUT_DIR)/$@ presenceserver.cpp $(CXX_INC) ../$(BUILD)/obj/liboc.a ../csdk/$(BUILD)/liboctbstack.a
 
 presenceclient: presenceclient.cpp
-       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OUT_DIR)/$@ presenceclient.cpp $(CXX_INC) ../$(BUILD)/obj/OCLib.a ../csdk/$(BUILD)/liboctbstack.a
+       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OUT_DIR)/$@ presenceclient.cpp $(CXX_INC) ../$(BUILD)/obj/liboc.a ../csdk/$(BUILD)/liboctbstack.a
 
 simpleclientserver: simpleclientserver.cpp
-       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(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/liboc.a ../csdk/$(BUILD)/liboctbstack.a
 
 roomserver: roomserver.cpp
-       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(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/liboc.a ../csdk/$(BUILD)/liboctbstack.a
 
 roomclient: roomclient.cpp
-       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(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/liboc.a ../csdk/$(BUILD)/liboctbstack.a
 
 ocicuc:
        cd ocicuc && $(MAKE)

diff --git a/examples/ocicuc/Makefile b/examples/ocicuc/Makefile
index aaf0fbc..71a5daa 100644 (file)
--- a/examples/ocicuc/Makefile
+++ b/examples/ocicuc/Makefile
@@ -11,7 +11,7 @@ OC_LOGGER=$(OC_CSDK)/logger
 OC_LIB=$(OC_CSDK)/liboctbstack.a
 
 OCLIB=../..
-OCLIB_LIB=../../$(BUILD)/obj/OCLib.a #$(OCLIB)/release/obj/OCLib.a
+OCLIB_LIB=../../$(BUILD)/obj/liboc.a #$(OCLIB)/release/obj/liboc.a
 
 BOOST_BASE=/usr/local/boost
 BOOST_INC=$(BOOST_BASE)/include
@@ -46,17 +46,17 @@ resources:
 client:
        $(CXX_CC) -pthread  -c client.cpp -I../../include/ -I../../csdk/stack/include -I../../csdk/ocsocket/include -I../../csdk/ocrandom/include -I../../csdk/logger/include -I/usr/local/include/boost/ -I/usr/local/include $(CXX_INC) $(CXX_FLAGS)
 
-       $(CXX_CC) -std=c++0x -Wall -L/usr/local/boost/lib/ -I/usr/local/boost/include -pthread  -o client driver.o utility.o client.o ../../$(BUILD)/obj/OCLib.a ../../csdk/release/liboctbstack.a -lboost_program_options $(CXX_INC) $(CXX_FLAGS) 
+       $(CXX_CC) -std=c++0x -Wall -L/usr/local/boost/lib/ -I/usr/local/boost/include -pthread  -o client driver.o utility.o client.o ../../$(BUILD)/obj/liboc.a ../../csdk/release/liboctbstack.a -lboost_program_options $(CXX_INC) $(CXX_FLAGS) 
 
 server: resources
        $(CXX_CC) -pthread  -c server.cpp -I../../include/ -I../../csdk/stack/include -I../../csdk/ocsocket/include -I../../csdk/ocrandom/include -I../../csdk/logger/include -I/usr/local/include/boost/ -I/usr/local/include $(CXX_INC) 
 
-       $(CXX_CC) -std=c++0x -Wall -L/usr/local/boost/lib/ -I/usr/local/boost/include -pthread  -o server driver.o utility.o server.o light_resource.o ../../$(BUILD)/obj/OCLib.a ../../csdk/release/liboctbstack.a -lboost_program_options $(CXX_INC) 
+       $(CXX_CC) -std=c++0x -Wall -L/usr/local/boost/lib/ -I/usr/local/boost/include -pthread  -o server driver.o utility.o server.o light_resource.o ../../$(BUILD)/obj/liboc.a ../../csdk/release/liboctbstack.a -lboost_program_options $(CXX_INC) 
 
 monoprocess: driver resources
        $(CXX_CC) -pthread  -c monoprocess.cpp -I../../include/ -I../../csdk/stack/include -I../../csdk/ocsocket/include -I../../csdk/ocrandom/include -I../../csdk/logger/include -I/usr/local/include/boost/ -I/usr/local/include $(CXX_INC) 
 
-       $(CXX_CC) -std=c++0x -Wall -L/usr/local/boost/lib/ -I/usr/local/boost/include -pthread  -o monoprocess driver.o utility.o monoprocess.o light_resource.o ../../$(BUILD)/obj/OCLib.a ../../csdk/release/liboctbstack.a -lboost_program_options $(CXX_INC) 
+       $(CXX_CC) -std=c++0x -Wall -L/usr/local/boost/lib/ -I/usr/local/boost/include -pthread  -o monoprocess driver.o utility.o monoprocess.o light_resource.o ../../$(BUILD)/obj/liboc.a ../../csdk/release/liboctbstack.a -lboost_program_options $(CXX_INC) 
 
 clean:
        rm -f server.o client.o driver.o monoprocess.o server client monoprocess

diff --git a/makefile b/makefile
index 1add828..4a22ec8 100644 (file)
--- a/makefile
+++ b/makefile
@@ -17,7 +17,7 @@ CXX_INC         += -I./csdk/logger/include
 CXX_INC          += -I./csdk/libcoap
 
 # Force metatargets to build:
-.PHONY: prep_dirs c_sdk OCLib.a examples 
+.PHONY: prep_dirs c_sdk liboc.a examples 
 
 all:   .PHONY
 
@@ -31,26 +31,26 @@ c_sdk:
 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
+liboc.a: OCPlatform.o OCResource.o OCReflect.o OCUtilities.o InProcServerWrapper.o InProcClientWrapper.o
+       ar -cvq $(OBJ_DIR)/liboc.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
 
-OCReflect.o: OCLib/OCReflect.cpp
-       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c OCLib/OCReflect.cpp $(CXX_INC)
+OCReflect.o: src/OCReflect.cpp
+       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c src/OCReflect.cpp $(CXX_INC)
 
-OCPlatform.o: OCLib/OCPlatform.cpp
-       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c OCLib/OCPlatform.cpp $(CXX_INC)
+OCPlatform.o: src/OCPlatform.cpp
+       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c src/OCPlatform.cpp $(CXX_INC)
 
-OCResource.o: OCLib/OCResource.cpp
-       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c OCLib/OCResource.cpp $(CXX_INC)
+OCResource.o: src/OCResource.cpp
+       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c src/OCResource.cpp $(CXX_INC)
 
-OCUtilities.o: OCLib/OCUtilities.cpp
-       $(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OBJ_DIR)/$@ -c OCLib/OCUtilities.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
@@ -59,4 +59,4 @@ clean: clean_legacy
        cd csdk && $(MAKE) deepclean
        cd examples && $(MAKE) clean
 clean_legacy:
-       -rm -f -v $(OBJ_DIR)/OCLib.a $(OBJ_DIR)/*.o 
+       -rm -f -v $(OBJ_DIR)/liboc.a $(OBJ_DIR)/*.o 

diff --git a/OCLib/InProcClientWrapper.cpp b/src/InProcClientWrapper.cpp
similarity index 100%
rename from OCLib/InProcClientWrapper.cpp
rename to src/InProcClientWrapper.cpp

diff --git a/OCLib/InProcServerWrapper.cpp b/src/InProcServerWrapper.cpp
similarity index 100%
rename from OCLib/InProcServerWrapper.cpp
rename to src/InProcServerWrapper.cpp

diff --git a/OCLib/OCApi.cpp b/src/OCApi.cpp
similarity index 100%
rename from OCLib/OCApi.cpp
rename to src/OCApi.cpp

diff --git a/OCLib/OCObject.cpp b/src/OCObject.cpp
similarity index 100%
rename from OCLib/OCObject.cpp
rename to src/OCObject.cpp

diff --git a/OCLib/OCObserver.cpp b/src/OCObserver.cpp
similarity index 100%
rename from OCLib/OCObserver.cpp
rename to src/OCObserver.cpp

diff --git a/OCLib/OCPlatform.cpp b/src/OCPlatform.cpp
similarity index 100%
rename from OCLib/OCPlatform.cpp
rename to src/OCPlatform.cpp

diff --git a/OCLib/OCProperties.cpp b/src/OCProperties.cpp
similarity index 100%
rename from OCLib/OCProperties.cpp
rename to src/OCProperties.cpp

diff --git a/OCLib/OCReflect.cpp b/src/OCReflect.cpp
similarity index 100%
rename from OCLib/OCReflect.cpp
rename to src/OCReflect.cpp

diff --git a/OCLib/OCResource.cpp b/src/OCResource.cpp
similarity index 100%
rename from OCLib/OCResource.cpp
rename to src/OCResource.cpp

diff --git a/OCLib/OCSecurityModel.cpp b/src/OCSecurityModel.cpp
similarity index 100%
rename from OCLib/OCSecurityModel.cpp
rename to src/OCSecurityModel.cpp

diff --git a/OCLib/OCServer.cpp b/src/OCServer.cpp
similarity index 100%
rename from OCLib/OCServer.cpp
rename to src/OCServer.cpp

diff --git a/OCLib/OCUtilities.cpp b/src/OCUtilities.cpp
similarity index 100%
rename from OCLib/OCUtilities.cpp
rename to src/OCUtilities.cpp