moved daemon sources into platforms/daemon/src

This commit is contained in:
Matthias Ringwald 2015-05-02 23:36:05 +02:00
parent da4528422a
commit b65d0a6321
7 changed files with 8 additions and 8 deletions

View File

@ -1,5 +1,5 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = platforms/daemon example/daemon
SUBDIRS = platforms/daemon/src example/daemon
package:
./package.sh

View File

@ -60,7 +60,7 @@ echo "BTstack configured for HCI $HCI_TRANSPORT Transport"
HAVE_SO_NOSIGPIPE="no"
# from platform/daemon
BTSTACK_ROOT="../../"
BTSTACK_ROOT="../../.."
RUN_LOOP_SOURCES="$BTSTACK_ROOT/platforms/posix/src/run_loop_posix.c"
case "$host_os" in
@ -183,4 +183,4 @@ AC_SUBST(BTSTACK_LIB_LDFLAGS)
AC_SUBST(BTSTACK_LIB_EXTENSION)
AC_SUBST(LIBUSB_CFLAGS)
AC_SUBST(LIBUSB_LDFLAGS)
AC_OUTPUT(Makefile platforms/daemon/Makefile example/daemon/Makefile)
AC_OUTPUT(Makefile platforms/daemon/src/Makefile example/daemon/Makefile)

View File

@ -1,10 +1,10 @@
BTSTACK_ROOT = ../..
BTSTACK_ROOT = ../../..
prefix = @prefix@
CC = @CC@
LDFLAGS = @LDFLAGS@
CFLAGS = @CFLAGS@ -I $(BTSTACK_ROOT)/include -I$(BTSTACK_ROOT)/platforms/daemon -I $(BTSTACK_ROOT)/ble -I $(BTSTACK_ROOT)/src -I $(BTSTACK_ROOT)
CFLAGS = @CFLAGS@ -I $(BTSTACK_ROOT)/include -I$(BTSTACK_ROOT)/platforms/src/daemon -I $(BTSTACK_ROOT)/ble -I $(BTSTACK_ROOT)/src -I $(BTSTACK_ROOT)
BTSTACK_LIB_LDFLAGS = @BTSTACK_LIB_LDFLAGS@
BTSTACK_LIB_EXTENSION = @BTSTACK_LIB_EXTENSION@
LIBUSB_CFLAGS = @LIBUSB_CFLAGS@
@ -15,8 +15,8 @@ run_loop_sources = @RUN_LOOP_SOURCES@
usb_sources = @USB_SOURCES@
libBTstack_SOURCES = \
$(BTSTACK_ROOT)/platforms/daemon/btstack.c \
$(BTSTACK_ROOT)/platforms/daemon/socket_connection.c \
$(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 \
@ -25,7 +25,7 @@ libBTstack_SOURCES = \
$(run_loop_sources) \
BTdaemon_SOURCES = \
$(BTSTACK_ROOT)/platforms/daemon/daemon.c \
$(BTSTACK_ROOT)/platforms/daemon/src/daemon.c \
$(BTSTACK_ROOT)/platforms/posix/src/hci_transport_h4.c \
$(libBTstack_SOURCES) \
$(BTSTACK_ROOT)/src/btstack_memory.c \