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