From b65d0a632193fd827c0ff43d1846d56ac78f8310 Mon Sep 17 00:00:00 2001
From: Matthias Ringwald <matthias@ringwald.ch>
Date: Sat, 2 May 2015 23:36:05 +0200
Subject: [PATCH] moved daemon sources into platforms/daemon/src

---
 Makefile.am                                    |  2 +-
 configure.ac                                   |  4 ++--
 platforms/daemon/{ => src}/Makefile.in         | 10 +++++-----
 platforms/daemon/{ => src}/btstack.c           |  0
 platforms/daemon/{ => src}/daemon.c            |  0
 platforms/daemon/{ => src}/socket_connection.c |  0
 platforms/daemon/{ => src}/socket_connection.h |  0
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename platforms/daemon/{ => src}/Makefile.in (91%)
 rename platforms/daemon/{ => src}/btstack.c (100%)
 rename platforms/daemon/{ => src}/daemon.c (100%)
 rename platforms/daemon/{ => src}/socket_connection.c (100%)
 rename platforms/daemon/{ => src}/socket_connection.h (100%)

diff --git a/Makefile.am b/Makefile.am
index 21f7e8c2f..c492c66c6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = platforms/daemon example/daemon
+SUBDIRS = platforms/daemon/src example/daemon
 
 package:
 	./package.sh
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 64848eee6..631f61f8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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)
diff --git a/platforms/daemon/Makefile.in b/platforms/daemon/src/Makefile.in
similarity index 91%
rename from platforms/daemon/Makefile.in
rename to platforms/daemon/src/Makefile.in
index dcd826464..0477e823f 100644
--- a/platforms/daemon/Makefile.in
+++ b/platforms/daemon/src/Makefile.in
@@ -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    \
diff --git a/platforms/daemon/btstack.c b/platforms/daemon/src/btstack.c
similarity index 100%
rename from platforms/daemon/btstack.c
rename to platforms/daemon/src/btstack.c
diff --git a/platforms/daemon/daemon.c b/platforms/daemon/src/daemon.c
similarity index 100%
rename from platforms/daemon/daemon.c
rename to platforms/daemon/src/daemon.c
diff --git a/platforms/daemon/socket_connection.c b/platforms/daemon/src/socket_connection.c
similarity index 100%
rename from platforms/daemon/socket_connection.c
rename to platforms/daemon/src/socket_connection.c
diff --git a/platforms/daemon/socket_connection.h b/platforms/daemon/src/socket_connection.h
similarity index 100%
rename from platforms/daemon/socket_connection.h
rename to platforms/daemon/src/socket_connection.h