From eedbedf604c8e5caa232f6f0c323cb4825160db0 Mon Sep 17 00:00:00 2001 From: "matthias.ringwald" Date: Tue, 15 Sep 2009 21:11:28 +0000 Subject: [PATCH] create dummy SpringBoardAccess MobileSubstrate extension when configured for iPhone --- Makefile.am | 6 +++++- aclocal.m4 | 35 ++++++++++++------------------- configure.in | 4 ++-- install-sh | 1 - project.xcodeproj/project.pbxproj | 10 +++++++++ 5 files changed, 30 insertions(+), 26 deletions(-) delete mode 120000 install-sh diff --git a/Makefile.am b/Makefile.am index ddca7505c..26bee13d6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,9 @@ +if USE_SPRINGBOARD + springboardaccess = SpringBoardAccess +endif + AUTOMAKE_OPTIONS = foreign -SUBDIRS = src example +SUBDIRS = src example $(springboardaccess) iphone_ip=@IPHONE_IP@ install-iphone: src/BTdaemon diff --git a/aclocal.m4 b/aclocal.m4 index 6cccc51f2..1306e82d9 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.10.2 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -13,7 +13,7 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, +m4_if(AC_AUTOCONF_VERSION, [2.63],, [m4_warning([this file was generated for autoconf 2.63. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. @@ -175,7 +175,7 @@ else fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -190,7 +190,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10.2], [], +m4_if([$1], [1.10.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -204,12 +204,12 @@ m4_define([_AM_AUTOCONF_VERSION], []) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10.2])dnl +[AM_AUTOMAKE_VERSION([1.10.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -459,28 +459,19 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 4 +#serial 3 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[# Autoconf 2.62 quotes --file arguments for eval, but not when files -# are listed without --file. Let's play safe and only enable the eval -# if we detect the quoting. -case $CONFIG_FILES in -*\'*) eval set x "$CONFIG_FILES" ;; -*) set x $CONFIG_FILES ;; -esac -shift -for mf -do +[for mf in $CONFIG_FILES; do # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. @@ -812,13 +803,13 @@ esac # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 3 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -835,7 +826,7 @@ AC_DEFUN([_AM_SET_OPTION], # ---------------------------------- # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) # ------------------------------------------- diff --git a/configure.in b/configure.in index 11d5f3fa4..229ac30a8 100644 --- a/configure.in +++ b/configure.in @@ -59,7 +59,6 @@ fi AM_CONDITIONAL(HAVE_LIBUSB, [test "x$HAVE_LIBUSB" == "xyes"]) - echo echo "BTstack configured for HCI $HCI_TRANSPORT Transport" @@ -107,6 +106,7 @@ else UART_DEVICE=/dev/ttyS0 fi fi +AM_CONDITIONAL(USE_SPRINGBOARD, [test "x$USE_SPRINGBOARD" == "xyes"]) # summary if test "x$HCI_TRANSPORT" = xUSB; then @@ -143,4 +143,4 @@ fi AC_SUBST(IPHONE_IP) AC_SUBST(HAVE_LIBUSB) -AC_OUTPUT(Makefile src/Makefile example/Makefile) +AC_OUTPUT(Makefile src/Makefile example/Makefile SpringBoardAccess/Makefile) diff --git a/install-sh b/install-sh deleted file mode 120000 index bfb5dd759..000000000 --- a/install-sh +++ /dev/null @@ -1 +0,0 @@ -/sw/share/automake-1.10/install-sh \ No newline at end of file diff --git a/project.xcodeproj/project.pbxproj b/project.xcodeproj/project.pbxproj index bc696bd7f..a3bc8ec0e 100644 --- a/project.xcodeproj/project.pbxproj +++ b/project.xcodeproj/project.pbxproj @@ -65,6 +65,7 @@ 9C46FC380FA906F700ABEF05 /* hci_transport.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = hci_transport.h; path = src/hci_transport.h; sourceTree = ""; }; 9C6459DE1037554B0081A00B /* platform_iphone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = platform_iphone.h; path = src/platform_iphone.h; sourceTree = ""; }; 9C6459DF1037554B0081A00B /* platform_iphone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = platform_iphone.m; path = src/platform_iphone.m; sourceTree = ""; }; + 9C77E2761060327200F39DCF /* SpringBoardAccess.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SpringBoardAccess.m; path = SpringBoardAccess/SpringBoardAccess.m; sourceTree = ""; }; 9C78A04A103C6734003B2950 /* Default_BTstack.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default_BTstack.png; path = resources/Default_BTstack.png; sourceTree = ""; }; 9C78A04B103C6734003B2950 /* Default_BTstackActive.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default_BTstackActive.png; path = resources/Default_BTstackActive.png; sourceTree = ""; }; 9C78A04C103C6734003B2950 /* FSO_BTstack.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FSO_BTstack.png; path = resources/FSO_BTstack.png; sourceTree = ""; }; @@ -113,6 +114,7 @@ 9C78A049103C671D003B2950 /* Resources */, 9C7B5B81100D04520065D87E /* Example */, 08FB7795FE84155DC02AAC07 /* Source */, + 9C77E2751060322300F39DCF /* SpringBoardAccess */, C6A0FF2B0290797F04C91782 /* Documentation */, 1AB674ADFE9D54B511CA2CBB /* Products */, 9CC152C61009052100223347 /* config.h */, @@ -169,6 +171,14 @@ name = Products; sourceTree = ""; }; + 9C77E2751060322300F39DCF /* SpringBoardAccess */ = { + isa = PBXGroup; + children = ( + 9C77E2761060327200F39DCF /* SpringBoardAccess.m */, + ); + name = SpringBoardAccess; + sourceTree = ""; + }; 9C78A049103C671D003B2950 /* Resources */ = { isa = PBXGroup; children = (