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.24            1.25=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

* Added INCLUDE_BCSP_SUPPORT to be used if BCSP support is wanted.
* Build correctly with INCLUDE_UNPLUG_TEST defined when building
  for linux 2.4.x


The diff of the modified file(s):

--- Makefile	2001/07/31 09:04:13	1.24
+++ Makefile	2001/07/31 18:59:23	1.25
@@ -6,13 +6,11 @@
             l2cap.o l2cap_con.o l2cap_sec.o rfcomm.o rfcomm_sec.o \
             sec_client.o sdp.o tcs.o test.o
=20
+TOBJS     =3D unplug_test.o
+
 BOBJS     =3D bcsp.o bcsp_datagram.o bcsp_integrity.o bcsp_mux.o \
             bcsp_sequence.o bcsp_slip.o
=20
-# Uncomment this line to enable the unplugged testcases. If you
-# don't know what this is just leave it commented.
-INCLUDE_UNPLUG_TEST =3D 1
-
 ifeq ($(TOPDIR)/Rules.make,$(wildcard $(TOPDIR)/Rules.make))
=20
 #---------------------------------------------------------------------
@@ -24,19 +22,19 @@
=20
 # For 2.4.x
 obj-$(CONFIG_BLUETOOTH)              +=3D $(OBJS)
+obj-$(CONFIG_BLUETOOTH_UNPLUG_TEST)  +=3D $(TOBJS)
 obj-$(CONFIG_BLUETOOTH_SUPPORT_BCSP) +=3D $(BOBJS)
=20
 # For 2.0.x and 2.2.x
 O_OBJS    =3D $(OBJS)
+ifdef CONFIG_BLUETOOTH_UNPLUG_TEST
+O_OBJS   +=3D $(TOBJS)
+endif
 ifdef CONFIG_BLUETOOTH_SUPPORT_BCSP
 O_OBJS   +=3D $(BOBJS)
 endif
 M_OBJS    =3D $(O_TARGET)
=20
-ifdef INCLUDE_UNPLUG_TEST
-O_OBJS   +=3D unplug_test.o
-endif
-
 include $(TOPDIR)/Rules.make
=20
 else
@@ -45,6 +43,14 @@
 # Standalone makefile rules
 #---------------------------------------------------------------------
=20
+# Uncomment this line to enable support for BCSP.
+# If you do not know what this is, just leave it commented.
+#INCLUDE_BCSP_SUPPORT =3D 1
+
+# Uncomment this line to enable the unplug testcases.
+# If you do not know what this is, just leave it commented.
+#INCLUDE_UNPLUG_TEST =3D 1
+
 # The INCLUDEDIR variable allows LSB compliant distros to be able to compi=
le
 # the module correctly. Use 'make INCLUDEDIR=3D/usr/src/linux/include' whe=
re
 # /usr/src/linux/include is the directory that was used to build the kerne=
l.
@@ -59,13 +65,18 @@
 CFLAGS    =3D -D__KERNEL__ -DMODULE -I../../../include -I$(INCLUDEDIR) -Wa=
ll -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strength-reduce $(MODF=
LAGS) -MD
=20
 ifdef INCLUDE_UNPLUG_TEST
-OBJS   +=3D unplug_test.o
+OBJS     +=3D $(TOBJS)
 CFLAGS +=3D -DCONFIG_BLUETOOTH_UNPLUG_TEST
 endif
=20
+ifdef INCLUDE_BCSP_SUPPORT
+OBJS     +=3D $(BOBJS)
+CFLAGS   +=3D -DCONFIG_BLUETOOTH_SUPPORT_BCSP
+endif
+
 all:	$(O_TARGET)
=20
-$(O_TARGET):	$(OBJS) $(BOBJS)
+$(O_TARGET):	$(OBJS)
 	$(LD) -r -o $@ $^
=20
 install:	all