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.29            1.30=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Patch from Fabrizio Gennari <fab...@ph...>:
* Build the module correctly when building it as part of the kernel.
* Added possibility to specify 'make INCLUDE_PAN=3D1' to enable
  PAN support when building the module stand-alone.


The diff of the modified file(s):

--- Makefile	2002/01/24 16:09:25	1.29
+++ Makefile	2002/02/04 11:53:45	1.30
@@ -6,17 +6,17 @@
             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
+
+POBJS     =3D bnep.o bnep_status_proc.o
+
 TOBJS     =3D unplug_test.o
=20
 ifdef CONFIG_BLUETOOTH_PAN
 TOBJS    +=3D bnep_test.o
 endif
=20
-BOBJS     =3D bcsp.o bcsp_datagram.o bcsp_integrity.o bcsp_mux.o \
-            bcsp_sequence.o bcsp_slip.o
-
-POBJS     =3D bnep.o bnep_status_proc.o
-
 ifeq ($(TOPDIR)/Rules.make,$(wildcard $(TOPDIR)/Rules.make))
=20
 #---------------------------------------------------------------------
@@ -27,22 +27,24 @@
 O_TARGET :=3D bt.o
=20
 # For 2.4.x
-obj-$(CONFIG_BLUETOOTH)              +=3D $(OBJS)
-obj-$(CONFIG_BLUETOOTH_UNPLUG_TEST)  +=3D $(TOBJS)
+obj-y                                +=3D $(OBJS)
 obj-$(CONFIG_BLUETOOTH_SUPPORT_BCSP) +=3D $(BOBJS)
 obj-$(CONFIG_BLUETOOTH_PAN)          +=3D $(POBJS)
+obj-$(CONFIG_BLUETOOTH_UNPLUG_TEST)  +=3D $(TOBJS)
+
+obj-m    :=3D $(O_TARGET)
=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
 ifdef CONFIG_BLUETOOTH_PAN
 O_OBJS   +=3D $(POBJS)
 endif
+ifdef CONFIG_BLUETOOTH_UNPLUG_TEST
+O_OBJS   +=3D $(TOBJS)
+endif
 M_OBJS    =3D $(O_TARGET)
=20
 include $(TOPDIR)/Rules.make
@@ -56,6 +58,9 @@
 # Use 'make INCLUDE_BCSP_SUPPORT=3D1' to enable support for BCSP.
 INCLUDE_BCSP_SUPPORT =3D 0
=20
+# Use 'make INCLUDE_PAN=3D1' to enable the PAN profile.
+INCLUDE_PAN =3D 0
+
 # Use 'make INCLUDE_UNPLUG_TEST=3D1' to enable the unplug testcases.
 INCLUDE_UNPLUG_TEST =3D 0
=20
@@ -72,14 +77,19 @@
 MODFLAGS  =3D -DMODVERSIONS -include $(INCLUDEDIR)/linux/modversions.h
 CFLAGS    =3D -D__KERNEL__ -DMODULE -I../../../include -I$(INCLUDEDIR) -Wa=
ll -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strength-reduce $(MODF=
LAGS) -MD
=20
-ifeq ($(INCLUDE_UNPLUG_TEST),1)
-OBJS     +=3D $(TOBJS)
-CFLAGS   +=3D -DCONFIG_BLUETOOTH_UNPLUG_TEST
-endif
-
 ifeq ($(INCLUDE_BCSP_SUPPORT),1)
 OBJS     +=3D $(BOBJS)
 CFLAGS   +=3D -DCONFIG_BLUETOOTH_SUPPORT_BCSP
+endif
+
+ifeq ($(INCLUDE_PAN),1)
+OBJS     +=3D $(POBJS)
+CFLAGS   +=3D -DCONFIG_BLUETOOTH_PAN
+endif
+
+ifeq ($(INCLUDE_UNPLUG_TEST),1)
+OBJS     +=3D $(TOBJS)
+CFLAGS   +=3D -DCONFIG_BLUETOOTH_UNPLUG_TEST
 endif
=20
 all:	$(O_TARGET)