--- zzzz-none-000/linux-2.4.17/net/bluetooth/Makefile	2001-06-12 02:15:27.000000000 +0000
+++ sangam-fb-401/linux-2.4.17/net/bluetooth/Makefile	2005-04-05 07:07:46.000000000 +0000
@@ -1,20 +1,40 @@
 #
-# Makefile for the Bluetooth subsystem
+# Makefile for the Linux Bluetooth subsystem
 #
-O_TARGET	:= bluetooth.o
 
-list-multi	:= hci.o l2cap.o
-export-objs	:= syms.o
-hci-objs	:= af_bluetooth.o hci_core.o hci_sock.o lib.o syms.o
-l2cap-objs	:= l2cap_core.o l2cap_proc.o
+O_TARGET    := bluetooth.o
 
-obj-$(CONFIG_BLUEZ) += hci.o
+list-multi  := bluez.o
+export-objs := syms.o l2cap.o
+
+bluez-objs  := af_bluetooth.o hci_core.o hci_conn.o hci_event.o hci_sock.o lib.o syms.o
+
+obj-$(CONFIG_BLUEZ) += bluez.o
 obj-$(CONFIG_BLUEZ_L2CAP) += l2cap.o
+obj-$(CONFIG_BLUEZ_SCO) += sco.o
 
-include $(TOPDIR)/Rules.make
+subdir-$(CONFIG_BLUEZ_RFCOMM) += rfcomm
+subdir-$(CONFIG_BLUEZ_BNEP) += bnep
+subdir-$(CONFIG_BLUEZ_CMTP) += cmtp
+subdir-$(CONFIG_BLUEZ_HIDP) += hidp
+
+ifeq ($(CONFIG_BLUEZ_RFCOMM),y)
+obj-y += rfcomm/rfcomm.o
+endif
 
-hci.o: $(hci-objs)
-	$(LD) -r -o $@ $(hci-objs)
+ifeq ($(CONFIG_BLUEZ_BNEP),y)
+obj-y += bnep/bnep.o
+endif
+
+ifeq ($(CONFIG_BLUEZ_CMTP),y)
+obj-y += cmtp/cmtp.o
+endif
+
+ifeq ($(CONFIG_BLUEZ_HIDP),y)
+obj-y += hidp/hidp.o
+endif
+
+include $(TOPDIR)/Rules.make
 
-l2cap.o: $(l2cap-objs)
-	$(LD) -r -o $@ $(l2cap-objs)
+bluez.o: $(bluez-objs)
+	$(LD) -r -o $@ $(bluez-objs)