Menu
▾
▴
openbt-commit
|
From: Greg Kroah-H. <kr...@us...> - 2001-03-01 18:34:22
|
The following file was modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- Makefile 1.11 1.12=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: added INCLUDEDIR variable to allow LSB compliant distros to be able to compile the module correctly (use 'make INCLUDEDIR=3D/usr/src/linux/include= ') The diff of the modified file(s): --- Makefile 2001/02/28 19:01:25 1.11 +++ Makefile 2001/03/01 18:35:24 1.12 @@ -2,6 +2,8 @@ # 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) @@ -12,8 +14,8 @@ =20 else =20 -MODFLAGS =3D -DMODVERSIONS -include /usr/include/linux/modversions.h -CFLAGS =3D -D__KERNEL__ -DMODULE -I../../../include -Wall -Wstrict-proto= types -O2 -fomit-frame-pointer -fno-strength-reduce $(MODFLAGS) +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 |
|
From: Peter K. <pk...@us...> - 2001-03-03 15:33:26
|
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 |
|
From: Marcus A. S. <mar...@us...> - 2001-03-09 20:07:39
|
The following file was modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- Makefile 1.15 1.16=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added "-MD" and "-include *.d" to Makefiles to include dependency checking. The diff of the modified file(s): --- Makefile 2001/03/03 15:34:47 1.15 +++ Makefile 2001/03/09 20:08:57 1.16 @@ -42,7 +42,7 @@ O_TARGET :=3D bt.o =20 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) +CFLAGS =3D -D__KERNEL__ -DMODULE -I../../../include -I$(INCLUDEDIR) -Wal= l -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strength-reduce $(MODFL= AGS) -MD =20 all: $(O_TARGET) =20 @@ -54,4 +54,6 @@ clean: rm -f *.o core =20 +-include *.d endif + |
|
From: Peter K. <pk...@us...> - 2001-03-10 12:58:24
|
The following file was modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- Makefile 1.16 1.17=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Remove .d-files when doing make clean. The diff of the modified file(s): --- Makefile 2001/03/09 20:08:57 1.16 +++ Makefile 2001/03/10 13:00:15 1.17 @@ -52,7 +52,7 @@ install: all =20 clean: - rm -f *.o core + rm -f *.o *.d core *~ =20 -include *.d endif |
|
From: Peter K. <pk...@us...> - 2001-03-12 16:21:23
|
The following file was modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- Makefile 1.18 1.19=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Only set CC and LD if this a stand-alone compilation. The diff of the modified file(s): --- Makefile 2001/03/12 15:54:35 1.18 +++ Makefile 2001/03/12 16:23:20 1.19 @@ -2,9 +2,6 @@ # Makefile for the Bluetooth device driver. # =20 -CC=3D$(CROSSCOMPILE)gcc -LD=3D$(CROSSCOMPILE)ld - # 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)) @@ -42,6 +39,9 @@ # /usr/src/linux/include is the directory that was used to build the kerne= l. INCLUDEDIR =3D /usr/include =20 +CC =3D $(CROSSCOMPILE)gcc +LD =3D $(CROSSCOMPILE)ld + O_TARGET :=3D bt.o =20 MODFLAGS =3D -DMODVERSIONS -include $(INCLUDEDIR)/linux/modversions.h |
|
From: Mattias A. <mat...@us...> - 2001-03-30 09:47:17
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
Makefile 1.19 1.20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* added test.o (for unplug tests)
The diff of the modified file(s):
--- Makefile 2001/03/12 16:23:20 1.19
+++ Makefile 2001/03/30 09:47:15 1.20
@@ -8,7 +8,7 @@
=20
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
+ sec_client.o sdp.o tcs.o test.o
=20
ifeq ($(TOPDIR)/Rules.make,$(wildcard $(TOPDIR)/Rules.make))
=20
|
|
From: Peter K. <pk...@us...> - 2001-05-17 11:15:04
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
Makefile 1.20 1.21=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Compile the BCSP files too when required.
The diff of the modified file(s):
--- Makefile 2001/03/30 09:47:15 1.20
+++ Makefile 2001/05/17 11:15:04 1.21
@@ -2,14 +2,13 @@
# 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 test.o
=20
+BOBJS =3D bcsp.o bcsp_datagram.o bcsp_integrity.o bcsp_mux.o \
+ bcsp_sequence.o bcsp_slip.o
+
ifeq ($(TOPDIR)/Rules.make,$(wildcard $(TOPDIR)/Rules.make))
=20
#---------------------------------------------------------------------
@@ -21,9 +20,13 @@
=20
# For 2.4.x
obj-$(CONFIG_BLUETOOTH) +=3D $(OBJS)
+obj-$(CONFIG_BLUETOOTH_USE_BCSP) +=3D $(BOBJS)
=20
# For 2.0.x and 2.2.x
O_OBJS =3D $(OBJS)
+ifdef CONFIG_BLUETOOTH_USE_BCSP
+O_OBJS +=3D $(BOBJS)
+endif
M_OBJS =3D $(O_TARGET)
=20
include $(TOPDIR)/Rules.make
@@ -49,7 +52,7 @@
=20
all: $(O_TARGET)
=20
-$(O_TARGET): $(OBJS)
+$(O_TARGET): $(OBJS) $(BOBJS)
$(LD) -r -o $@ $^
=20
install: all
|
|
From: Peter K. <pk...@us...> - 2001-06-06 15:52:14
|
The following file was modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- Makefile 1.21 1.22=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Check for CONFIG_BLUETOOTH_SUPPORT_BCSP instead of CONFIG_BLUETOOTH_USE_BCSP. The diff of the modified file(s): --- Makefile 2001/05/17 11:15:04 1.21 +++ Makefile 2001/06/06 15:52:13 1.22 @@ -20,11 +20,11 @@ =20 # For 2.4.x obj-$(CONFIG_BLUETOOTH) +=3D $(OBJS) -obj-$(CONFIG_BLUETOOTH_USE_BCSP) +=3D $(BOBJS) +obj-$(CONFIG_BLUETOOTH_SUPPORT_BCSP) +=3D $(BOBJS) =20 # For 2.0.x and 2.2.x O_OBJS =3D $(OBJS) -ifdef CONFIG_BLUETOOTH_USE_BCSP +ifdef CONFIG_BLUETOOTH_SUPPORT_BCSP O_OBJS +=3D $(BOBJS) endif M_OBJS =3D $(O_TARGET) |
|
From: Anders J. <and...@us...> - 2001-07-30 15:45:29
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
Makefile 1.22 1.23=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Added option to include/exclude unplug test code.
The diff of the modified file(s):
--- Makefile 2001/06/06 15:52:13 1.22
+++ Makefile 2001/07/30 15:45:28 1.23
@@ -9,6 +9,10 @@
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
#---------------------------------------------------------------------
@@ -29,6 +33,10 @@
endif
M_OBJS =3D $(O_TARGET)
=20
+ifdef INCLUDE_UNPLUG_TEST
+O_OBJS +=3D unplug_test.o
+endif
+
include $(TOPDIR)/Rules.make
=20
else
@@ -49,6 +57,11 @@
=20
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
+
+ifdef INCLUDE_UNPLUG_TEST
+OBJS +=3D unplug_test.o
+CFLAGS +=3D -DINCLUDE_UNPLUG_TEST
+endif
=20
all: $(O_TARGET)
=20
|
|
From: Peter K. <pk...@us...> - 2001-07-31 18:59:24
|
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
|
|
From: Peter K. <pk...@us...> - 2001-07-31 19:43:10
|
The following file was modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- Makefile 1.25 1.26=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Made it easier to build with support for BCSP and/or the unplug tests. The diff of the modified file(s): --- Makefile 2001/07/31 18:59:23 1.25 +++ Makefile 2001/07/31 19:43:08 1.26 @@ -43,13 +43,11 @@ # 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 +# Use 'make INCLUDE_BCSP_SUPPORT=3D1' to enable support for BCSP. +INCLUDE_BCSP_SUPPORT =3D 0 =20 -# 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 +# Use 'make INCLUDE_UNPLUG_TEST=3D1' to enable the unplug testcases. +INCLUDE_UNPLUG_TEST =3D 0 =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 @@ -64,12 +62,12 @@ 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 -ifdef INCLUDE_UNPLUG_TEST +ifeq ($(INCLUDE_UNPLUG_TEST),1) OBJS +=3D $(TOBJS) CFLAGS +=3D -DCONFIG_BLUETOOTH_UNPLUG_TEST endif =20 -ifdef INCLUDE_BCSP_SUPPORT +ifeq ($(INCLUDE_BCSP_SUPPORT),1) OBJS +=3D $(BOBJS) CFLAGS +=3D -DCONFIG_BLUETOOTH_SUPPORT_BCSP endif |
|
From: Fredrik S. <fre...@us...> - 2001-12-18 09:35:14
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
Makefile 1.26 1.27=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Added PAN files.
The diff of the modified file(s):
--- Makefile 2001/07/31 19:43:08 1.26
+++ Makefile 2001/12/18 09:35:13 1.27
@@ -6,11 +6,13 @@
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
+TOBJS =3D unplug_test.o bnep_test.o
=20
BOBJS =3D bcsp.o bcsp_datagram.o bcsp_integrity.o bcsp_mux.o \
bcsp_sequence.o bcsp_slip.o
=20
+POBJS =3D bnep.o # bnep_proc.o bnep_status_proc.o
+
ifeq ($(TOPDIR)/Rules.make,$(wildcard $(TOPDIR)/Rules.make))
=20
#---------------------------------------------------------------------
@@ -24,6 +26,7 @@
obj-$(CONFIG_BLUETOOTH) +=3D $(OBJS)
obj-$(CONFIG_BLUETOOTH_UNPLUG_TEST) +=3D $(TOBJS)
obj-$(CONFIG_BLUETOOTH_SUPPORT_BCSP) +=3D $(BOBJS)
+obj-$(CONFIG_BLUETOOTH_PAN) +=3D $(POBJS)
=20
# For 2.0.x and 2.2.x
O_OBJS =3D $(OBJS)
@@ -32,6 +35,9 @@
endif
ifdef CONFIG_BLUETOOTH_SUPPORT_BCSP
O_OBJS +=3D $(BOBJS)
+endif
+ifdef CONFIG_BLUETOOTH_PAN
+O_OBJS +=3D $(POBJS)
endif
M_OBJS =3D $(O_TARGET)
=20
|
|
From: Fredrik S. <fre...@us...> - 2001-12-21 12:06:35
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
Makefile 1.27 1.28=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Only include bnep_test.o when UNPLUG and PAN is configured.
The diff of the modified file(s):
--- Makefile 2001/12/18 09:35:13 1.27
+++ Makefile 2001/12/21 12:06:33 1.28
@@ -6,7 +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 bnep_test.o
+TOBJS =3D unplug_test.o
+
+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
|
|
From: Anders J. <and...@us...> - 2002-01-24 16:09:27
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
Makefile 1.28 1.29=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* Changed to include bnep if PAN is defined.
The diff of the modified file(s):
--- Makefile 2001/12/21 12:06:33 1.28
+++ Makefile 2002/01/24 16:09:25 1.29
@@ -15,7 +15,7 @@
BOBJS =3D bcsp.o bcsp_datagram.o bcsp_integrity.o bcsp_mux.o \
bcsp_sequence.o bcsp_slip.o
=20
-POBJS =3D bnep.o # bnep_proc.o bnep_status_proc.o
+POBJS =3D bnep.o bnep_status_proc.o
=20
ifeq ($(TOPDIR)/Rules.make,$(wildcard $(TOPDIR)/Rules.make))
=20
|
|
From: Peter K. <pk...@us...> - 2002-02-04 11:53:46
|
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)
|
|
From: Alain P. <apa...@us...> - 2002-04-25 14:56:23
|
The following file was modified in linux/drivers/char/bluetooth: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.31 1.32=20=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added the possibility to call the makefile with additional flags The diff of the modified file(s): --- Makefile 28 Feb 2002 15:45:08 -0000 1.31 +++ Makefile 25 Apr 2002 14:56:21 -0000 1.32 @@ -92,6 +92,11 @@ CFLAGS +=3D -DCONFIG_BLUETOOTH_UNPLUG_TEST endif =20 +# if EXTRA_CONF =3D 1, append the value of EXTRA_CFLAGS to CFLAGS +ifeq ($(EXTRA_CONF),1) +CFLAGS +=3D $(EXTRA_CFLAGS) +endif + all: $(O_TARGET) =20 $(O_TARGET): $(OBJS) |
|
From: Peter K. <pk...@us...> - 2003-03-07 15:46:41
|
The following file was modified in linux/drivers/char/bluetooth: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.32 1.33=20=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Use a better default for INCLUDEDIR. The diff of the modified file(s): --- Makefile 25 Apr 2002 14:56:21 -0000 1.32 +++ Makefile 7 Mar 2003 15:46:02 -0000 1.33 @@ -67,7 +67,7 @@ # 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 +INCLUDEDIR =3D /lib/modules/`uname -r`/build/include =20 CC =3D $(CROSSCOMPILE)gcc LD =3D $(CROSSCOMPILE)ld |
Thanks for helping keep SourceForge clean.
X