Commit f39f2b5d authored by Kishen Maloor's avatar Kishen Maloor

Renamed ...-Constrained to ...-Lite in sources

Change-Id: Iae97996f8582a11e25a3385a11069f7435b735fa
Signed-off-by: Kishen Maloor's avatarKishen Maloor <kishen.maloor@intel.com>
parent 7c9de6b9
......@@ -16,18 +16,12 @@ port/linux/client_multithread_linux
port/linux/cloud_linux
port/linux/cloud_tests
port/linux/cloud_linux_creds/
port/linux/libiotivity-constrained-client.*
port/linux/libiotivity-constrained-server.*
port/linux/libiotivity-constrained-client-server.*
port/linux/iotivity-constrained-cloud.pc
port/linux/iotivity-constrained-cloud.a
port/linux/iotivity-constrained-cloud.so
port/linux/iotivity-constrained-rd-client.pc
port/linux/iotivity-constrained-rd-client.a
port/linux/iotivity-constrained-rd-client.so
port/linux/iotivity-constrained-server.pc
port/linux/iotivity-constrained-client.pc
port/linux/iotivity-constrained-client-server.pc
port/linux/libiotivity-lite-client.*
port/linux/libiotivity-lite-server.*
port/linux/libiotivity-lite-client-server.*
port/linux/iotivity-lite-server.pc
port/linux/iotivity-lite-client.pc
port/linux/iotivity-lite-client-server.pc
port/linux/tests/*
port/linux/obj/
port/linux/onboarding_tool_creds/
......
......@@ -150,7 +150,7 @@ Setup source tree
Grab source and dependencies using:
``git clone --recursive https://github.com/iotivity/iotivity-constrained.git``
``git clone --recursive https://github.com/iotivity/iotivity-lite.git``
Building sample applications on Linux
-------------------------------------
......
......@@ -18,7 +18,7 @@
****************************************************************************/
/**
@brief Resource Directory API of IoTivity-constrained for client.
@brief Resource Directory API of IoTivity-Lite for RD clients.
@file
*/
......
......@@ -15,12 +15,12 @@
*/
/**
@brief Main API of IoTivity-constrained for client and server.
@brief Main API of IoTivity-Lite for client and server.
@file
*/
/**
\mainpage IoTivity-constrained API
\mainpage IoTivity-Lite API
The file \link oc_api.h\endlink is the main entry for all
server and client related OCF functions.
......
......@@ -187,8 +187,8 @@ ifeq ($(TCP),1)
CFLAGS += -DOC_TCP
endif
CONSTRAINED_LIBS = libiotivity-constrained-server.a libiotivity-constrained-client.a \
libiotivity-constrained-client-server.a
CONSTRAINED_LIBS = libiotivity-lite-server.a libiotivity-lite-client.a \
libiotivity-lite-client-server.a
all: $(CONSTRAINED_LIBS) $(SAMPLES)
......@@ -216,68 +216,68 @@ ${OBJDIR}/cloud/%.o: %.c
@mkdir -p ${@D}
${CC} -c -o $@ $< ${CFLAGS} ${CFLAGS_CLOUD}
libiotivity-constrained-server.a: $(OBJ_COMMON) $(OBJ_SERVER)
libiotivity-lite-server.a: $(OBJ_COMMON) $(OBJ_SERVER)
$(AR) -rcs $@ $(OBJ_COMMON) $(OBJ_SERVER)
libiotivity-constrained-client.a: $(OBJ_COMMON) $(OBJ_CLIENT)
libiotivity-lite-client.a: $(OBJ_COMMON) $(OBJ_CLIENT)
$(AR) -rcs $@ $(OBJ_COMMON) $(OBJ_CLIENT)
libiotivity-constrained-client-server.a: $(OBJ_COMMON) $(OBJ_CLIENT_SERVER) $(OBJ_CLOUD)
libiotivity-lite-client-server.a: $(OBJ_COMMON) $(OBJ_CLIENT_SERVER) $(OBJ_CLOUD)
$(AR) -rcs $@ $(OBJ_COMMON) $(OBJ_CLIENT_SERVER) $(OBJ_CLOUD)
server: libiotivity-constrained-server.a
${CC} -o $@ ../../apps/server_linux.c libiotivity-constrained-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
server: libiotivity-lite-server.a
${CC} -o $@ ../../apps/server_linux.c libiotivity-lite-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
client: libiotivity-constrained-client.a
${CC} -o $@ ../../apps/client_linux.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
client: libiotivity-lite-client.a
${CC} -o $@ ../../apps/client_linux.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
smart_lock: libiotivity-constrained-client.a
${CC} -o $@ ../../apps/smart_lock_linux.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
smart_lock: libiotivity-lite-client.a
${CC} -o $@ ../../apps/smart_lock_linux.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
temp_sensor: libiotivity-constrained-client.a
${CC} -o $@ ../../apps/temp_sensor_client_linux.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
temp_sensor: libiotivity-lite-client.a
${CC} -o $@ ../../apps/temp_sensor_client_linux.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
simpleserver: libiotivity-constrained-server.a
${CC} -o $@ ../../apps/simpleserver.c libiotivity-constrained-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
simpleserver: libiotivity-lite-server.a
${CC} -o $@ ../../apps/simpleserver.c libiotivity-lite-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
simpleclient: libiotivity-constrained-client.a
${CC} -o $@ ../../apps/simpleclient.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
simpleclient: libiotivity-lite-client.a
${CC} -o $@ ../../apps/simpleclient.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
client_collections_linux: libiotivity-constrained-client.a
${CC} -o $@ ../../apps/client_collections_linux.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
client_collections_linux: libiotivity-lite-client.a
${CC} -o $@ ../../apps/client_collections_linux.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
server_collections_linux: libiotivity-constrained-server.a
${CC} -o $@ ../../apps/server_collections_linux.c libiotivity-constrained-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
server_collections_linux: libiotivity-lite-server.a
${CC} -o $@ ../../apps/server_collections_linux.c libiotivity-lite-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
client_block_linux: libiotivity-constrained-client.a
${CC} -o $@ ../../apps/client_block_linux.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
client_block_linux: libiotivity-lite-client.a
${CC} -o $@ ../../apps/client_block_linux.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
server_block_linux: libiotivity-constrained-server.a
${CC} -o $@ ../../apps/server_block_linux.c libiotivity-constrained-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
server_block_linux: libiotivity-lite-server.a
${CC} -o $@ ../../apps/server_block_linux.c libiotivity-lite-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
smart_home_server_linux: libiotivity-constrained-server.a
${CC} -o $@ ../../apps/smart_home_server_linux.c libiotivity-constrained-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
smart_home_server_linux: libiotivity-lite-server.a
${CC} -o $@ ../../apps/smart_home_server_linux.c libiotivity-lite-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
multi_device_server: libiotivity-constrained-server.a
${CC} -o $@ ../../apps/multi_device_server_linux.c libiotivity-constrained-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
multi_device_server: libiotivity-lite-server.a
${CC} -o $@ ../../apps/multi_device_server_linux.c libiotivity-lite-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
multi_device_client: libiotivity-constrained-client.a
${CC} -o $@ ../../apps/multi_device_client_linux.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
multi_device_client: libiotivity-lite-client.a
${CC} -o $@ ../../apps/multi_device_client_linux.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
cloud_linux: libiotivity-constrained-client-server.a $(ROOT_DIR)/apps/cloud_linux.c
${CC} -o $@ ../../apps/cloud_linux.c libiotivity-constrained-client-server.a -DOC_CLIENT -DOC_SERVER ${CFLAGS} ${CFLAGS_CLOUD} ${LIBS}
cloud_linux: libiotivity-lite-client-server.a $(ROOT_DIR)/apps/cloud_linux.c
${CC} -o $@ ../../apps/cloud_linux.c libiotivity-lite-client-server.a -DOC_CLIENT -DOC_SERVER ${CFLAGS} ${CFLAGS_CLOUD} ${LIBS}
cloud_tests: libiotivity-constrained-client-server.a $(ROOT_DIR)/apps/cloud_certification_tests.c
${CC} -o $@ ../../apps/cloud_certification_tests.c libiotivity-constrained-client-server.a -DOC_CLIENT -DOC_SERVER ${CFLAGS} ${CFLAGS_CLOUD} ${LIBS}
cloud_tests: libiotivity-lite-client-server.a $(ROOT_DIR)/apps/cloud_certification_tests.c
${CC} -o $@ ../../apps/cloud_certification_tests.c libiotivity-lite-client-server.a -DOC_CLIENT -DOC_SERVER ${CFLAGS} ${CFLAGS_CLOUD} ${LIBS}
${OBT}: libiotivity-constrained-client.a
${CC} -o $@ ../../onboarding_tool/obtmain.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
${OBT}: libiotivity-lite-client.a
${CC} -o $@ ../../onboarding_tool/obtmain.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
server_multithread_linux: libiotivity-constrained-server.a
${CC} -o $@ ../../apps/server_multithread_linux.c libiotivity-constrained-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
server_multithread_linux: libiotivity-lite-server.a
${CC} -o $@ ../../apps/server_multithread_linux.c libiotivity-lite-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
client_multithread_linux: libiotivity-constrained-client.a
${CC} -o $@ ../../apps/client_multithread_linux.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
client_multithread_linux: libiotivity-lite-client.a
${CC} -o $@ ../../apps/client_multithread_linux.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
ifneq ($(SECURE),0)
MBEDTLS_PATCHES ?= $(sort $(wildcard ../../patches/*.patch))
......
......@@ -12,7 +12,7 @@ DYNAMIC ?= 1
SECURE ?= 1
PKI ?= 1
DESTDIR ?= /usr/local
install_bin_dir?=${DESTDIR}/opt/iotivity-constrained/bin/
install_bin_dir?=${DESTDIR}/opt/iotivity-lite/bin/
prefix = $(DESTDIR)
exec_prefix = $(prefix)
bindir = $(exec_prefix)/bin
......@@ -193,12 +193,12 @@ endif
SAMPLES_CREDS = $(addsuffix _creds, ${SAMPLES} ${OBT})
CONSTRAINED_LIBS = libiotivity-constrained-server.a libiotivity-constrained-client.a \
libiotivity-constrained-server.so libiotivity-constrained-client.so \
libiotivity-constrained-client-server.so libiotivity-constrained-client-server.a
CONSTRAINED_LIBS = libiotivity-lite-server.a libiotivity-lite-client.a \
libiotivity-lite-server.so libiotivity-lite-client.so \
libiotivity-lite-client-server.so libiotivity-lite-client-server.a
PC = iotivity-constrained-client.pc iotivity-constrained-server.pc \
iotivity-constrained-client-server.pc
PC = iotivity-lite-client.pc iotivity-lite-server.pc \
iotivity-lite-client-server.pc
all: $(CONSTRAINED_LIBS) $(SAMPLES) $(PC)
......@@ -214,36 +214,36 @@ $(API_TEST_OBJ_DIR)/%.o: $(API_TEST_DIR)/%.cpp
@mkdir -p ${@D}
$(CXX) $(GTEST_CPPFLAGS) $(TEST_CXXFLAGS) $(EXTRA_CFLAGS) $(HEADER_DIR) -I$(ROOT_DIR)/deps/tinycbor/src -c $< -o $@
apitest: $(API_TEST_OBJ_FILES) libiotivity-constrained-client-server.a | $(GTEST)
$(CXX) $^ -o $@ $(GTEST_CPPFLAGS) $(TEST_CXXFLAGS) $(EXTRA_CFLAGS) $(HEADER_DIR) -L$(OUT_DIR) -L$(GTEST_DIR)/make -l:gtest_main.a -liotivity-constrained-client-server -lpthread
apitest: $(API_TEST_OBJ_FILES) libiotivity-lite-client-server.a | $(GTEST)
$(CXX) $^ -o $@ $(GTEST_CPPFLAGS) $(TEST_CXXFLAGS) $(EXTRA_CFLAGS) $(HEADER_DIR) -L$(OUT_DIR) -L$(GTEST_DIR)/make -l:gtest_main.a -liotivity-lite-client-server -lpthread
$(SECURITY_TEST_OBJ_DIR)/%.o: $(SECURITY_TEST_DIR)/%.cpp
@mkdir -p ${@D}
$(CXX) $< -o $@ $(GTEST_CPPFLAGS) $(TEST_CXXFLAGS) $(EXTRA_CFLAGS) $(HEADER_DIR) $(SECURITY_HEADERS) -c
securitytest: $(SECURITY_TEST_OBJ_FILES) libiotivity-constrained-client-server.a | $(GTEST)
$(CXX) $(GTEST_CPPFLAGS) $(TEST_CXXFLAGS) $(EXTRA_CFLAGS) $(HEADER_DIR) -l:gtest_main.a -liotivity-constrained-client-server -L$(OUT_DIR) -L$(GTEST_DIR)/make -lpthread $^ -o $@
securitytest: $(SECURITY_TEST_OBJ_FILES) libiotivity-lite-client-server.a | $(GTEST)
$(CXX) $(GTEST_CPPFLAGS) $(TEST_CXXFLAGS) $(EXTRA_CFLAGS) $(HEADER_DIR) -l:gtest_main.a -liotivity-lite-client-server -L$(OUT_DIR) -L$(GTEST_DIR)/make -lpthread $^ -o $@
$(PLATFORM_TEST_OBJ_DIR)/%.o: $(PLATFORM_TEST_DIR)/%.cpp
@mkdir -p ${@D}
$(CXX) $< -o $@ $(GTEST_CPPFLAGS) $(TEST_CXXFLAGS) $(EXTRA_CFLAGS) $(HEADER_DIR) -I$(ROOT_DIR)/deps/tinycbor/src -c
platformtest: $(PLATFORM_TEST_OBJ_FILES) libiotivity-constrained-client-server.a | $(GTEST)
$(CXX) $(GTEST_CPPFLAGS) $(TEST_CXXFLAGS) $(EXTRA_CFLAGS) $(HEADER_DIR) -l:gtest_main.a -liotivity-constrained-client-server -L$(OUT_DIR) -L$(GTEST_DIR)/make -lpthread $^ -o $@
platformtest: $(PLATFORM_TEST_OBJ_FILES) libiotivity-lite-client-server.a | $(GTEST)
$(CXX) $(GTEST_CPPFLAGS) $(TEST_CXXFLAGS) $(EXTRA_CFLAGS) $(HEADER_DIR) -l:gtest_main.a -liotivity-lite-client-server -L$(OUT_DIR) -L$(GTEST_DIR)/make -lpthread $^ -o $@
$(CLOUD_TEST_OBJ_DIR)/%.o: $(CLOUD_TEST_DIR)/%.cpp
@mkdir -p ${@D}
$(CXX) $(GTEST_CPPFLAGS) $(TEST_CXXFLAGS) $(EXTRA_CFLAGS) $(HEADER_DIR) $(CFLAGS_CLOUD) -I$(ROOT_DIR)/service/cloud/src -I$(ROOT_DIR)/deps/tinycbor/src -c $< -o $@
cloudtest: $(CLOUD_TEST_OBJ_FILES) libiotivity-constrained-client-server.a | $(GTEST)
$(CXX) $(GTEST_CPPFLAGS) $(TEST_CXXFLAGS) $(EXTRA_CFLAGS) $(HEADER_DIR) $(CFLAGS_CLOUD) -l:gtest_main.a -liotivity-constrained-client-server -L$(OUT_DIR) -L$(GTEST_DIR)/make -lpthread $^ -o $@
cloudtest: $(CLOUD_TEST_OBJ_FILES) libiotivity-lite-client-server.a | $(GTEST)
$(CXX) $(GTEST_CPPFLAGS) $(TEST_CXXFLAGS) $(EXTRA_CFLAGS) $(HEADER_DIR) $(CFLAGS_CLOUD) -l:gtest_main.a -liotivity-lite-client-server -L$(OUT_DIR) -L$(GTEST_DIR)/make -lpthread $^ -o $@
$(MESSAGING_TEST_OBJ_DIR)/%.o: $(MESSAGING_TEST_DIR)/%.cpp
@mkdir -p ${@D}
$(CXX) $(GTEST_CPPFLAGS) $(TEST_CXXFLAGS) $(EXTRA_CFLAGS) $(HEADER_DIR) $(MESSAGING_HEADERS) -c $< -o $@
messagingtest: $(MESSAGING_TEST_OBJ_FILES) libiotivity-constrained-client-server.a | $(GTEST)
$(CXX) $(GTEST_CPPFLAGS) $(TEST_CXXFLAGS) $(EXTRA_CFLAGS) $(HEADER_DIR) -l:gtest_main.a -liotivity-constrained-client-server -L$(OUT_DIR) -L$(GTEST_DIR)/make -lpthread $^ -o $@
messagingtest: $(MESSAGING_TEST_OBJ_FILES) libiotivity-lite-client-server.a | $(GTEST)
$(CXX) $(GTEST_CPPFLAGS) $(TEST_CXXFLAGS) $(EXTRA_CFLAGS) $(HEADER_DIR) -l:gtest_main.a -liotivity-lite-client-server -L$(OUT_DIR) -L$(GTEST_DIR)/make -lpthread $^ -o $@
copy_pki_certs:
@mkdir -p pki_certs
......@@ -275,103 +275,103 @@ obj/server/oc_introspection.o: ../../include/server_introspection.dat.h
obj/client/oc_introspection.o: ../../include/server_introspection.dat.h
obj/client_server/oc_introspection.o: ../../include/server_introspection.dat.h
libiotivity-constrained-server.a: $(OBJ_COMMON) $(OBJ_SERVER)
libiotivity-lite-server.a: $(OBJ_COMMON) $(OBJ_SERVER)
$(AR) -rcs $@ $(OBJ_COMMON) $(OBJ_SERVER)
libiotivity-constrained-server.so: $(OBJ_COMMON) $(OBJ_SERVER)
libiotivity-lite-server.so: $(OBJ_COMMON) $(OBJ_SERVER)
$(CC) -shared -o $@ $(OBJ_COMMON) $(OBJ_SERVER) $(LIBS)
libiotivity-constrained-client.a: $(OBJ_COMMON) $(OBJ_CLIENT)
libiotivity-lite-client.a: $(OBJ_COMMON) $(OBJ_CLIENT)
$(AR) -rcs $@ $(OBJ_COMMON) $(OBJ_CLIENT)
libiotivity-constrained-client.so: $(OBJ_COMMON) $(OBJ_CLIENT)
libiotivity-lite-client.so: $(OBJ_COMMON) $(OBJ_CLIENT)
$(CC) -shared -o $@ $(OBJ_COMMON) $(OBJ_CLIENT) $(LIBS)
libiotivity-constrained-client-server.a: $(OBJ_COMMON) $(OBJ_CLIENT_SERVER) $(OBJ_CLOUD)
libiotivity-lite-client-server.a: $(OBJ_COMMON) $(OBJ_CLIENT_SERVER) $(OBJ_CLOUD)
$(AR) -rcs $@ $(OBJ_COMMON) $(OBJ_CLIENT_SERVER) $(OBJ_CLOUD)
libiotivity-constrained-client-server.so: $(OBJ_COMMON) $(OBJ_CLIENT_SERVER) $(OBJ_CLOUD)
libiotivity-lite-client-server.so: $(OBJ_COMMON) $(OBJ_CLIENT_SERVER) $(OBJ_CLOUD)
$(CC) -shared -o $@ $(OBJ_COMMON) $(OBJ_CLIENT_SERVER) $(OBJ_CLOUD) $(LIBS)
server: libiotivity-constrained-server.a $(ROOT_DIR)/apps/server_linux.c
server: libiotivity-lite-server.a $(ROOT_DIR)/apps/server_linux.c
@mkdir -p $@_creds
${CC} -o $@ ../../apps/server_linux.c libiotivity-constrained-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
${CC} -o $@ ../../apps/server_linux.c libiotivity-lite-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
client: libiotivity-constrained-client.a $(ROOT_DIR)/apps/client_linux.c
client: libiotivity-lite-client.a $(ROOT_DIR)/apps/client_linux.c
@mkdir -p $@_creds
${CC} -o $@ ../../apps/client_linux.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
${CC} -o $@ ../../apps/client_linux.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
smart_lock: libiotivity-constrained-client.a $(ROOT_DIR)/apps/smart_lock_linux.c
smart_lock: libiotivity-lite-client.a $(ROOT_DIR)/apps/smart_lock_linux.c
@mkdir -p $@_creds
${CC} -o $@ ../../apps/smart_lock_linux.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
${CC} -o $@ ../../apps/smart_lock_linux.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
temp_sensor: libiotivity-constrained-client.a $(ROOT_DIR)/apps/temp_sensor_client_linux.c
temp_sensor: libiotivity-lite-client.a $(ROOT_DIR)/apps/temp_sensor_client_linux.c
@mkdir -p $@_creds
${CC} -o $@ ../../apps/temp_sensor_client_linux.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
${CC} -o $@ ../../apps/temp_sensor_client_linux.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
simpleserver: libiotivity-constrained-server.a $(ROOT_DIR)/apps/simpleserver.c
simpleserver: libiotivity-lite-server.a $(ROOT_DIR)/apps/simpleserver.c
@mkdir -p $@_creds
${CC} -o $@ ../../apps/simpleserver.c libiotivity-constrained-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
${CC} -o $@ ../../apps/simpleserver.c libiotivity-lite-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
simpleserver_pki: libiotivity-constrained-server.a $(ROOT_DIR)/apps/simpleserver_pki.c
simpleserver_pki: libiotivity-lite-server.a $(ROOT_DIR)/apps/simpleserver_pki.c
@mkdir -p $@_creds
${CC} -o $@ ../../apps/simpleserver_pki.c libiotivity-constrained-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
${CC} -o $@ ../../apps/simpleserver_pki.c libiotivity-lite-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
simpleclient: libiotivity-constrained-client.a $(ROOT_DIR)/apps/simpleclient.c
simpleclient: libiotivity-lite-client.a $(ROOT_DIR)/apps/simpleclient.c
@mkdir -p $@_creds
${CC} -o $@ ../../apps/simpleclient.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
${CC} -o $@ ../../apps/simpleclient.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
client_collections_linux: libiotivity-constrained-client.a $(ROOT_DIR)/apps/client_collections_linux.c
client_collections_linux: libiotivity-lite-client.a $(ROOT_DIR)/apps/client_collections_linux.c
@mkdir -p $@_creds
${CC} -o $@ ../../apps/client_collections_linux.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
${CC} -o $@ ../../apps/client_collections_linux.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
server_collections_linux: libiotivity-constrained-server.a $(ROOT_DIR)/apps/server_collections_linux.c
server_collections_linux: libiotivity-lite-server.a $(ROOT_DIR)/apps/server_collections_linux.c
@mkdir -p $@_creds
${CC} -o $@ ../../apps/server_collections_linux.c libiotivity-constrained-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
${CC} -o $@ ../../apps/server_collections_linux.c libiotivity-lite-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
client_block_linux: libiotivity-constrained-client.a $(ROOT_DIR)/apps/client_block_linux.c
${CC} -o $@ ../../apps/client_block_linux.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
client_block_linux: libiotivity-lite-client.a $(ROOT_DIR)/apps/client_block_linux.c
${CC} -o $@ ../../apps/client_block_linux.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
server_block_linux: libiotivity-constrained-server.a $(ROOT_DIR)/apps/server_block_linux.c
${CC} -o $@ ../../apps/server_block_linux.c libiotivity-constrained-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
server_block_linux: libiotivity-lite-server.a $(ROOT_DIR)/apps/server_block_linux.c
${CC} -o $@ ../../apps/server_block_linux.c libiotivity-lite-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
smart_home_server_linux: libiotivity-constrained-server.a $(ROOT_DIR)/apps/smart_home_server_linux.c copy_pki_certs
smart_home_server_linux: libiotivity-lite-server.a $(ROOT_DIR)/apps/smart_home_server_linux.c copy_pki_certs
@mkdir -p $@_creds
${CC} -o $@ ../../apps/smart_home_server_linux.c libiotivity-constrained-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
${CC} -o $@ ../../apps/smart_home_server_linux.c libiotivity-lite-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
smart_home_server_with_mock_swupdate: libiotivity-constrained-server.a $(ROOT_DIR)/apps/smart_home_server_with_mock_swupdate.cpp
smart_home_server_with_mock_swupdate: libiotivity-lite-server.a $(ROOT_DIR)/apps/smart_home_server_with_mock_swupdate.cpp
@mkdir -p $@_creds
${CXX} -o $@ ../../apps/smart_home_server_with_mock_swupdate.cpp libiotivity-constrained-server.a -DOC_SERVER ${CXXFLAGS} ${LIBS} -lboost_system -lcppnetlib-uri
${CXX} -o $@ ../../apps/smart_home_server_with_mock_swupdate.cpp libiotivity-lite-server.a -DOC_SERVER ${CXXFLAGS} ${LIBS} -lboost_system -lcppnetlib-uri
multi_device_server: libiotivity-constrained-server.a $(ROOT_DIR)/apps/multi_device_server_linux.c
multi_device_server: libiotivity-lite-server.a $(ROOT_DIR)/apps/multi_device_server_linux.c
@mkdir -p $@_creds
${CC} -o $@ ../../apps/multi_device_server_linux.c libiotivity-constrained-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
${CC} -o $@ ../../apps/multi_device_server_linux.c libiotivity-lite-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
multi_device_client: libiotivity-constrained-client.a $(ROOT_DIR)/apps/multi_device_client_linux.c
multi_device_client: libiotivity-lite-client.a $(ROOT_DIR)/apps/multi_device_client_linux.c
@mkdir -p $@_creds
${CC} -o $@ ../../apps/multi_device_client_linux.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
${CC} -o $@ ../../apps/multi_device_client_linux.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
cloud_linux: libiotivity-constrained-client-server.a $(ROOT_DIR)/apps/cloud_linux.c
cloud_linux: libiotivity-lite-client-server.a $(ROOT_DIR)/apps/cloud_linux.c
@mkdir -p $@_creds
${CC} -o $@ ../../apps/cloud_linux.c libiotivity-constrained-client-server.a -DOC_CLIENT -DOC_SERVER ${CFLAGS} ${CFLAGS_CLOUD} ${LIBS}
${CC} -o $@ ../../apps/cloud_linux.c libiotivity-lite-client-server.a -DOC_CLIENT -DOC_SERVER ${CFLAGS} ${CFLAGS_CLOUD} ${LIBS}
cloud_tests: libiotivity-constrained-client-server.a $(ROOT_DIR)/apps/cloud_certification_tests.c
cloud_tests: libiotivity-lite-client-server.a $(ROOT_DIR)/apps/cloud_certification_tests.c
@mkdir -p $@_creds
${CC} -o $@ ../../apps/cloud_certification_tests.c libiotivity-constrained-client-server.a -DOC_CLIENT -DOC_SERVER ${CFLAGS} ${CFLAGS_CLOUD} ${LIBS}
${CC} -o $@ ../../apps/cloud_certification_tests.c libiotivity-lite-client-server.a -DOC_CLIENT -DOC_SERVER ${CFLAGS} ${CFLAGS_CLOUD} ${LIBS}
${OBT}: libiotivity-constrained-client.a $(ROOT_DIR)/onboarding_tool/obtmain.c copy_pki_certs
${OBT}: libiotivity-lite-client.a $(ROOT_DIR)/onboarding_tool/obtmain.c copy_pki_certs
@mkdir -p $@_creds
${CC} -o $@ ../../onboarding_tool/obtmain.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
${CC} -o $@ ../../onboarding_tool/obtmain.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
server_multithread_linux: libiotivity-constrained-server.a $(ROOT_DIR)/apps/server_multithread_linux.c
server_multithread_linux: libiotivity-lite-server.a $(ROOT_DIR)/apps/server_multithread_linux.c
@mkdir -p $@_creds
${CC} -o $@ ../../apps/server_multithread_linux.c libiotivity-constrained-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
${CC} -o $@ ../../apps/server_multithread_linux.c libiotivity-lite-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
client_multithread_linux: libiotivity-constrained-client.a $(ROOT_DIR)/apps/client_multithread_linux.c
client_multithread_linux: libiotivity-lite-client.a $(ROOT_DIR)/apps/client_multithread_linux.c
@mkdir -p $@_creds
${CC} -o $@ ../../apps/client_multithread_linux.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
${CC} -o $@ ../../apps/client_multithread_linux.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
iotivity-constrained-server.pc: iotivity-constrained-server.pc.in
iotivity-lite-server.pc: iotivity-lite-server.pc.in
$(SED) > $@ < $< \
-e 's,@prefix@,$(prefix),' \
-e 's,@exec_prefix@,$(exec_prefix),' \
......@@ -380,7 +380,7 @@ iotivity-constrained-server.pc: iotivity-constrained-server.pc.in
-e 's,@version@,$(VERSION),' \
-e 's,@extra_cflags@,$(EXTRA_CFLAGS),'
iotivity-constrained-client.pc: iotivity-constrained-client.pc.in
iotivity-lite-client.pc: iotivity-lite-client.pc.in
$(SED) > $@ < $< \
-e 's,@prefix@,$(prefix),' \
-e 's,@exec_prefix@,$(exec_prefix),' \
......@@ -389,25 +389,7 @@ iotivity-constrained-client.pc: iotivity-constrained-client.pc.in
-e 's,@version@,$(VERSION),' \
-e 's,@extra_cflags@,$(EXTRA_CFLAGS),'
iotivity-constrained-client-server.pc: iotivity-constrained-client-server.pc.in
$(SED) > $@ < $< \
-e 's,@prefix@,$(prefix),' \
-e 's,@exec_prefix@,$(exec_prefix),' \
-e 's,@libdir@,$(libdir),' \
-e 's,@includedir@,$(includedir),' \
-e 's,@version@,$(VERSION),' \
-e 's,@extra_cflags@,$(EXTRA_CFLAGS),'
iotivity-constrained-rd-client.pc: iotivity-constrained-rd-client.pc.in
$(SED) > $@ < $< \
-e 's,@prefix@,$(prefix),' \
-e 's,@exec_prefix@,$(exec_prefix),' \
-e 's,@libdir@,$(libdir),' \
-e 's,@includedir@,$(includedir),' \
-e 's,@version@,$(VERSION),' \
-e 's,@extra_cflags@,$(EXTRA_CFLAGS),'
iotivity-constrained-cloud.pc: iotivity-constrained-cloud.pc.in
iotivity-lite-client-server.pc: iotivity-lite-client-server.pc.in
$(SED) > $@ < $< \
-e 's,@prefix@,$(prefix),' \
-e 's,@exec_prefix@,$(exec_prefix),' \
......@@ -447,19 +429,19 @@ distclean: cleanall
install: $(SAMPLES) $(PC) $(CONSTRAINED_LIBS)
$(INSTALL) -d $(bindir)
$(INSTALL) -d $(libdir)
$(INSTALL) -d $(includedir)/iotivity-constrained
$(INSTALL) -d $(includedir)/iotivity-constrained/port
$(INSTALL) -d $(includedir)/iotivity-constrained/util
$(INSTALL) -d $(includedir)/iotivity-constrained/util/pt
$(INSTALL) -d $(includedir)/iotivity-constrained/messaging/coap
$(INSTALL) -d $(includedir)/iotivity-constrained/deps/tinycbor/src/
$(INSTALL) -d $(includedir)/iotivity-lite
$(INSTALL) -d $(includedir)/iotivity-lite/port
$(INSTALL) -d $(includedir)/iotivity-lite/util
$(INSTALL) -d $(includedir)/iotivity-lite/util/pt
$(INSTALL) -d $(includedir)/iotivity-lite/messaging/coap
$(INSTALL) -d $(includedir)/iotivity-lite/deps/tinycbor/src/
$(INSTALL) -d $(pkgconfigdir)
$(INSTALL) -m 644 $(HEADERS) $(includedir)/iotivity-constrained/
$(INSTALL) -m 644 $(HEADERS_PORT) $(includedir)/iotivity-constrained/port
$(INSTALL) -m 644 $(HEADERS_UTIL) $(includedir)/iotivity-constrained/util
$(INSTALL) -m 644 $(HEADERS_UTIL_PT) $(includedir)/iotivity-constrained/util/pt
$(INSTALL) -m 644 $(HEADERS_COAP) $(includedir)/iotivity-constrained/messaging/coap
$(INSTALL) -m 644 $(HEADERS_TINYCBOR) $(includedir)/iotivity-constrained/deps/tinycbor/src
$(INSTALL) -m 644 $(HEADERS) $(includedir)/iotivity-lite/
$(INSTALL) -m 644 $(HEADERS_PORT) $(includedir)/iotivity-lite/port
$(INSTALL) -m 644 $(HEADERS_UTIL) $(includedir)/iotivity-lite/util
$(INSTALL) -m 644 $(HEADERS_UTIL_PT) $(includedir)/iotivity-lite/util/pt
$(INSTALL) -m 644 $(HEADERS_COAP) $(includedir)/iotivity-lite/messaging/coap
$(INSTALL) -m 644 $(HEADERS_TINYCBOR) $(includedir)/iotivity-lite/deps/tinycbor/src
$(INSTALL) -m 644 $(PC) $(pkgconfigdir)
$(INSTALL) -m 644 $(CONSTRAINED_LIBS) $(libdir)
# Installing the samples
......@@ -472,22 +454,22 @@ TESTS = \
tests/server_init_linux_test \
tests/client_get_linux_test
tests/client_init_linux_test: libiotivity-constrained-client.a
tests/client_init_linux_test: libiotivity-lite-client.a
@mkdir -p $(@D)
$(CC) -o $@ ../../tests/client_init_linux.c \
libiotivity-constrained-client.a \
libiotivity-lite-client.a \
-DOC_CLIENT $(CFLAGS) $(LIBS)
tests/server_init_linux_test: libiotivity-constrained-server.a
tests/server_init_linux_test: libiotivity-lite-server.a
@mkdir -p $(@D)
$(CC) -o $@ ../../tests/server_init_linux.c \
libiotivity-constrained-server.a \
libiotivity-lite-server.a \
-DOC_SERVER $(CFLAGS) $(LIBS)
tests/client_get_linux_test: libiotivity-constrained-client-server.a
tests/client_get_linux_test: libiotivity-lite-client-server.a
@mkdir -p $(@D)
$(CC) -o $@ ../../tests/client_get_linux.c \
libiotivity-constrained-client-server.a -DOC_SERVER \
libiotivity-lite-client-server.a -DOC_SERVER \
-DOC_CLIENT $(CFLAGS) $(LIBS)
check: $(TESTS)
......
# Copyright (c) 2019 Jozef Kralik
# Copyright (c) 2018 Samsung Electronics 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.
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: libiotivity-constrained-cloud
Description: Iotivity constrained resource directory client library
Version: @version@
Libs.private: -lm -pthread
Cflags: -I${includedir}/iotivity-constrained @extra_cflags@
Libs: -L${libdir} -liotivity-constrained-cloud
# Copyright (c) 2019 Jozef Kralik
# Copyright (c) 2018 Samsung Electronics 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.
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: libiotivity-constrained-rd-client
Description: Iotivity constrained resource directory client library
Version: @version@
Libs.private: -lm -pthread
Cflags: -I${includedir}/iotivity-constrained @extra_cflags@
Libs: -L${libdir} -liotivity-constrained-rd-client
......@@ -17,9 +17,9 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: iotivity-constrained-client-server
Description: Iotivity constrained client and server library
Name: iotivity-lite-client-server
Description: Iotivity lite client and server library
Version: @version@
Libs.private: -lm -pthread
Cflags: -I${includedir}/iotivity-constrained -DOC_CLIENT -DOC_SERVER @extra_cflags@
Libs: -L${libdir} -liotivity-constrained-client-server
Cflags: -I${includedir}/iotivity-lite -DOC_CLIENT -DOC_SERVER @extra_cflags@
Libs: -L${libdir} -liotivity-lite-client-server
......@@ -17,9 +17,9 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: iotivity-constrained-client
Description: Iotivity constrained client library
Name: iotivity-lite-client
Description: Iotivity lite client library
Version: @version@
Libs.private: -lm -pthread
Cflags: -I${includedir}/iotivity-constrained -DOC_CLIENT @extra_cflags@
Libs: -L${libdir} -liotivity-constrained-client
Cflags: -I${includedir}/iotivity-lite -DOC_CLIENT @extra_cflags@
Libs: -L${libdir} -liotivity-lite-client
......@@ -17,9 +17,9 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: iotivity-constrained-server
Description: Iotivity constrained server library
Name: iotivity-lite-server
Description: Iotivity lite server library
Version: @version@
Libs.private: -lm -pthread
Cflags: -I${includedir}/iotivity-constrained -DOC_SERVER @extra_cflags@
Libs: -L${libdir} -liotivity-constrained-server
Cflags: -I${includedir}/iotivity-lite -DOC_SERVER @extra_cflags@
Libs: -L${libdir} -liotivity-lite-server
......@@ -68,7 +68,7 @@ def check_style(files, only_print):
if __name__ == '__main__':
parser = argparse.ArgumentParser(description=
'Format the files in the repository according '
'with iotivity constrained code style.')
'with iotivity-lite code style.')
parser.add_argument('-p', action='store_true', default=False,
help='Only print the changes')
......
......@@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8
# title of most generated pages and in a few other places.
# The default value is: My Project.
PROJECT_NAME = IoTivity-constrained
PROJECT_NAME = IoTivity-Lite
# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
# could be handy for archiving the generated documentation or if some version
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment