CVS: The file 'linux/drivers/char/bluetooth/Makefile' has been modified.

[Peter K. <pk...@us...>]

The following file was modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
Makefile        1.20            1.21=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Compile the BCSP files too when required.


The diff of the modified file(s):

--- Makefile	2001/03/30 09:47:15	1.20
+++ Makefile	2001/05/17 11:15:04	1.21
@@ -2,14 +2,13 @@
 # Makefile for the Bluetooth device driver.
 #
=20
-# This would have worked had it not been for test.c which is not to be
-# included by default
-#OBJS      =3D $(patsubst %.c, %.o, $(wildcard *.c))
-
 OBJS      =3D bluetooth.o bt_proc.o btdebug.o btmem.o hci.o hci_vendor.o \
             l2cap.o l2cap_con.o l2cap_sec.o rfcomm.o rfcomm_sec.o \
             sec_client.o sdp.o tcs.o test.o
=20
+BOBJS     =3D bcsp.o bcsp_datagram.o bcsp_integrity.o bcsp_mux.o \
+            bcsp_sequence.o bcsp_slip.o
+
 ifeq ($(TOPDIR)/Rules.make,$(wildcard $(TOPDIR)/Rules.make))
=20
 #---------------------------------------------------------------------
@@ -21,9 +20,13 @@
=20
 # For 2.4.x
 obj-$(CONFIG_BLUETOOTH) +=3D $(OBJS)
+obj-$(CONFIG_BLUETOOTH_USE_BCSP) +=3D $(BOBJS)
=20
 # For 2.0.x and 2.2.x
 O_OBJS    =3D $(OBJS)
+ifdef CONFIG_BLUETOOTH_USE_BCSP
+O_OBJS   +=3D $(BOBJS)
+endif
 M_OBJS    =3D $(O_TARGET)
=20
 include $(TOPDIR)/Rules.make
@@ -49,7 +52,7 @@
=20
 all:	$(O_TARGET)
=20
-$(O_TARGET):	$(OBJS)
+$(O_TARGET):	$(OBJS) $(BOBJS)
 	$(LD) -r -o $@ $^
=20
 install:	all