From 3ae0151f5ec76e02649a7bc84c2c5786c7b60da3 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Thu, 21 May 2015 22:33:08 +0200 Subject: [PATCH] compile daemon inside platform/daemon --- platforms/daemon/Makefile.am | 2 +- platforms/daemon/configure.ac | 15 ++--- platforms/daemon/src/Makefile.in | 100 +++++++++++++++++-------------- 3 files changed, 61 insertions(+), 56 deletions(-) diff --git a/platforms/daemon/Makefile.am b/platforms/daemon/Makefile.am index 38bc47e08..8d9db23db 100644 --- a/platforms/daemon/Makefile.am +++ b/platforms/daemon/Makefile.am @@ -1,2 +1,2 @@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = src ../../example/daemon +SUBDIRS = src example diff --git a/platforms/daemon/configure.ac b/platforms/daemon/configure.ac index 6fe54c73e..d5b64999f 100644 --- a/platforms/daemon/configure.ac +++ b/platforms/daemon/configure.ac @@ -59,18 +59,15 @@ echo "BTstack configured for HCI $HCI_TRANSPORT Transport" HAVE_SO_NOSIGPIPE="no" -# from platform/daemon -BTSTACK_ROOT="../../.." - -RUN_LOOP_SOURCES="$BTSTACK_ROOT/platforms/posix/src/run_loop_posix.c" +RUN_LOOP_SOURCES="run_loop_posix.c" case "$host_os" in darwin*) - RUN_LOOP_SOURCES="$RUN_LOOP_SOURCES $BTSTACK_ROOT/platforms/cocoa/run_loop_cocoa.m" + RUN_LOOP_SOURCES="$RUN_LOOP_SOURCES run_loop_cocoa.m" LDFLAGS="$LDFLAGS -framework CoreFoundation -framework Foundation" USE_COCOA_RUN_LOOP="yes" BTSTACK_LIB_LDFLAGS="-dynamiclib -install_name \$(prefix)/lib/libBTstack.dylib" BTSTACK_LIB_EXTENSION="dylib" - REMOTE_DEVICE_DB_SOURCES="$BTSTACK_ROOT/platforms/cocoa/remote_device_db_cocoa.m" + REMOTE_DEVICE_DB_SOURCES="remote_device_db_cocoa.m" REMOTE_DEVICE_DB="remote_device_db_iphone" HAVE_SO_NOSIGPIPE="yes"; ;; @@ -80,14 +77,14 @@ case "$host_os" in LDFLAGS="$LDFLAGS -lws2_32" BTSTACK_LIB_LDFLAGS="-shared" BTSTACK_LIB_EXTENSION="dll" - REMOTE_DEVICE_DB_SOURCES="$BTSTACK_ROOT/src/remote_device_db_memory.c" + REMOTE_DEVICE_DB_SOURCES="remote_device_db_memory.c" REMOTE_DEVICE_DB="remote_device_db_memory" ;; *) USE_COCOA_RUN_LOOP="no" BTSTACK_LIB_LDFLAGS="-shared -Wl,-rpath,\$(prefix)/lib" BTSTACK_LIB_EXTENSION="so" - REMOTE_DEVICE_DB_SOURCES="$BTSTACK_ROOT/src/remote_device_db_memory.c" + REMOTE_DEVICE_DB_SOURCES="remote_device_db_memory.c" REMOTE_DEVICE_DB="remote_device_db_memory" ;; esac @@ -186,4 +183,4 @@ AC_SUBST(BTSTACK_LIB_LDFLAGS) AC_SUBST(BTSTACK_LIB_EXTENSION) AC_SUBST(LIBUSB_CFLAGS) AC_SUBST(LIBUSB_LDFLAGS) -AC_OUTPUT(Makefile src/Makefile ../../example/daemon/Makefile) +AC_OUTPUT(Makefile src/Makefile example/Makefile) diff --git a/platforms/daemon/src/Makefile.in b/platforms/daemon/src/Makefile.in index c9fe60941..ef5dd0556 100644 --- a/platforms/daemon/src/Makefile.in +++ b/platforms/daemon/src/Makefile.in @@ -10,69 +10,77 @@ BTSTACK_LIB_EXTENSION = @BTSTACK_LIB_EXTENSION@ LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ LIBUSB_LDFLAGS = @LIBUSB_LDFLAGS@ +VPATH += ${BTSTACK_ROOT}/platforms/daemon/src +VPATH += ${BTSTACK_ROOT}/platforms/posix/src +VPATH += ${BTSTACK_ROOT}/platforms/cocoa +VPATH += ${BTSTACK_ROOT}/src +VPATH += ${BTSTACK_ROOT}/ble + remote_device_db_sources = @REMOTE_DEVICE_DB_SOURCES@ run_loop_sources = @RUN_LOOP_SOURCES@ usb_sources = @USB_SOURCES@ -libBTstack_SOURCES = \ - $(BTSTACK_ROOT)/platforms/daemon/src/btstack.c \ - $(BTSTACK_ROOT)/platforms/daemon/src/socket_connection.c \ - $(BTSTACK_ROOT)/src/hci_cmds.c \ - $(BTSTACK_ROOT)/src/linked_list.c \ - $(BTSTACK_ROOT)/src/run_loop.c \ - $(BTSTACK_ROOT)/src/sdp_util.c \ - $(BTSTACK_ROOT)/src/utils.c \ - $(run_loop_sources) \ +libBTstack_SOURCES = \ + btstack.c \ + socket_connection.c \ + hci_cmds.c \ + linked_list.c \ + run_loop.c \ + sdp_util.c \ + utils.c \ + $(run_loop_sources) \ -BTdaemon_SOURCES = \ - $(BTSTACK_ROOT)/platforms/daemon/src/daemon.c \ - $(BTSTACK_ROOT)/platforms/posix/src/hci_transport_h4.c \ - $(libBTstack_SOURCES) \ - $(BTSTACK_ROOT)/src/btstack_memory.c \ - $(BTSTACK_ROOT)/src/hci.c \ - $(BTSTACK_ROOT)/src/hci_dump.c \ - $(BTSTACK_ROOT)/src/l2cap.c \ - $(BTSTACK_ROOT)/src/l2cap_signaling.c \ - $(BTSTACK_ROOT)/src/memory_pool.c \ - $(BTSTACK_ROOT)/src/rfcomm.c \ - $(BTSTACK_ROOT)/src/bnep.c \ - $(BTSTACK_ROOT)/src/sdp.c \ - $(BTSTACK_ROOT)/src/sdp_client.c \ - $(BTSTACK_ROOT)/src/sdp_parser.c \ - $(BTSTACK_ROOT)/src/sdp_query_rfcomm.c \ - $(BTSTACK_ROOT)/src/sdp_query_util.c \ - $(BTSTACK_ROOT)/ble/att_dispatch.c \ - $(BTSTACK_ROOT)/ble/gatt_client.c \ - $(BTSTACK_ROOT)/ble/att.c \ - $(BTSTACK_ROOT)/ble/att_server.c \ - $(BTSTACK_ROOT)/ble/sm.c \ - $(BTSTACK_ROOT)/ble/le_device_db_memory.c \ - $(usb_sources) \ - $(remote_device_db_sources) \ +BTdaemon_SOURCES = \ + daemon.c \ + hci_transport_h4.c \ + $(libBTstack_SOURCES) \ + btstack_memory.c \ + hci.c \ + hci_dump.c \ + l2cap.c \ + l2cap_signaling.c \ + memory_pool.c \ + rfcomm.c \ + bnep.c \ + sdp.c \ + sdp_client.c \ + sdp_parser.c \ + sdp_query_rfcomm.c \ + sdp_query_util.c \ + att_dispatch.c \ + gatt_client.c \ + att.c \ + att_server.c \ + sm.c \ + le_device_db_memory.c \ + $(usb_sources) \ + $(remote_device_db_sources) \ # use $(CC) for Objective-C files .m.o: $(CC) $(CFLAGS) -c -o $@ $< -all: $(BTSTACK_ROOT)/src/libBTstack.$(BTSTACK_LIB_EXTENSION) $(BTSTACK_ROOT)/src/libBTstack.a $(BTSTACK_ROOT)/src/BTdaemon +# libBTstack.a +all: libBTstack.$(BTSTACK_LIB_EXTENSION) BTdaemon -$(BTSTACK_ROOT)/src/libBTstack.$(BTSTACK_LIB_EXTENSION): $(libBTstack_SOURCES) +libBTstack.$(BTSTACK_LIB_EXTENSION): $(libBTstack_SOURCES) $(BTSTACK_ROOT)/tools/get_version.sh - $(CC) $(CFLAGS) $(BTSTACK_LIB_LDFLAGS) -o $@ $(libBTstack_SOURCES) $(LDFLAGS) + $(CC) $(CFLAGS) $(BTSTACK_LIB_LDFLAGS) -o $@ $^ $(LDFLAGS) -$(BTSTACK_ROOT)/src/libBTstack.a: $(libBTstack_SOURCES:.c=.o) $(libBTstack_SOURCES:.m=.o) - ar cru $@ $(libBTstack_SOURCES:.c=.o) $(libBTstack_SOURCES:.m=.o) - ranlib $@ +# libBTstack.a: $(libBTstack_SOURCES:.c=.o) $(libBTstack_SOURCES:.m=.o) +# ar cru $@ $(libBTstack_SOURCES:.c=.o) $(libBTstack_SOURCES:.m=.o) +# ranlib $@ -$(BTSTACK_ROOT)/src/BTdaemon: $(BTdaemon_SOURCES) - $(CC) $(CFLAGS) -DHAVE_HCI_DUMP -o $@ $(BTdaemon_SOURCES) $(LDFLAGS) $(LIBUSB_CFLAGS) $(LIBUSB_LDFLAGS) +BTdaemon: $(BTdaemon_SOURCES) + $(CC) $(CFLAGS) -DHAVE_HCI_DUMP -o $@ $^ $(LDFLAGS) $(LIBUSB_CFLAGS) $(LIBUSB_LDFLAGS) clean: - rm -rf $(BTSTACK_ROOT)/src/libBTstack* $(BTSTACK_ROOT)/src/BTdaemon *.o + rm -rf libBTstack* BTdaemon *.o install: - echo "installing BTdaemon in $(prefix)..." + echo "Installing BTdaemon in $(prefix)..." mkdir -p $(prefix)/bin $(prefix)/lib $(prefix)/include - cp $(BTSTACK_ROOT)/src/libBTstack.a libBTstack.dylib $(prefix)/lib/ - cp $(BTSTACK_ROOT)/src/BTdaemon $(prefix)/bin/ + # cp libBTstack.a $(prefix)/lib/ + cp libBTstack.dylib $(prefix)/lib/ + cp BTdaemon $(prefix)/bin/ cp -r $(BTSTACK_ROOT)/include/btstack $(prefix)/include