CVS: 2 files have been modified in linux/drivers/char/bluetooth.

[Gordon M. <gm...@us...>]

The following files were modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
Config.in                       1.1             Added
Makefile        1.13            1.14=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

--Tweaked the Makefile so that I can drop this directory into a 2.4 kernel =
source tree. Tested standalone to make sure I didn't break that.
--Added an initial Config.in for kernel configuration.


The diff of the modified file(s):

--- Makefile	2001/03/02 10:50:44	1.13
+++ Makefile	2001/03/02 21:10:41	1.14
@@ -2,18 +2,27 @@
 # Makefile for the Bluetooth device driver.
 #
=20
-INCLUDEDIR =3D /usr/include
-
-O_TARGET :=3D bt.o
-O_OBJS   =3D  bluetooth.o btdebug.o btmem.o hci.o l2cap.o rfcomm.o sdp.o t=
cs.o bt_proc.o hci_vendor.o l2cap_con.o sec_client.o l2cap_sec.o rfcomm_sec=
.o
-M_OBJS   =3D $(O_TARGET)
=20
 ifeq ($(TOPDIR)/Rules.make,$(wildcard $(TOPDIR)/Rules.make))
=20
+#---------------------------------------------------------------------
+# Kernel makefile rules (2.4.x)
+#---------------------------------------------------------------------
+O_TARGET :=3D bt.o
+obj-$(CONFIG_BLUETOOTH) +=3D $(patsubst %.c, %.o, $(wildcard *.c))
 include $(TOPDIR)/Rules.make
=20
 else
=20
+#---------------------------------------------------------------------
+# Standalone makefile rules
+#---------------------------------------------------------------------
+
+O_TARGET :=3D bt.o
+O_OBJS   =3D  bluetooth.o btdebug.o btmem.o hci.o l2cap.o rfcomm.o sdp.o t=
cs.o bt_proc.o hci_vendor.o l2cap_con.o sec_client.o l2cap_sec.o rfcomm_sec=
.o
+M_OBJS   =3D $(O_TARGET)
+
+INCLUDEDIR =3D /usr/include
 MODFLAGS =3D -DMODVERSIONS -include $(INCLUDEDIR)/linux/modversions.h
 CFLAGS   =3D -D__KERNEL__ -DMODULE -I../../../include -I$(INCLUDEDIR) -Wal=
l -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strength-reduce $(MODFL=
AGS)
=20