openbt-commit

CVS: The file 'apps/bluetooth/userstack/Makefile' has been modified.

[Marcus A. S. <mar...@us...>]

The following file was modified in apps/bluetooth/userstack:

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:

Modified to properly make links.


The diff of the modified file(s):

--- Makefile	2000/12/20 14:56:54	1.14
+++ Makefile	2001/02/28 19:29:43	1.15
@@ -16,8 +16,8 @@
 LDFLAGS  +=3D -L$(prefix)/lib
 else
 # In stand-alone tarball
-srcdir    =3D ../../src
-incdir    =3D ../../include/linux/bluetooth
+srcdir    =3D ../../../linux/drivers/char/bluetooth
+incdir    =3D ../../../linux/include/linux/bluetooth
 endif
=20
 ifneq ($(wildcard /usr/lib/libutil.a),)
@@ -46,7 +46,7 @@
=20
 CFLAGS   +=3D -DBTD_USERSTACK
=20
-all:	$(PROGS)
+all:	links $(PROGS)
=20
 btduser:	$(OBJS)
 	$(CC)  -pthread $(LDFLAGS) $^ $(LDLIBS) -o $@

CVS: The file 'apps/bluetooth/userstack/Makefile' has been modified.

[Peter K. <pk...@us...>]

The following file was modified in apps/bluetooth/userstack:

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:

Support for compiling without readline (by Matthias Fuchs).


The diff of the modified file(s):

--- Makefile	2001/02/28 19:29:43	1.15
+++ Makefile	2001/03/09 16:22:00	1.16
@@ -7,6 +7,13 @@
=20
 PROGS     =3D btduser
=20
+# Define HAVE_READLINE_READLINE if you have readline support, with the inc=
lude
+# files in $(include_dir)/readline. Define HAVE_READLINE if you have the
+# include files in $(include_dir). Define neither if you do not want to use
+# readline.
+HAVE_READLINE_READLINE =3D 1
+#HAVE_READLINE =3D 1
+
 ifdef ELINUXDIR # works for now...
 # In elinux tree...
 srcdir    =3D $(ELINUXDIR)/drivers/char/bluetooth
@@ -24,7 +31,15 @@
 LDLIBS   +=3D -lutil=20
 endif
=20
+ifdef HAVE_READLINE_READLINE
 LDLIBS   +=3D -lreadline -ltermcap
+CFLAGS   +=3D -DHAVE_READLINE_READLINE
+endif
+
+ifdef HAVE_READLINE
+LDLIBS   +=3D -lreadline -ltermcap
+CFLAGS   +=3D -DHAVE_READLINE
+endif
=20
 INSTDIR   =3D $(prefix)/bin
 INSTMODE  =3D 0755

CVS: The file 'apps/bluetooth/userstack/Makefile' has been modified.

[Marcus A. S. <mar...@us...>]

The following file was modified in apps/bluetooth/userstack:

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:

Added "-MD" and "-include *.d" to Makefiles to include dependency
checking.


The diff of the modified file(s):

--- Makefile	2001/03/09 16:22:00	1.16
+++ Makefile	2001/03/09 20:08:57	1.17
@@ -19,7 +19,7 @@
 srcdir    =3D $(ELINUXDIR)/drivers/char/bluetooth
 incdir    =3D $(ELINUXDIR)/include/linux/bluetooth
=20
-CFLAGS   +=3D -I$(prefix)/include
+CFLAGS   +=3D -I$(prefix)/include -MD
 LDFLAGS  +=3D -L$(prefix)/lib
 else
 # In stand-alone tarball
@@ -96,3 +96,5 @@
=20
 unlinks:
 	rm -f $(BTDSRCS) $(KSRCS) include
+
+-include *.d

CVS: The file 'apps/bluetooth/userstack/Makefile' has been modified.

[Peter K. <pk...@us...>]

The following file was modified in apps/bluetooth/userstack:

Name            Old version     New version     Comment
----            -----------     -----------     -------
Makefile        1.17            1.18=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.17
+++ Makefile	2001/03/10 12:57:39	1.18
@@ -74,7 +74,7 @@
 	$(INSTALL) -m $(INSTMODE) -o $(INSTOWNER) -g $(INSTGROUP) $(PROGS) $(INST=
DIR)
=20
 clean:
-	rm -f $(PROGS) *.o core *~
+	rm -f $(PROGS) *.o *.d core *~
=20
 links:
 	@ln -sf ../btd/btd.c

CVS: The file 'apps/bluetooth/userstack/Makefile' has been modified.

[Peter K. <pk...@us...>]

The following file was modified in apps/bluetooth/userstack:

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:

Use AXIS_USABLE_LIBS instead of USE_UCLIBC.


The diff of the modified file(s):

--- Makefile	2001/03/10 12:57:39	1.18
+++ Makefile	2001/05/07 11:25:59	1.19
@@ -1,7 +1,7 @@
 # $Id$
=20
 ifdef APPS
-USE_UCLIBC =3D 1
+AXIS_USABLE_LIBS =3D UCLIBC
 include $(APPS)/Rules.elinux
 endif
=20

CVS: The file 'apps/bluetooth/userstack/Makefile' has been modified.

[Anders J. <and...@us...>]

The following file was modified in apps/bluetooth/userstack:

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:

Corrected Makefile to work with new location of unplug_test.c

The diff of the modified file(s):

--- Makefile	2001/05/07 11:25:59	1.19
+++ Makefile	2001/07/30 11:12:58	1.20
@@ -92,6 +92,7 @@
 	@ln -sf $(srcdir)/l2cap_sec.c=20
 	@ln -sf $(srcdir)/rfcomm_sec.c=20
 	@ln -sf $(srcdir)/sec_client.c
+	@ln -sf $(srcdir)/unplug_test.c
 	@ln -sf $(incdir) include
=20
 unlinks:

CVS: The file 'apps/bluetooth/userstack/Makefile' has been modified.

[Anders J. <and...@us...>]

The following file was modified in apps/bluetooth/userstack:

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:

Added buildtarget unplugtest to enable the unplug tests in the code

The diff of the modified file(s):

--- Makefile	2001/07/30 11:12:58	1.20
+++ Makefile	2001/07/30 15:42:15	1.21
@@ -47,21 +47,27 @@
 INSTGROUP =3D root
=20
 SRCS	  =3D btd.c btdebug.c btmem.c hci.c l2cap.c l2cap_con.c rfcomm.c sdp.=
c \
-            tcs.c test.c unplug_test.c bt_proc.c hci_vendor.c sec_client.c=
 \
-	    l2cap_sec.c rfcomm_sec.c
+            tcs.c test.c bt_proc.c hci_vendor.c sec_client.c \
+	    l2cap_sec.c rfcomm_sec.c unplug_test.c
=20
 OBJS      =3D btd.o btdebug.o btmem.o hci.o l2cap.o l2cap_con.o rfcomm.o s=
dp.o \
-            tcs.o test.o unplug_test.o bt_proc.o hci_vendor.o sec_client.o=
 \
+            tcs.o test.o bt_proc.o hci_vendor.o sec_client.o \
 	    l2cap_sec.o rfcomm_sec.o
=20
 BTDSRCS   =3D btd.c
 KSRCS     =3D btdebug.c btmem.c hci.c l2cap.c l2cap_con.c rfcomm.c sdp.c t=
cs.c \
             test.c bt_proc.c hci_vendor.c sec_client.c l2cap_sec.c rfcomm_=
sec.c
-UTSRCS    =3D unplug_test.c
=20
 CFLAGS   +=3D -DBTD_USERSTACK
=20
+ifeq ($@, $("unplugtest"))
+OBJS +=3D unplug_test.o
+CFLAGS +=3D -DINCLUDE_UPLUG_TEST
+endif
+
 all:	links $(PROGS)
+
+unplugtest: all
=20
 btduser:	$(OBJS)
 	$(CC)  -pthread $(LDFLAGS) $^ $(LDLIBS) -o $@

CVS: The file 'apps/bluetooth/userstack/Makefile' has been modified.

[Anders J. <and...@us...>]

The following file was modified in apps/bluetooth/userstack:

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:

Corrected the unplug define

The diff of the modified file(s):

--- Makefile	2001/07/30 15:42:15	1.21
+++ Makefile	2001/07/30 16:04:08	1.22
@@ -62,7 +62,7 @@
=20
 ifeq ($@, $("unplugtest"))
 OBJS +=3D unplug_test.o
-CFLAGS +=3D -DINCLUDE_UPLUG_TEST
+CFLAGS +=3D -DINCLUDE_UNPLUG_TEST
 endif
=20
 all:	links $(PROGS)

CVS: The file 'apps/bluetooth/userstack/Makefile' has been modified.

[Anders J. <and...@us...>]

The following file was modified in apps/bluetooth/userstack:

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:

Changed #INCLUDE_UNPLUG_TEST -> #CONFIG_BLUETOOTH_UNPLUG_TEST

The diff of the modified file(s):

--- Makefile	2001/07/30 16:04:08	1.22
+++ Makefile	2001/07/31 09:02:53	1.23
@@ -62,7 +62,7 @@
=20
 ifeq ($@, $("unplugtest"))
 OBJS +=3D unplug_test.o
-CFLAGS +=3D -DINCLUDE_UNPLUG_TEST
+CFLAGS +=3D -DCONFIG_BLUETOOTH_UNPLUG_TEST
 endif
=20
 all:	links $(PROGS)

CVS: The file 'apps/bluetooth/userstack/Makefile' has been modified.

[Peter K. <pk...@us...>]

The following file was modified in apps/bluetooth/userstack:

Name            Old version     New version     Comment
----            -----------     -----------     -------
Makefile        1.23            1.24=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

'make unplugtest' should work as expected now.


The diff of the modified file(s):

--- Makefile	2001/07/31 09:02:53	1.23
+++ Makefile	2001/07/31 20:02:33	1.24
@@ -7,6 +7,9 @@
=20
 PROGS     =3D btduser
=20
+# Use 'make INCLUDE_UNPLUG_TEST=3D1' to enable the unplug testcases.
+INCLUDE_UNPLUG_TEST =3D 0
+
 # Define HAVE_READLINE_READLINE if you have readline support, with the inc=
lude
 # files in $(include_dir)/readline. Define HAVE_READLINE if you have the
 # include files in $(include_dir). Define neither if you do not want to use
@@ -60,14 +63,15 @@
=20
 CFLAGS   +=3D -DBTD_USERSTACK
=20
-ifeq ($@, $("unplugtest"))
+ifeq ($(INCLUDE_UNPLUG_TEST),1)
 OBJS +=3D unplug_test.o
 CFLAGS +=3D -DCONFIG_BLUETOOTH_UNPLUG_TEST
 endif
=20
 all:	links $(PROGS)
=20
-unplugtest: all
+unplugtest:
+	@$(MAKE) --no-print-directory INCLUDE_UNPLUG_TEST=3D1
=20
 btduser:	$(OBJS)
 	$(CC)  -pthread $(LDFLAGS) $^ $(LDLIBS) -o $@

CVS: The file 'apps/bluetooth/userstack/Makefile' has been modified.

[Peter K. <pk...@us...>]

The following file was modified in apps/bluetooth/userstack:

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:

Use -MMD instead of -MD to generate dependency files, as -MMD does
not generate dependencies to system includes.


The diff of the modified file(s):

--- Makefile	2001/07/31 20:02:33	1.24
+++ Makefile	2001/10/18 15:56:25	1.25
@@ -22,7 +22,7 @@
 srcdir    =3D $(ELINUXDIR)/drivers/char/bluetooth
 incdir    =3D $(ELINUXDIR)/include/linux/bluetooth
=20
-CFLAGS   +=3D -I$(prefix)/include -MD
+CFLAGS   +=3D -I$(prefix)/include -MMD
 LDFLAGS  +=3D -L$(prefix)/lib
 else
 # In stand-alone tarball

CVS: The file 'apps/bluetooth/userstack/Makefile' has been modified.

[Peter K. <pk...@us...>]

The following file was modified in apps/bluetooth/userstack:

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:

Corrected creation and removal of links.

The diff of the modified file(s):

--- Makefile	2001/10/18 15:56:25	1.25
+++ Makefile	2001/10/21 09:39:13	1.26
@@ -59,7 +59,8 @@
=20
 BTDSRCS   =3D btd.c
 KSRCS     =3D btdebug.c btmem.c hci.c l2cap.c l2cap_con.c rfcomm.c sdp.c t=
cs.c \
-            test.c bt_proc.c hci_vendor.c sec_client.c l2cap_sec.c rfcomm_=
sec.c
+            test.c bt_proc.c hci_vendor.c sec_client.c l2cap_sec.c \
+            rfcomm_sec.c unplug_test.c
=20
 CFLAGS   +=3D -DBTD_USERSTACK
=20
@@ -68,7 +69,8 @@
 CFLAGS   +=3D -DCONFIG_BLUETOOTH_UNPLUG_TEST
 endif
=20
-all:	links $(PROGS)
+all:	links
+	@make --no-print-directory $(PROGS)
=20
 unplugtest:
 	@$(MAKE) --no-print-directory INCLUDE_UNPLUG_TEST=3D1

CVS: The file 'apps/bluetooth/userstack/Makefile' has been modified.

[Peter K. <pk...@us...>]

The following file was modified in apps/bluetooth/userstack:

Name      Old version  New version  Tag  Comment
----      -----------  -----------  ---  -------
Makefile  1.26         1.27=20=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Made the user stack compile again (I am pretty sure it does not
work, but at least it compiles).


The diff of the modified file(s):

--- Makefile	21 Oct 2001 09:39:13 -0000	1.26
+++ Makefile	27 Sep 2002 12:56:05 -0000	1.27
@@ -1,5 +1,6 @@
 # $Id$
=20
+AXIS_USABLE_LIBS =3D UCLIBC
 ifdef APPS
 AXIS_USABLE_LIBS =3D UCLIBC
 include $(APPS)/Rules.elinux
@@ -17,17 +18,12 @@
 HAVE_READLINE_READLINE =3D 1
 #HAVE_READLINE =3D 1
=20
-ifdef ELINUXDIR # works for now...
-# In elinux tree...
-srcdir    =3D $(ELINUXDIR)/drivers/char/bluetooth
-incdir    =3D $(ELINUXDIR)/include/linux/bluetooth
-
-CFLAGS   +=3D -I$(prefix)/include -MMD
-LDFLAGS  +=3D -L$(prefix)/lib
+ifneq ($(wildcard $(AXIS_KERNEL_DIR)/arch/cris/drivers/bluetooth/src/bluet=
ooth.c),)
+srcdir    =3D $(AXIS_KERNEL_DIR)/arch/cris/drivers/bluetooth/src
+incdir    =3D $(AXIS_KERNEL_DIR)/arch/cris/drivers/bluetooth/include
 else
-# In stand-alone tarball
-srcdir    =3D ../../../linux/drivers/char/bluetooth
-incdir    =3D ../../../linux/include/linux/bluetooth
+srcdir    =3D $(AXIS_KERNEL_DIR)/drivers/char/bluetooth
+incdir    =3D $(AXIS_KERNEL_DIR)/include/linux/bluetooth
 endif
=20
 ifneq ($(wildcard /usr/lib/libutil.a),)
@@ -62,7 +58,7 @@
             test.c bt_proc.c hci_vendor.c sec_client.c l2cap_sec.c \
             rfcomm_sec.c unplug_test.c
=20
-CFLAGS   +=3D -DBTD_USERSTACK
+CFLAGS   +=3D -DBTD_USERSTACK -MMD
=20
 ifeq ($(INCLUDE_UNPLUG_TEST),1)
 OBJS     +=3D unplug_test.o

CVS: The file 'apps/bluetooth/userstack/Makefile' has been modified.

[Peter K. <pk...@us...>]

The following file was modified in apps/bluetooth/userstack:

Name      Old version  New version  Tag  Comment
----      -----------  -----------  ---  -------
Makefile  1.27         1.28=20=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Moved and renamed apps/Rules.elinux to tools/build/Rules.axis.


The diff of the modified file(s):

--- Makefile	27 Sep 2002 12:56:05 -0000	1.27
+++ Makefile	27 Sep 2002 12:59:03 -0000	1.28
@@ -1,10 +1,7 @@
 # $Id$
=20
 AXIS_USABLE_LIBS =3D UCLIBC
-ifdef APPS
-AXIS_USABLE_LIBS =3D UCLIBC
-include $(APPS)/Rules.elinux
-endif
+-include $(AXIS_TOP_DIR)/tools/build/Rules.axis
=20
 PROGS     =3D btduser
=20

CVS: The file 'apps/bluetooth/userstack/Makefile' has been modified.

[Peter K. <pk...@us...>]

The following file was modified in apps/bluetooth/userstack:

Name      Old version  New version  Tag  Comment
----      -----------  -----------  ---  -------
Makefile  1.28         1.29=20=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Prevent a recursive link to the include directory from being created.


The diff of the modified file(s):

--- Makefile	27 Sep 2002 12:59:03 -0000	1.28
+++ Makefile	7 Mar 2003 15:38:10 -0000	1.29
@@ -98,7 +98,7 @@
 	@ln -sf $(srcdir)/rfcomm_sec.c
 	@ln -sf $(srcdir)/sec_client.c
 	@ln -sf $(srcdir)/unplug_test.c
-	@ln -sf $(incdir) include
+	@ln -sfn $(incdir) include
=20
 unlinks:
 	rm -f $(BTDSRCS) $(KSRCS) include

CVS: The file 'apps/bluetooth/userstack/Makefile' has been modified.

[Peter K. <pk...@us...>]

The following file was modified in apps/bluetooth/userstack:

Name      Old version  New version  Tag  Comment
----      -----------  -----------  ---  -------
Makefile  1.29         1.30=20=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Made it possible to build with glibc.


The diff of the modified file(s):

--- Makefile	2003/03/07 15:38:10	1.29
+++ Makefile	2003/05/05 10:28:18	1.30
@@ -1,6 +1,6 @@
 # $Id$
=20
-AXIS_USABLE_LIBS =3D UCLIBC
+AXIS_USABLE_LIBS =3D GLIBC UCLIBC
 -include $(AXIS_TOP_DIR)/tools/build/Rules.axis
=20
 PROGS     =3D btduser