You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by an...@apache.org on 2018/11/05 13:36:40 UTC
[mynewt-nimble] 01/03: [build] Adjust makefiles to support
autotools integration.
This is an automated email from the ASF dual-hosted git repository.
andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit d15edf1282a9b0046989d97c2d4f8f86a61fb1c5
Author: Martin Turon <mt...@nestlabs.com>
AuthorDate: Thu Aug 23 18:39:33 2018 -0700
[build] Adjust makefiles to support autotools integration.
---
porting/nimble/Makefile.controller | 2 ++
porting/nimble/Makefile.defs | 5 +++++
porting/nimble/Makefile.mesh | 2 ++
porting/nimble/Makefile.tinycrypt | 2 ++
4 files changed, 11 insertions(+)
diff --git a/porting/nimble/Makefile.controller b/porting/nimble/Makefile.controller
index b6e2ce4..8bc2c2a 100644
--- a/porting/nimble/Makefile.controller
+++ b/porting/nimble/Makefile.controller
@@ -22,6 +22,7 @@ NIMBLE_INCLUDE += \
$(NIMBLE_ROOT)/nimble/transport/ram/include \
$(NIMBLE_ROOT)/nimble/controller/include \
$(NIMBLE_ROOT)/nimble/drivers/nrf52/include \
+ $(NULL)
NIMBLE_SRC += \
$(NIMBLE_ROOT)/nimble/transport/ram/src/ble_hci_ram.c \
@@ -45,3 +46,4 @@ NIMBLE_SRC += \
$(NIMBLE_ROOT)/porting/nimble/src/os_cputime.c \
$(NIMBLE_ROOT)/porting/nimble/src/os_cputime_pwr2.c \
$(NIMBLE_ROOT)/porting/nimble/src/hal_timer.c \
+ $(NULL)
diff --git a/porting/nimble/Makefile.defs b/porting/nimble/Makefile.defs
index 87e1cc7..3e0f7be 100644
--- a/porting/nimble/Makefile.defs
+++ b/porting/nimble/Makefile.defs
@@ -35,6 +35,7 @@ NIMBLE_INCLUDE := \
$(NIMBLE_ROOT)/nimble/host/store/ram/include \
$(NIMBLE_ROOT)/nimble/host/util/include \
$(NIMBLE_ROOT)/porting/nimble/include \
+ $(NULL)
NIMBLE_SRC := \
$(NIMBLE_ROOT)/nimble/host/src/ble_att.c \
@@ -87,10 +88,13 @@ NIMBLE_SRC := \
$(NIMBLE_ROOT)/nimble/host/store/ram/src/ble_store_ram.c \
$(NIMBLE_ROOT)/nimble/host/util/src/addr.c \
$(NIMBLE_ROOT)/nimble/src/ble_util.c \
+ $(NIMBLE_ROOT)/nimble/src/hci_common.c \
+ $(NULL)
# Few utils and data structures copied from Mynewt
NIMBLE_SRC += \
$(NIMBLE_ROOT)/porting/nimble/src/nimble_port.c \
+ $(NULL)
# Few utils and data structures copied from Mynewt
NIMBLE_SRC += \
@@ -99,6 +103,7 @@ NIMBLE_SRC += \
$(NIMBLE_ROOT)/porting/nimble/src/os_mbuf.c \
$(NIMBLE_ROOT)/porting/nimble/src/os_mempool.c \
$(NIMBLE_ROOT)/porting/nimble/src/os_msys_init.c \
+ $(NULL)
ifneq (,$(NIMBLE_CFG_CONTROLLER))
include $(NIMBLE_ROOT)/porting/nimble/Makefile.controller
diff --git a/porting/nimble/Makefile.mesh b/porting/nimble/Makefile.mesh
index e4a8d47..2f47a78 100644
--- a/porting/nimble/Makefile.mesh
+++ b/porting/nimble/Makefile.mesh
@@ -17,6 +17,7 @@
NIMBLE_INCLUDE += \
$(NIMBLE_ROOT)/nimble/host/mesh/include \
+ $(NULL)
NIMBLE_SRC += \
$(NIMBLE_ROOT)/nimble/host/mesh/src/access.c \
@@ -40,3 +41,4 @@ NIMBLE_SRC += \
$(NIMBLE_ROOT)/nimble/host/mesh/src/shell.c \
$(NIMBLE_ROOT)/nimble/host/mesh/src/testing.c \
$(NIMBLE_ROOT)/nimble/host/mesh/src/transport.c \
+ $(NULL)
diff --git a/porting/nimble/Makefile.tinycrypt b/porting/nimble/Makefile.tinycrypt
index d074748..2acc131 100644
--- a/porting/nimble/Makefile.tinycrypt
+++ b/porting/nimble/Makefile.tinycrypt
@@ -19,6 +19,7 @@ TINYCRYPT_CFLAGS := -std=c99
TINYCRYPT_INCLUDE := \
$(NIMBLE_ROOT)/ext/tinycrypt/include \
+ $(NULL)
TINYCRYPT_SRC := \
$(NIMBLE_ROOT)/ext/tinycrypt/src/aes_decrypt.c \
@@ -27,3 +28,4 @@ TINYCRYPT_SRC := \
$(NIMBLE_ROOT)/ext/tinycrypt/src/ecc.c \
$(NIMBLE_ROOT)/ext/tinycrypt/src/ecc_dh.c \
$(NIMBLE_ROOT)/ext/tinycrypt/src/utils.c \
+ $(NULL)