[GitHub] andrzej-kaczmarek closed pull request #168: [build] Adjust makefiles to support autotools integration.

[GitBox <gi...@apache.org>]

andrzej-kaczmarek closed pull request #168: [build] Adjust makefiles to support autotools integration.
URL: https://github.com/apache/mynewt-nimble/pull/168
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/porting/nimble/Makefile.controller b/porting/nimble/Makefile.controller
index b6e2ce4e..8bc2c2a0 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 86dda3a7..5d0aac7e 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,11 +88,12 @@ 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 += \
@@ -100,6 +102,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 e4a8d479..2f47a781 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 c9ae0298..ab6b9e2c 100644
--- a/porting/nimble/Makefile.tinycrypt
+++ b/porting/nimble/Makefile.tinycrypt
@@ -17,6 +17,7 @@
 
 NIMBLE_INCLUDE += \
 	$(NIMBLE_ROOT)/ext/tinycrypt/include \
+	$(NULL)
 
 NIMBLE_SRC += \
 	$(NIMBLE_ROOT)/ext/tinycrypt/src/aes_decrypt.c \
@@ -25,3 +26,4 @@ NIMBLE_SRC += \
 	$(NIMBLE_ROOT)/ext/tinycrypt/src/ecc.c \
 	$(NIMBLE_ROOT)/ext/tinycrypt/src/ecc_dh.c \
 	$(NIMBLE_ROOT)/ext/tinycrypt/src/utils.c \
+	$(NULL)


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services