moved general scripts into tools

config-iphone.sh

@@ -2,7 +2,7 @@
 echo "Configure BTstack for use with iOS using the theos build system"
 
 # get version from svn
-cd src; ./get_version.sh; cd ..
+tools/get_version.sh
 
 # check if $THEOS is set
 

example/libusb/Makefile

@@ -80,7 +80,7 @@ all: ../../include/btstack/version.h gatt_browser sdp_rfcomm_query sdp_general_q
 		sdp_bnep_query \
 
 ../../include/btstack/version.h:
-	cd ..; ../src/get_version.sh
+	../tools/get_version.sh
 
 sdp_rfcomm_query: ${CORE_OBJ} ${COMMON_OBJ} sdp_rfcomm_query.c
 	${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@

platforms/ios/src/Makefile.iphone

@@ -6,28 +6,29 @@ TARGET_IPHONEOS_DEPLOYMENT_VERSION = 3.0
 TARGET_IPHONEOS_DEPLOYMENT_VERSION_arm64 = 7.0
 ARCHS = armv6 arm64
 
+BTSTACK_ROOT=..
+POSIX_ROOT=$(BTSTACK_ROOT)/platforms/posix
+
 LIBRARY_NAME = libBTstack
-libBTstack_FILES  = btstack.c hci_cmds.c linked_list.c
+libBTstack_FILES = \
-libBTstack_FILES += run_loop.c \
+	hci_cmds.c \
-	../platforms/cocoa/run_loop_cocoa.m \
+	linked_list.c \
-	run_loop_posix.c \
+	run_loop.c \
 	sdp_util.c \
-	socket_connection.c \
+	utils.c \
-	utils.c
+	$(BTSTACK_ROOT)/platforms/cocoa/run_loop_cocoa.m \
+	$(POSIX_ROOT)/src/btstack.c \
+	$(POSIX_ROOT)/src/run_loop_posix.c \
+	$(POSIX_ROOT)/src/socket_connection.c \
+
 libBTstack_CFLAGS = -I../include -I../ble -I../src -I..
 
 TOOL_NAME = BTdaemon
-BTdaemon_FILES = $(libBTstack_FILES)  \
+BTdaemon_FILES = \
-	../platforms/ios/src/bt_control_iphone.m     \
+	$(libBTstack_FILES)  	\
-	../platforms/ios/src/hci_transport_h4_iphone.c   \
-	../platforms/ios/src/platform_iphone.m       \
-	../platforms/ios/SpringBoardAccess/SpringBoardAccess.c \
-	../platforms/cocoa/remote_device_db_cocoa.m  \
 	btstack_memory.c        \
-	daemon.c                \
 	hci.c                   \
 	hci_dump.c              \
-	hci_transport_h4.c      \
 	l2cap.c                 \
 	l2cap_signaling.c       \
 	memory_pool.c           \
@@ -37,6 +38,13 @@ BTdaemon_FILES = $(libBTstack_FILES)  \
     sdp_parser.c            \
     sdp_query_rfcomm.c      \
     sdp_query_util.c        \
+	$(POSIX_ROOT)/src/daemon.c  \
+	$(POSIX_ROOT)/src/hci_transport_h4.c 		 	\
+	../platforms/ios/src/bt_control_iphone.m     	\
+	../platforms/ios/src/hci_transport_h4_iphone.c  \
+	../platforms/ios/src/platform_iphone.m       	\
+	../platforms/ios/SpringBoardAccess/SpringBoardAccess.c \
+	../platforms/cocoa/remote_device_db_cocoa.m  	\
 
 BTdaemon_CFLAGS = -I../include -I../ble -I../src -I..
 BTdaemon_LDFLAGS += $(SYSROOT)/System/Library/Frameworks/IOKit.framework/Versions/A/IOKit

platforms/posix/src/Makefile.in

@@ -52,7 +52,7 @@ BTdaemon_SOURCES =                          \
 all: $(BTSTACK_ROOT)/src/libBTstack.$(BTSTACK_LIB_EXTENSION) $(BTSTACK_ROOT)/src/libBTstack.a $(BTSTACK_ROOT)/src/BTdaemon
 
 $(BTSTACK_ROOT)/src/libBTstack.$(BTSTACK_LIB_EXTENSION): $(libBTstack_SOURCES)
-		$(BTSTACK_ROOT)/src/get_version.sh
+		$(BTSTACK_ROOT)/tools/get_version.sh
 		$(CC) $(CPPFLAGS) $(BTSTACK_LIB_LDFLAGS) -o $@ $(libBTstack_SOURCES) $(LDFLAGS)
 
 $(BTSTACK_ROOT)/src/libBTstack.a: $(libBTstack_SOURCES:.c=.o) $(libBTstack_SOURCES:.m=.o)