mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-16 08:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

seperate LIBUSB flags, only use to compile BTdaemon

Browse Source
This commit is contained in:
mila@ringwald.ch 2014-09-18 21:01:07 +00:00
parent 51774baa91
commit f0e135986e
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -50,8 +50,7 @@ if test "x$HCI_TRANSPORT" = xUSB; then
if test "$HAVE_LIBUSB" == "no" ; then if test "$HAVE_LIBUSB" == "no" ; then
AC_MSG_ERROR(USB Transport requested but libusb-1.0 not found using pkg-config. Please set PKG_CONFIG_PATH correctly and/or install libusb-1.0 from your distribution or from http://libusb.sourceforge.net/api-1.0/) AC_MSG_ERROR(USB Transport requested but libusb-1.0 not found using pkg-config. Please set PKG_CONFIG_PATH correctly and/or install libusb-1.0 from your distribution or from http://libusb.sourceforge.net/api-1.0/)
fi fi
CFLAGS="$CFLAGS $LIBUSB_CFLAGS" LIBUSB_LDFLAGS=$LIBUSB_LIBS
LDFLAGS="$LDFLAGS $LIBUSB_LIBS"
fi fi
AM_CONDITIONAL(HAVE_LIBUSB, [test "x$HAVE_LIBUSB" == "xyes"]) AM_CONDITIONAL(HAVE_LIBUSB, [test "x$HAVE_LIBUSB" == "xyes"])
@ -100,7 +99,7 @@ if test "x$HCI_TRANSPORT" = xUSB; then
echo "USB_PRODUCT_ID: $USB_PRODUCT_ID" echo "USB_PRODUCT_ID: $USB_PRODUCT_ID"
echo "USB_VENDOR_ID: $USB_VENDOR_ID" echo "USB_VENDOR_ID: $USB_VENDOR_ID"
echo "LIBUSB_CFLAGS: $LIBUSB_CFLAGS" echo "LIBUSB_CFLAGS: $LIBUSB_CFLAGS"
echo "LIBUSB_LIBS: $LIBUSB_LIBS" echo "LIBUSB_LDFLAGS: $LIBUSB_LDFLAGS"
else else
echo "UART_DEVICE: $UART_DEVICE" echo "UART_DEVICE: $UART_DEVICE"
echo "UART_SPEED: $UART_SPEED" echo "UART_SPEED: $UART_SPEED"
@ -160,7 +159,9 @@ AC_SUBST(REMOTE_DEVICE_DB_SOURCES)
AC_SUBST(USB_SOURCES) AC_SUBST(USB_SOURCES)
AC_SUBST(RUN_LOOP_SOURCES) AC_SUBST(RUN_LOOP_SOURCES)
AC_SUBST(CFLAGS) AC_SUBST(CFLAGS)
AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS)
AC_SUBST(BTSTACK_LIB_LDFLAGS) AC_SUBST(BTSTACK_LIB_LDFLAGS)
AC_SUBST(BTSTACK_LIB_EXTENSION) AC_SUBST(BTSTACK_LIB_EXTENSION)
AC_SUBST(LIBUSB_CFLAGS)
AC_SUBST(LIBUSB_LDFLAGS)
AC_OUTPUT(Makefile platforms/posix/src/Makefile example/Makefile) AC_OUTPUT(Makefile platforms/posix/src/Makefile example/Makefile)

4
platforms/posix/src/Makefile.in
View File

@ -7,6 +7,8 @@ LDFLAGS = @LDFLAGS@
CFLAGS = @CFLAGS@ -I $(BTSTACK_ROOT)/include -I $(BTSTACK_ROOT)/ble -I $(BTSTACK_ROOT)/src -I $(BTSTACK_ROOT) CFLAGS = @CFLAGS@ -I $(BTSTACK_ROOT)/include -I $(BTSTACK_ROOT)/ble -I $(BTSTACK_ROOT)/src -I $(BTSTACK_ROOT)
BTSTACK_LIB_LDFLAGS = @BTSTACK_LIB_LDFLAGS@ BTSTACK_LIB_LDFLAGS = @BTSTACK_LIB_LDFLAGS@
BTSTACK_LIB_EXTENSION = @BTSTACK_LIB_EXTENSION@ BTSTACK_LIB_EXTENSION = @BTSTACK_LIB_EXTENSION@
LIBUSB_CFLAGS = @LIBUSB_CFLAGS@
LIBUSB_LDFLAGS = @LIBUSB_LDFLAGS@
remote_device_db_sources = @REMOTE_DEVICE_DB_SOURCES@ remote_device_db_sources = @REMOTE_DEVICE_DB_SOURCES@
run_loop_sources = @RUN_LOOP_SOURCES@ run_loop_sources = @RUN_LOOP_SOURCES@
@ -62,7 +64,7 @@ $(BTSTACK_ROOT)/src/libBTstack.a: $(libBTstack_SOURCES:.c=.o) $(libBTstack_SOURC
ranlib $@ ranlib $@
$(BTSTACK_ROOT)/src/BTdaemon: $(BTdaemon_SOURCES) $(BTSTACK_ROOT)/src/BTdaemon: $(BTdaemon_SOURCES)
$(CC) $(CFLAGS) -DHAVE_HCI_DUMP -o $@ $(BTdaemon_SOURCES) $(LDFLAGS) $(CC) $(CFLAGS) -DHAVE_HCI_DUMP -o $@ $(BTdaemon_SOURCES) $(LDFLAGS) $(LIBUSB_CFLAGS) $(LIBUSB_LDFLAGS)
clean: clean:
rm -rf $(BTSTACK_ROOT)/src/libBTstack* $(BTSTACK_ROOT)/src/BTdaemon *.o rm -rf $(BTSTACK_ROOT)/src/libBTstack* $(BTSTACK_ROOT)/src/BTdaemon *.o