CC=gcc
AR=ar
RANLIB=ranlib
- CFLAGS_PLATFORM = -DWITH_POSIX -std=c99
+ CFLAGS_PLATFORM = -DWITH_POSIX -std=gnu99
PLATFORM_TYPE=linux
else ifeq ($(PLATFORM),arduinomega)
include local.properties
OCLOGGER_DIR = logger
OC_LOG_DIR = ../oc_logger
OCRANDOM_DIR = ocrandom
-OCSOCKET_DIR = ocsocket
-LCOAP_DIR = libcoap-4.1.1
-OCCOAP_DIR = occoap
OCTBSTACK_DIR = stack
OCMALLOC_DIR = ocmalloc
OCSECURITY_DIR = security
TINYDTLS_DIR = $(EXTLIBS_DIR)/tinydtls
CONNECTIVITY_DIR = connectivity
-OCCOAP_SRC = $(OCCOAP_DIR)/src
OCTBSTACK_SRC = $(OCTBSTACK_DIR)/src
OCMALLOC_SRC = $(OCMALLOC_DIR)/src
OCSECURITY_SRC = $(OCSECURITY_DIR)/src
CJSON_SRC = $(CJSON_DIR)
CONNECTIVITY_SRC = $(CONNECTIVITY_DIR)
OCLOGGER_SRC = $(OCLOGGER_DIR)/src
-OCSOCKET_SRC = $(OCSOCKET_DIR)/src
OCRANDOM_SRC = $(OCRANDOM_DIR)/src
-
OCLOGGER_INC = $(OCLOGGER_DIR)/include
OC_LOG_INC = $(OC_LOG_DIR)/include
OCRANDOM_INC = $(OCRANDOM_DIR)/include
-OCSOCKET_INC = $(OCSOCKET_DIR)/include
-LCOAP_INC = $(LCOAP_DIR)
-OCCOAP_INC = $(OCCOAP_DIR)/include
OCTBSTACK_INC = $(OCTBSTACK_DIR)/include
OCMALLOC_INC = $(OCMALLOC_DIR)/include
OCSECURITY_INC = $(OCSECURITY_DIR)/include
CJSON_INC = $(CJSON_DIR)
CONNECTIVITY_INC = $(CONNECTIVITY_DIR)/inc
+LIBCOAP_INC = $(CONNECTIVITY_DIR)/lib/libcoap-4.1.1
INC_DIRS := -I$(OCLOGGER_INC)
INC_DIRS += -I$(OC_LOG_INC)
INC_DIRS += -I$(OCRANDOM_INC)
-INC_DIRS += -I$(OCSOCKET_INC)
-INC_DIRS += -I$(LCOAP_INC)
-INC_DIRS += -I$(OCCOAP_INC)
INC_DIRS += -I$(OCMALLOC_INC)
INC_DIRS += -I$(OCSECURITY_INC)
INC_DIRS += -I$(OCSECURITY_INC)/internal
INC_DIRS += -I$(CJSON_INC)
INC_DIRS += -I$(CONNECTIVITY_INC)
INC_DIRS += -I$(CONNECTIVITY_DIR)/api
+INC_DIRS += -I$(LIBCOAP_INC)
# TODO-CA Remove -fstack-protector-all before merging to master
CC_FLAGS.debug := -O0 -g3 -Wall -fstack-protector-all -c -fmessage-length=0 -pedantic -fpic -DTB_LOG
CC_FLAGS.release := -Os -Wall -fstack-protector-all -c -fmessage-length=0 -fpic
CFLAGS += $(CC_FLAGS.$(BUILD)) $(INC_DIRS) $(CFLAGS_PLATFORM) $(INC_DIR_PLATFORM)
-LDLIBS += -lcoap
CJSON_SOURCES := $(CJSON_SRC)/cJSON.c
-OCCOAP_SOURCES := $(OCCOAP_SRC)/occoap.c
-OCCOAP_SOURCES += $(OCCOAP_SRC)/occoaphelper.c
-
OCTBSTACK_SOURCES := $(OCTBSTACK_SRC)/ocstack.c
OCTBSTACK_SOURCES += $(OCTBSTACK_SRC)/occlientcb.c
OCTBSTACK_SOURCES += $(OCTBSTACK_SRC)/ocresource.c
OCTBSTACK_SOURCES += $(OCLOGGER_SRC)/logger.c
OCTBSTACK_SOURCES += $(OCRANDOM_SRC)/ocrandom.c
-ifeq ($(PLATFORM_TYPE),arduino)
- ifeq ($(ARDUINOWIFI),1)
- OCTBSTACK_SOURCES += $(OCSOCKET_SRC)/ocsocket_arduino_wifi.c
- else
- OCTBSTACK_SOURCES += $(OCSOCKET_SRC)/ocsocket_arduino.c
- endif
-else
- OCTBSTACK_SOURCES += $(OCSOCKET_SRC)/ocsocket.c
-endif
-
SOURCES := $(CJSON_SOURCES)
-SOURCES += $(OCCOAP_SOURCES)
SOURCES += $(OCTBSTACK_SOURCES)
all: objdirs obj_build ca liboctbstack.a
rm -rf $(OBJ_DIR)
rm -rf release
rm -rf debug
+