use CFLAGS for LIBUSB include flags

This commit is contained in:
mila@ringwald.ch 2014-09-18 20:54:40 +00:00
parent 6fd91241ca
commit 51774baa91
3 changed files with 16 additions and 16 deletions

View File

@ -86,14 +86,14 @@ esac
# treat warnings seriously
CPPFLAGS="$CPPFLAGS -Werror -Wall -Wpointer-arith"
CFLAGS="$CFLAGS -Werror -Wall -Wpointer-arith"
AM_CONDITIONAL(USE_POWERMANAGEMENT, [test "x$USE_POWERMANAGEMENT" == "xyes"])
# summary
echo "CC: $CC"
echo "CPPFLAGS: $CPPFLAGS"
echo "CFLAGS: $CFLAGS"
echo "LDFLAGS: $LDFLAGS"
if test "x$HCI_TRANSPORT" = xUSB; then
@ -160,7 +160,7 @@ AC_SUBST(REMOTE_DEVICE_DB_SOURCES)
AC_SUBST(USB_SOURCES)
AC_SUBST(RUN_LOOP_SOURCES)
AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(CFLAGS)
AC_SUBST(BTSTACK_LIB_LDFLAGS)
AC_SUBST(BTSTACK_LIB_EXTENSION)
AC_OUTPUT(Makefile platforms/posix/src/Makefile example/Makefile)

View File

@ -1,30 +1,30 @@
CC = @CC@
LDFLAGS = @LDFLAGS@ -lBTstack -L../src
CPPFLAGS = @CPPFLAGS@ -I.. -I../include
CFLAGS = @CFLAGS@ -I.. -I../include
prefix = @prefix@
all: test rfcomm-cat rfcomm-echo rfcomm-test inquiry l2cap-server l2cap-throughput
test: test.c
$(CC) $(CPPFLAGS) -o $@ $< $(LDFLAGS)
$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
l2cap-server: l2cap-server.c
$(CC) $(CPPFLAGS) -o $@ $< $(LDFLAGS)
$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
l2cap-throughput: l2cap-throughput.c
$(CC) $(CPPFLAGS) -o $@ $< $(LDFLAGS)
$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
inquiry: inquiry.c
$(CC) $(CPPFLAGS) -o $@ $< $(LDFLAGS)
$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
rfcomm-cat: rfcomm-cat.c
$(CC) $(CPPFLAGS) -o $@ $< $(LDFLAGS)
$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
rfcomm-echo: rfcomm-echo.c
$(CC) $(CPPFLAGS) -o $@ $< $(LDFLAGS)
$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
rfcomm-test: rfcomm-test.c
$(CC) $(CPPFLAGS) -o $@ $< $(LDFLAGS)
$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
clean:
rm -f test mitm rfcomm-cat rfcomm-echo inquiry l2cap-server l2cap-throughput obex

View File

@ -3,8 +3,8 @@ BTSTACK_ROOT = ../../..
prefix = @prefix@
CC = @CC@
LDFLAGS = @LDFLAGS@
CPPFLAGS = @CPPFLAGS@ -I $(BTSTACK_ROOT)/include -I $(BTSTACK_ROOT)/ble -I $(BTSTACK_ROOT)/src -I $(BTSTACK_ROOT)
LDFLAGS = @LDFLAGS@
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_EXTENSION = @BTSTACK_LIB_EXTENSION@
@ -49,20 +49,20 @@ BTdaemon_SOURCES = \
# use $(CC) for Objective-C files
.m.o:
$(CC) $(CPPFLAGS) -c -o $@ $<
$(CC) $(CFLAGS) -c -o $@ $<
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)/tools/get_version.sh
$(CC) $(CPPFLAGS) $(BTSTACK_LIB_LDFLAGS) -o $@ $(libBTstack_SOURCES) $(LDFLAGS)
$(CC) $(CFLAGS) $(BTSTACK_LIB_LDFLAGS) -o $@ $(libBTstack_SOURCES) $(LDFLAGS)
$(BTSTACK_ROOT)/src/libBTstack.a: $(libBTstack_SOURCES:.c=.o) $(libBTstack_SOURCES:.m=.o)
ar cru $@ $(libBTstack_SOURCES:.c=.o) $(libBTstack_SOURCES:.m=.o)
ranlib $@
$(BTSTACK_ROOT)/src/BTdaemon: $(BTdaemon_SOURCES)
$(CC) $(CPPFLAGS) -DHAVE_HCI_DUMP -o $@ $(BTdaemon_SOURCES) $(LDFLAGS)
$(CC) $(CFLAGS) -DHAVE_HCI_DUMP -o $@ $(BTdaemon_SOURCES) $(LDFLAGS)
clean:
rm -rf $(BTSTACK_ROOT)/src/libBTstack* $(BTSTACK_ROOT)/src/BTdaemon *.o