Repo Merge: Modified makefiles for the things graph manager

Change-Id: I3c72a7b173c5070fb794ad59e2cb3866c53e9a9a
Signed-off-by: William R. Dieter <william.r.dieter@intel.com>

diff --git a/service/things-manager/build/arduino/Makefile b/service/things-manager/build/arduino/Makefile
index bcf733e..15c723e 100644 (file)
--- a/service/things-manager/build/arduino/Makefile
+++ b/service/things-manager/build/arduino/Makefile
@@ -10,7 +10,7 @@ SampleApp:
        cd ../../sampleapp/arduino/light && $(MAKE) BUILD=release
 
 clean:
-       cd ../../../../resource/build/linux && make clean
+       cd ../../../../resource && make clean
        cd ../../../../resource/csdk/build/arduino && make deepclean 
        cd ../../sampleapp/arduino/bookmark && $(MAKE) clean
        cd ../../sampleapp/arduino/light && $(MAKE) clean

diff --git a/service/things-manager/build/linux/Makefile b/service/things-manager/build/linux/Makefile
index cff5ed1..0988039 100644 (file)
--- a/service/things-manager/build/linux/Makefile
+++ b/service/things-manager/build/linux/Makefile
@@ -7,7 +7,7 @@ pre:
        -mkdir release
 
 resource:
-       cd ../../../../resource/build/linux && $(MAKE)
+       cd ../../../../resource && $(MAKE)
 
 lib:
        cd ../../lib/jsoncpp && $(MAKE)

diff --git a/service/things-manager/sampleapp/arduino/bookmark/makefile b/service/things-manager/sampleapp/arduino/bookmark/makefile
index 537f53b..bf9f5d5 100644 (file)
--- a/service/things-manager/sampleapp/arduino/bookmark/makefile
+++ b/service/things-manager/sampleapp/arduino/bookmark/makefile
@@ -10,7 +10,7 @@ APP_NAME := Bookmark
 
 OBJ_DIR := ./bin
 
-ROOT_DIR = ../../../../../oic-resource/csdk
+ROOT_DIR = ../../../../../resource/csdk
 LOGGER_DIR = $(ROOT_DIR)/logger
 TBSTACK_DIR = $(ROOT_DIR)/stack
 TBSOCKET_DIR = $(ROOT_DIR)/ocsocket

diff --git a/service/things-manager/sampleapp/arduino/light/makefile b/service/things-manager/sampleapp/arduino/light/makefile
index 96d8f4e..99ac2b6 100644 (file)
--- a/service/things-manager/sampleapp/arduino/light/makefile
+++ b/service/things-manager/sampleapp/arduino/light/makefile
@@ -10,7 +10,7 @@ APP_NAME := Light
 
 OBJ_DIR := ./bin
 
-ROOT_DIR = ../../../../../oic-resource/csdk
+ROOT_DIR = ../../../../../resource/csdk
 LOGGER_DIR = $(ROOT_DIR)/logger
 TBSTACK_DIR = $(ROOT_DIR)/stack
 TBSOCKET_DIR = $(ROOT_DIR)/ocsocket

diff --git a/service/things-manager/sampleapp/linux/bookmark/makefile b/service/things-manager/sampleapp/linux/bookmark/makefile
index bb7cbbf..8ff9eb0 100644 (file)
--- a/service/things-manager/sampleapp/linux/bookmark/makefile
+++ b/service/things-manager/sampleapp/linux/bookmark/makefile
@@ -1,6 +1,6 @@
 
 TGMROOT=../../../
-IOT_BASE=${TGMROOT}../../oic-resource
+IOT_BASE=${TGMROOT}../../resource
 BOOST_ROOT=${TGMROOT}../../../
 BOOST_DIR = $(BOOST_ROOT)boost_1_51_0
 RST_NAME=.
@@ -28,7 +28,7 @@ SDK = ${TGMROOT}sdk
 TGM_INC = -I${TGMROOT}lib/inc -D_DEBUG -I${TGMROOT}lib/jsoncpp/inc -I${TGMROOT}sdk/inc -I${TGMROOT}tgm/inc
 
 #LD_LIB = $(IOT_BASE)/release/obj/OCLib.a  $(IOT_BASE)/csdk/release/liboctbstack.a ${TGMROOT}SDK/build/linux/libTGMSDKLibrary.a ${TGMROOT}TGM/build/linux/libTGMClient.a ${TGMROOT}lib/jsoncpp/libjsoncpp.a
-LD_LIB = $(IOT_BASE)/build/linux/release/obj/liboc.a  $(IOT_BASE)/csdk/build/linux/release/liboctbstack.a ${TGMROOT}sdk/build/linux/libTGMSDKLibrary.a ${TGMROOT}tgm/build/linux/libTGMClient.a ${TGMROOT}lib/jsoncpp/libjsoncpp.a
+LD_LIB = $(IOT_BASE)/release/obj/liboc.a  $(IOT_BASE)/csdk/release/liboctbstack.a ${TGMROOT}sdk/build/linux/libTGMSDKLibrary.a ${TGMROOT}tgm/build/linux/libTGMClient.a ${TGMROOT}lib/jsoncpp/libjsoncpp.a
 
 # Force metatargets to build:
 .PHONY: all clean

diff --git a/service/things-manager/sampleapp/linux/light/makefile b/service/things-manager/sampleapp/linux/light/makefile
index ce9754b..9ba78bc 100644 (file)
--- a/service/things-manager/sampleapp/linux/light/makefile
+++ b/service/things-manager/sampleapp/linux/light/makefile
@@ -1,6 +1,6 @@
 
 TGMROOT=../../../
-IOT_BASE=${TGMROOT}../../oic-resource
+IOT_BASE=${TGMROOT}../../resource
 BOOST_ROOT=${TGMROOT}../../../
 BOOST_DIR = $(BOOST_ROOT)boost_1_51_0
 RST_NAME=.
@@ -28,7 +28,7 @@ SDK = ${TGMROOT}sdk
 TGM_INC = -I${TGMROOT}lib/inc -D_DEBUG -I${TGMROOT}lib/jsoncpp/inc -I${TGMROOT}sdk/inc -I${TGMROOT}tgm/inc
 
 #LD_LIB = $(IOT_BASE)/release/obj/OCLib.a  $(IOT_BASE)/csdk/release/liboctbstack.a ${TGMROOT}SDK/build/linux/libTGMSDKLibrary.a ${TGMROOT}TGM/build/linux/libTGMClient.a ${TGMROOT}lib/jsoncpp/libjsoncpp.a
-LD_LIB = $(IOT_BASE)/build/linux/release/obj/liboc.a  $(IOT_BASE)/csdk/build/linux/release/liboctbstack.a ${TGMROOT}sdk/build/linux/libTGMSDKLibrary.a ${TGMROOT}tgm/build/linux/libTGMClient.a ${TGMROOT}lib/jsoncpp/libjsoncpp.a
+LD_LIB = $(IOT_BASE)/release/obj/liboc.a  $(IOT_BASE)/csdk/release/liboctbstack.a ${TGMROOT}sdk/build/linux/libTGMSDKLibrary.a ${TGMROOT}tgm/build/linux/libTGMClient.a ${TGMROOT}lib/jsoncpp/libjsoncpp.a
 
 # Force metatargets to build:
 .PHONY: all clean

diff --git a/service/things-manager/sampleapp/linux/musicapp/makefile b/service/things-manager/sampleapp/linux/musicapp/makefile
index c312c80..14cd344 100644 (file)
--- a/service/things-manager/sampleapp/linux/musicapp/makefile
+++ b/service/things-manager/sampleapp/linux/musicapp/makefile
@@ -1,6 +1,6 @@
 
 TGMROOT=../../../
-IOT_BASE=${TGMROOT}../../oic-resource
+IOT_BASE=${TGMROOT}../../resource
 BOOST_ROOT=${TGMROOT}../../../
 BOOST_DIR = $(BOOST_ROOT)boost_1_51_0
 RST_NAME=.
@@ -28,7 +28,7 @@ SDK = ${TGMROOT}sdk
 TGM_INC = -I${TGMROOT}lib/inc -D_DEBUG -I${TGMROOT}lib/jsoncpp/inc -I${TGMROOT}sdk/inc -I${TGMROOT}tgm/inc
 
 #LD_LIB = $(IOT_BASE)/release/obj/OCLib.a  $(IOT_BASE)/csdk/release/liboctbstack.a ${TGMROOT}SDK/build/linux/libTGMSDKLibrary.a ${TGMROOT}TGM/build/linux/libTGMClient.a ${TGMROOT}lib/jsoncpp/libjsoncpp.a
-LD_LIB = $(IOT_BASE)/build/linux/release/obj/liboc.a  $(IOT_BASE)/csdk/build/linux/release/liboctbstack.a ${TGMROOT}sdk/build/linux/libTGMSDKLibrary.a ${TGMROOT}tgm/build/linux/libTGMClient.a ${TGMROOT}lib/jsoncpp/libjsoncpp.a
+LD_LIB = $(IOT_BASE)/release/obj/liboc.a  $(IOT_BASE)/csdk/release/liboctbstack.a ${TGMROOT}sdk/build/linux/libTGMSDKLibrary.a ${TGMROOT}tgm/build/linux/libTGMClient.a ${TGMROOT}lib/jsoncpp/libjsoncpp.a
 
 # Force metatargets to build:
 .PHONY: all clean

diff --git a/service/things-manager/sampleapp/linux/switch/makefile b/service/things-manager/sampleapp/linux/switch/makefile
index d696274..7ca48a8 100644 (file)
--- a/service/things-manager/sampleapp/linux/switch/makefile
+++ b/service/things-manager/sampleapp/linux/switch/makefile
@@ -1,6 +1,6 @@
 
 TGMROOT=../../../
-IOT_BASE=${TGMROOT}../../oic-resource
+IOT_BASE=${TGMROOT}../../resource
 BOOST_ROOT=${TGMROOT}../../../
 BOOST_DIR = $(BOOST_ROOT)boost_1_51_0
 RST_NAME=.
@@ -28,7 +28,7 @@ SDK = ${TGMROOT}sdk
 TGM_INC = -I${TGMROOT}lib/inc -D_DEBUG -I${TGMROOT}lib/jsoncpp/inc -I${TGMROOT}sdk/inc -I${TGMROOT}tgm/inc
 
 #LD_LIB = $(IOT_BASE)/release/obj/OCLib.a  $(IOT_BASE)/csdk/release/liboctbstack.a ${TGMROOT}SDK/build/linux/libTGMSDKLibrary.a ${TGMROOT}TGM/build/linux/libTGMClient.a ${TGMROOT}lib/jsoncpp/libjsoncpp.a
-LD_LIB = $(IOT_BASE)/build/linux/release/obj/liboc.a  $(IOT_BASE)/csdk/build/linux/release/liboctbstack.a ${TGMROOT}sdk/build/linux/libTGMSDKLibrary.a ${TGMROOT}tgm/build/linux/libTGMClient.a ${TGMROOT}lib/jsoncpp/libjsoncpp.a
+LD_LIB = $(IOT_BASE)/release/obj/liboc.a  $(IOT_BASE)/csdk/release/liboctbstack.a ${TGMROOT}sdk/build/linux/libTGMSDKLibrary.a ${TGMROOT}tgm/build/linux/libTGMClient.a ${TGMROOT}lib/jsoncpp/libjsoncpp.a
 
 # Force metatargets to build:
 .PHONY: all clean

diff --git a/service/things-manager/tgm/build/linux/Makefile b/service/things-manager/tgm/build/linux/Makefile
index bf66afa..06eb325 100644 (file)
--- a/service/things-manager/tgm/build/linux/Makefile
+++ b/service/things-manager/tgm/build/linux/Makefile
@@ -64,7 +64,7 @@ pre_job:
 #      $(CXX) $(CXX_FLAGS) -o tgmserver $(IOT_BASE)/release/obj/OCLib.a  $(IOT_BASE)/csdk/release/liboctbstack.a  $(JSONLIB)/libjsoncpp.a $(CXX_SRCPATH) $(CXX_INC) -I$(JSON) -I$(JSONCPP) 
 
 tgmserver: ../../src/tgmserver.cpp
-       $(CXX) $(CXX_FLAGS) -o tgmserver ../../src/tgmserver.cpp  $(IOT_BASE)/build/linux/release/obj/liboc.a  $(IOT_BASE)/csdk/build/linux/release/liboctbstack.a  $(JSONLIB)/libjsoncpp.a  $(TGM_SRC) $(TGM_INC) $(CXX_INC) $(SQLITEINC) $(SQLITELIB)
+       $(CXX) $(CXX_FLAGS) -o tgmserver ../../src/tgmserver.cpp  $(IOT_BASE)/release/obj/liboc.a  $(IOT_BASE)/csdk/release/liboctbstack.a  $(JSONLIB)/libjsoncpp.a  $(TGM_SRC) $(TGM_INC) $(CXX_INC) $(SQLITEINC) $(SQLITELIB)
        
 ${TARGET}: ${CXX_OBJLIST}
        #$(CXX) $(LD_FLAGS) -o ./${RST_NAME}/$@ $^ ${LD_LIB}            // shared object.