From 49232d5c0e3616ae1252b57981815ac2209df17d Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Wed, 17 May 2017 23:22:05 +0200 Subject: [PATCH] fix compile --- port/daemon/src/Makefile.in | 45 ++++++++++++++------------- port/ez430-rf2560/Makefile | 7 +++-- port/ios/src/Makefile | 7 +++-- port/msp-exp430f5438-cc2564b/Makefile | 13 ++++---- port/msp430f5229lp-cc2564b/Makefile | 13 ++++---- port/mtk/Makefile | 1 + port/stm32-f103rb-nucleo/Makefile | 1 + test/avdtp/Makefile | 13 ++++---- test/avrcp/Makefile | 13 ++++---- test/hfp/Makefile | 33 ++++++++++---------- 10 files changed, 78 insertions(+), 68 deletions(-) diff --git a/port/daemon/src/Makefile.in b/port/daemon/src/Makefile.in index 94d209d09..7ff08bced 100644 --- a/port/daemon/src/Makefile.in +++ b/port/daemon/src/Makefile.in @@ -40,29 +40,30 @@ libBTstack_SOURCES = \ $(btstack_run_loop_sources) \ BTdaemon_SOURCES = \ - daemon.c \ - btstack_uart_block_posix.c \ - hci_transport_h4.c \ - $(libBTstack_SOURCES) \ - btstack_memory.c \ - hci.c \ - hci_dump.c \ - l2cap.c \ - l2cap_signaling.c \ + $(libBTstack_SOURCES) \ + $(usb_sources) \ + $(remote_device_db_sources) \ + ad_parser.c \ + att_db.c \ + att_dispatch.c \ + att_server.c \ + bnep.c \ + btstack_memory.c \ btstack_memory_pool.c \ - rfcomm.c \ - bnep.c \ - sdp_server.c \ - sdp_client.c \ - sdp_client_rfcomm.c \ - att_dispatch.c \ - gatt_client.c \ - att_db.c \ - att_server.c \ - sm.c \ - le_device_db_memory.c \ - $(usb_sources) \ - $(remote_device_db_sources) \ + btstack_uart_block_posix.c \ + daemon.c \ + gatt_client.c \ + hci.c \ + hci_dump.c \ + hci_transport_h4.c \ + l2cap.c \ + l2cap_signaling.c \ + le_device_db_memory.c \ + rfcomm.c \ + sdp_client.c \ + sdp_client_rfcomm.c \ + sdp_server.c \ + sm.c \ # use $(CC) for Objective-C files .m.o: diff --git a/port/ez430-rf2560/Makefile b/port/ez430-rf2560/Makefile index 0b9bc147c..04ee846e2 100644 --- a/port/ez430-rf2560/Makefile +++ b/port/ez430-rf2560/Makefile @@ -50,13 +50,14 @@ CORE = \ btstack_util.c \ COMMON = \ - hal_uart_dma.c \ + ad_parser.c \ btstack_chipset_cc256x.c \ + btstack_link_key_db_memory.c \ + btstack_uart_block_embedded.c \ + hal_uart_dma.c \ hci.c \ hci_cmd.c \ hci_transport_h4_ehcill_embedded.c \ - btstack_uart_block_embedded.c \ - btstack_link_key_db_memory.c \ SPP = \ l2cap.c \ diff --git a/port/ios/src/Makefile b/port/ios/src/Makefile index e0cfd5b84..d51e87f96 100644 --- a/port/ios/src/Makefile +++ b/port/ios/src/Makefile @@ -25,13 +25,14 @@ libBTstack_CFLAGS = -I$(BTSTACK_ROOT)/src/ble -I$(BTSTACK_ROOT)/src -I.. TOOL_NAME = BTdaemon BTdaemon_FILES = \ $(libBTstack_FILES) \ - $(BTSTACK_ROOT)/src/hci.c \ - $(BTSTACK_ROOT)/src/l2cap.c \ - $(BTSTACK_ROOT)/src/l2cap_signaling.c \ + $(BTSTACK_ROOT)/src/ad_parser.c \ $(BTSTACK_ROOT)/src/btstack_memory.c \ $(BTSTACK_ROOT)/src/btstack_memory_pool.c \ $(BTSTACK_ROOT)/src/classic/rfcomm.c \ $(BTSTACK_ROOT)/src/classic/sdp_server.c \ + $(BTSTACK_ROOT)/src/hci.c \ + $(BTSTACK_ROOT)/src/l2cap.c \ + $(BTSTACK_ROOT)/src/l2cap_signaling.c \ $(BTSTACK_ROOT)/src/classic/sdp_client.c \ $(BTSTACK_ROOT)/src/classic/sdp_client_rfcomm.c \ $(BTSTACK_ROOT)/platform/corefoundation/btstack_device_name_db_corefoundation.m \ diff --git a/port/msp-exp430f5438-cc2564b/Makefile b/port/msp-exp430f5438-cc2564b/Makefile index 1b64d37a3..642bf7572 100644 --- a/port/msp-exp430f5438-cc2564b/Makefile +++ b/port/msp-exp430f5438-cc2564b/Makefile @@ -50,13 +50,14 @@ CORE = \ btstack_util.c \ COMMON = \ - hal_uart_dma.c \ - btstack_chipset_cc256x.c \ - hci.c \ - hci_cmd.c \ - btstack_uart_block_embedded.c \ + ad_parser.c \ + btstack_chipset_cc256x.c \ + btstack_link_key_db_memory.c \ + btstack_uart_block_embedded.c \ + hal_uart_dma.c \ + hci.c \ + hci_cmd.c \ hci_transport_h4_ehcill_embedded.c \ - btstack_link_key_db_memory.c \ SPP = \ l2cap.c \ diff --git a/port/msp430f5229lp-cc2564b/Makefile b/port/msp430f5229lp-cc2564b/Makefile index f0c3ec7e3..ee3529a06 100644 --- a/port/msp430f5229lp-cc2564b/Makefile +++ b/port/msp430f5229lp-cc2564b/Makefile @@ -52,13 +52,14 @@ CORE = \ btstack_util.c \ COMMON = \ - hal_uart_dma.c \ - btstack_chipset_cc256x.c \ - hci.c \ - hci_cmd.c \ - btstack_uart_block_embedded.c \ + ad_parser.c \ + btstack_chipset_cc256x.c \ + btstack_link_key_db_memory.c \ + btstack_uart_block_embedded.c \ + hal_uart_dma.c \ + hci.c \ + hci_cmd.c \ hci_transport_h4_ehcill_embedded.c \ - btstack_link_key_db_memory.c \ SPP = \ l2cap.c \ diff --git a/port/mtk/Makefile b/port/mtk/Makefile index 6bd6c4fb4..d8ac4285e 100644 --- a/port/mtk/Makefile +++ b/port/mtk/Makefile @@ -38,6 +38,7 @@ libBTstack_OBJS = \ socket_connection.o \ BTdaemon_OBJS = $(libBTstack_OBJS) \ + ad_parser.o \ att_dispatch.o \ btstack_link_key_db_memory.o \ btstack_memory.o \ diff --git a/port/stm32-f103rb-nucleo/Makefile b/port/stm32-f103rb-nucleo/Makefile index 8f50bc450..b83947992 100644 --- a/port/stm32-f103rb-nucleo/Makefile +++ b/port/stm32-f103rb-nucleo/Makefile @@ -24,6 +24,7 @@ CORE = \ btstack_run_loop_embedded.c \ COMMON = \ + ad_parser.c \ bluetooth_init_cc2564B_1.6_BT_Spec_4.1.c \ btstack_chipset_cc256x.c \ btstack_link_key_db_memory.c \ diff --git a/test/avdtp/Makefile b/test/avdtp/Makefile index f8c4d449c..4fd85e884 100644 --- a/test/avdtp/Makefile +++ b/test/avdtp/Makefile @@ -15,18 +15,19 @@ CORE += \ COMMON += \ + ad_parser.c \ + btstack_link_key_db_fs.c \ + btstack_run_loop_posix.c \ hci.c \ hci_cmd.c \ hci_dump.c \ + hci_transport_h2_libusb.c \ l2cap.c \ l2cap_signaling.c \ - hci_transport_h2_libusb.c \ - btstack_run_loop_posix.c \ - btstack_link_key_db_fs.c \ - le_device_db_fs.c \ - wav_util.c \ + le_device_db_fs.c \ + sdp_server.c \ sdp_util.c \ - sdp_server.c \ + wav_util.c \ CFLAGS += -g -Wall -Wmissing-prototypes -Wstrict-prototypes -Wshadow -Wunused-variable -Wunused-parameter -Werror CFLAGS += -I. diff --git a/test/avrcp/Makefile b/test/avrcp/Makefile index f29833c31..b8f6804c9 100644 --- a/test/avrcp/Makefile +++ b/test/avrcp/Makefile @@ -15,18 +15,19 @@ CORE += \ COMMON += \ + ad_parser.c \ + btstack_link_key_db_fs.c \ + btstack_run_loop_posix.c \ hci.c \ hci_cmd.c \ hci_dump.c \ + hci_transport_h2_libusb.c \ l2cap.c \ l2cap_signaling.c \ - hci_transport_h2_libusb.c \ - btstack_run_loop_posix.c \ - btstack_link_key_db_fs.c \ - le_device_db_fs.c \ - wav_util.c \ + le_device_db_fs.c \ + sdp_server.c \ sdp_util.c \ - sdp_server.c \ + wav_util.c \ CFLAGS += -g -Wall -Wmissing-prototypes -Wstrict-prototypes -Wshadow -Wunused-variable -Wunused-parameter -Werror CFLAGS += -I. diff --git a/test/hfp/Makefile b/test/hfp/Makefile index 2a5c4877b..49a3aac3b 100644 --- a/test/hfp/Makefile +++ b/test/hfp/Makefile @@ -8,23 +8,24 @@ CPPUTEST_HOME = ${BTSTACK_ROOT}/test/cpputest include ${BTSTACK_ROOT}/example/Makefile.inc COMMON = \ - sdp_server.c \ - sdp_client_rfcomm.c \ + ad_parser.c \ + sdp_server.c \ + sdp_client_rfcomm.c \ btstack_link_key_db_memory.c \ - btstack_linked_list.c \ - btstack_memory.c \ - btstack_memory_pool.c \ - btstack_run_loop.c \ - btstack_run_loop_posix.c \ - btstack_util.c \ - hci.c \ - hci_cmd.c \ - hci_dump.c \ - l2cap.c \ - l2cap_signaling.c \ - rfcomm.c \ - sdp_client.c \ - sdp_util.c \ + btstack_linked_list.c \ + btstack_memory.c \ + btstack_memory_pool.c \ + btstack_run_loop.c \ + btstack_run_loop_posix.c \ + btstack_util.c \ + hci.c \ + hci_cmd.c \ + hci_dump.c \ + l2cap.c \ + l2cap_signaling.c \ + rfcomm.c \ + sdp_client.c \ + sdp_util.c \ MOCK = \