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.14            1.15=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Should work with both 2.0.x and 2.2.x as well as 2.4.x kernel
builds now.


The diff of the modified file(s):

--- Makefile	2001/03/02 21:10:41	1.14
+++ Makefile	2001/03/03 15:34:47	1.15
@@ -2,14 +2,30 @@
 # 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=20
=20
 ifeq ($(TOPDIR)/Rules.make,$(wildcard $(TOPDIR)/Rules.make))
=20
 #---------------------------------------------------------------------
-# Kernel makefile rules (2.4.x)
+# Kernel makefile rules. They should work with both old style makefiles
+# for 2.0.x and 2.2.x, and with the new style makefiles from 2.4.x
 #---------------------------------------------------------------------
+
 O_TARGET :=3D bt.o
-obj-$(CONFIG_BLUETOOTH) +=3D $(patsubst %.c, %.o, $(wildcard *.c))
+
+# For 2.4.x
+obj-$(CONFIG_BLUETOOTH) +=3D $(OBJS)
+
+# For 2.0.x and 2.2.x
+O_OBJS    =3D $(OBJS)
+M_OBJS    =3D $(O_TARGET)
+
 include $(TOPDIR)/Rules.make
=20
 else
@@ -18,17 +34,19 @@
 # Standalone makefile rules
 #---------------------------------------------------------------------
=20
+# 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.
+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
-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
 all:	$(O_TARGET)
=20
-$(O_TARGET):	$(O_OBJS)
+$(O_TARGET):	$(OBJS)
 	$(LD) -r -o $@ $^
=20
 install:	all