Date: Thu, 21 Nov 2002 14:24:51 +0200 From: Ruslan Ermilov <ru@FreeBSD.org> To: Julian Elischer <julian@FreeBSD.org> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/include Makefile Message-ID: <20021121122451.GA4922@sunbay.com> In-Reply-To: <20021121104150.GA86571@sunbay.com> References: <200211211031.gALAVBIi054020@repoman.freebsd.org> <20021121104150.GA86571@sunbay.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--17pEHd4RhPHOinZp
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Thu, Nov 21, 2002 at 12:41:50PM +0200, Ruslan Ermilov wrote:
> On Thu, Nov 21, 2002 at 02:31:11AM -0800, Julian Elischer wrote:
> > julian 2002/11/21 02:31:11 PST
> >=20
> > Modified files:
> > include Makefile=20
> > Log:
> > Temporarily remove the install of bluetooth include files..
> > something "VERY WIERD" happens to them during buildworld..
> > The sources get replaced by symlinks to themselves (!?)
> > =20
> > Revision Changes Path
> > 1.188 +2 -1 src/include/Makefile
> >=20
> Here's the real fix (relative to previous revision):
>=20
> %%%
> Index: Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/src/include/Makefile,v
> retrieving revision 1.187
> diff -u -r1.187 Makefile
> --- Makefile 21 Nov 2002 00:37:48 -0000 1.187
> +++ Makefile 21 Nov 2002 10:40:41 -0000
> @@ -41,9 +41,9 @@
> security/lomac security/mac_biba security/mac_bsdextended \
> security/mac_mls security/mac_partition ufs/ffs ufs/ufs
> =20
> -# For SHARED=3Dsymlinks, cam and netatm are symlinks, so cam/scsi and ne=
tatm/*
> -# are taken care of
> -LSYMSUBDIRS=3D ${LSUBDIRS:Ncam/scsi:Nnetatm/*}
> +# For SHARED=3Dsymlinks, cam, netatm, and netgraph are symlinks, so cam/=
scsi,
> +# netatm/*, and netgraph/* are taken care of
> +LSYMSUBDIRS=3D ${LSUBDIRS:Ncam/scsi:Nnetatm/*:Nnetgraph/*}
> =20
> # Define SHARED to indicate whether you want symbolic links to the system
> # source (``symlinks''), or a separate copy (``copies''). ``symlinks'' =
is
> %%%
>=20
And if we give them the place under /usr/include, we should use them
from here. Please make sure to commit this and the below before
attaching usr.sbin/bluetooth to the build (it's horribly broken now):
%%%
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/usr.sbin/bluetooth/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile 20 Nov 2002 23:01:54 -0000 1.1
+++ Makefile 21 Nov 2002 12:22:05 -0000
@@ -1,12 +1,10 @@
-# $Id$
# $FreeBSD: src/usr.sbin/bluetooth/Makefile,v 1.1 2002/11/20 23:01:54 juli=
an Exp $
=20
-SUBDIR=3D \
- bt3cfw \
- hccontrol \
- hcseriald \
- l2control \
+SUBDIR=3D \
+ bt3cfw \
+ hccontrol \
+ hcseriald \
+ l2control \
l2ping
=20
.include <bsd.subdir.mk>
-
Index: Makefile.inc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: Makefile.inc
diff -N Makefile.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Makefile.inc 21 Nov 2002 12:22:05 -0000
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+WARNS?=3D 2
+
+.include "../Makefile.inc"
Index: bt3cfw/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/usr.sbin/bluetooth/bt3cfw/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- bt3cfw/Makefile 20 Nov 2002 23:01:55 -0000 1.1
+++ bt3cfw/Makefile 21 Nov 2002 12:22:05 -0000
@@ -1,14 +1,7 @@
-# $Id: Makefile,v 1.1.1.1 2002/11/12 00:39:18 max Exp $
# $FreeBSD: src/usr.sbin/bluetooth/bt3cfw/Makefile,v 1.1 2002/11/20 23:01:=
55 julian Exp $
=20
-DESTDIR=3D /usr/sbin/
-MANDIR=3D ../share/man/man
PROG=3D bt3cfw
-MAN8=3D bt3cfw.8
-WARNS?=3D 2
-CFLAGS+=3D -g -I../../../sys/netgraph/bluetooth/include
-SRCS=3D bt3cfw.c
-
+MAN=3D bt3cfw.8
DPADD=3D ${LIBNETGRAPH}
LDADD=3D -lnetgraph
=20
Index: bt3cfw/bt3cfw.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/usr.sbin/bluetooth/bt3cfw/bt3cfw.c,v
retrieving revision 1.1
diff -u -r1.1 bt3cfw.c
--- bt3cfw/bt3cfw.c 20 Nov 2002 23:01:55 -0000 1.1
+++ bt3cfw/bt3cfw.c 21 Nov 2002 12:22:05 -0000
@@ -38,7 +38,7 @@
#include <string.h>
#include <syslog.h>
#include <unistd.h>
-#include "ng_bt3c.h"
+#include <netgraph/bluetooth/include/ng_bt3c.h>
=20
#define BT3CFW_IDENT "bt3cfw"
#define BT3CFW_MAX_FIRMWARE_SIZE 0xffff
Index: hccontrol/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/usr.sbin/bluetooth/hccontrol/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- hccontrol/Makefile 20 Nov 2002 23:01:55 -0000 1.1
+++ hccontrol/Makefile 21 Nov 2002 12:22:05 -0000
@@ -1,14 +1,9 @@
-# $Id: Makefile,v 1.6 2002/09/06 18:52:41 max Exp $
# $FreeBSD: src/usr.sbin/bluetooth/hccontrol/Makefile,v 1.1 2002/11/20 23:=
01:55 julian Exp $
=20
-DESTDIR=3D /usr/sbin/
-MANDIR=3D ../share/man/man
PROG=3D hccontrol
-MAN8=3D hccontrol.8
-WARNS?=3D 2
-CFLAGS+=3D -g -I../../../sys/netgraph/bluetooth/include
SRCS=3D send_recv.c link_policy.c link_control.c \
host_controller_baseband.c info.c status.c node.c hccontrol.c \
util.c
+MAN=3D hccontrol.8
=20
.include <bsd.prog.mk>
Index: hccontrol/hccontrol.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/usr.sbin/bluetooth/hccontrol/hccontrol.c,v
retrieving revision 1.1
diff -u -r1.1 hccontrol.c
--- hccontrol/hccontrol.c 20 Nov 2002 23:01:55 -0000 1.1
+++ hccontrol/hccontrol.c 21 Nov 2002 12:22:05 -0000
@@ -36,9 +36,9 @@
#include <bitstring.h>
#include <err.h>
#include <errno.h>
-#include <ng_hci.h>
-#include <ng_l2cap.h>
-#include <ng_btsocket.h>
+#include <netgraph/bluetooth/include/ng_hci.h>
+#include <netgraph/bluetooth/include/ng_l2cap.h>
+#include <netgraph/bluetooth/include/ng_btsocket.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Index: hccontrol/host_controller_baseband.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/usr.sbin/bluetooth/hccontrol/host_controller_baseb=
and.c,v
retrieving revision 1.1
diff -u -r1.1 host_controller_baseband.c
--- hccontrol/host_controller_baseband.c 20 Nov 2002 23:01:55 -0000 1.1
+++ hccontrol/host_controller_baseband.c 21 Nov 2002 12:22:05 -0000
@@ -32,7 +32,7 @@
#include <sys/types.h>
#include <sys/endian.h>
#include <errno.h>
-#include <ng_hci.h>
+#include <netgraph/bluetooth/include/ng_hci.h>
#include <stdio.h>
#include <string.h>
#include "hccontrol.h"
Index: hccontrol/info.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/usr.sbin/bluetooth/hccontrol/info.c,v
retrieving revision 1.1
diff -u -r1.1 info.c
--- hccontrol/info.c 20 Nov 2002 23:01:55 -0000 1.1
+++ hccontrol/info.c 21 Nov 2002 12:22:05 -0000
@@ -32,7 +32,7 @@
#include <sys/types.h>
#include <sys/endian.h>
#include <errno.h>
-#include <ng_hci.h>
+#include <netgraph/bluetooth/include/ng_hci.h>
#include <stdio.h>
#include <string.h>
#include "hccontrol.h"
Index: hccontrol/link_control.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/usr.sbin/bluetooth/hccontrol/link_control.c,v
retrieving revision 1.1
diff -u -r1.1 link_control.c
--- hccontrol/link_control.c 20 Nov 2002 23:01:55 -0000 1.1
+++ hccontrol/link_control.c 21 Nov 2002 12:22:05 -0000
@@ -32,7 +32,7 @@
#include <sys/types.h>
#include <sys/endian.h>
#include <errno.h>
-#include <ng_hci.h>
+#include <netgraph/bluetooth/include/ng_hci.h>
#include <stdio.h>
#include <string.h>
#include "hccontrol.h"
Index: hccontrol/link_policy.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/usr.sbin/bluetooth/hccontrol/link_policy.c,v
retrieving revision 1.1
diff -u -r1.1 link_policy.c
--- hccontrol/link_policy.c 20 Nov 2002 23:01:55 -0000 1.1
+++ hccontrol/link_policy.c 21 Nov 2002 12:22:05 -0000
@@ -32,7 +32,7 @@
#include <sys/types.h>
#include <sys/endian.h>
#include <errno.h>
-#include <ng_hci.h>
+#include <netgraph/bluetooth/include/ng_hci.h>
#include <stdio.h>
#include "hccontrol.h"
=20
Index: hccontrol/node.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/usr.sbin/bluetooth/hccontrol/node.c,v
retrieving revision 1.1
diff -u -r1.1 node.c
--- hccontrol/node.c 20 Nov 2002 23:01:55 -0000 1.1
+++ hccontrol/node.c 21 Nov 2002 12:22:05 -0000
@@ -34,9 +34,9 @@
#include <sys/ioctl.h>
#include <bitstring.h>
#include <errno.h>
-#include <ng_hci.h>
-#include <ng_l2cap.h>
-#include <ng_btsocket.h>
+#include <netgraph/bluetooth/include/ng_hci.h>
+#include <netgraph/bluetooth/include/ng_l2cap.h>
+#include <netgraph/bluetooth/include/ng_btsocket.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Index: hccontrol/send_recv.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/usr.sbin/bluetooth/hccontrol/send_recv.c,v
retrieving revision 1.1
diff -u -r1.1 send_recv.c
--- hccontrol/send_recv.c 20 Nov 2002 23:01:55 -0000 1.1
+++ hccontrol/send_recv.c 21 Nov 2002 12:22:05 -0000
@@ -35,7 +35,7 @@
#include <sys/endian.h>
#include <assert.h>
#include <errno.h>
-#include <ng_hci.h>
+#include <netgraph/bluetooth/include/ng_hci.h>
#include <string.h>
#include <unistd.h>
#include "hccontrol.h"
Index: hccontrol/status.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/usr.sbin/bluetooth/hccontrol/status.c,v
retrieving revision 1.1
diff -u -r1.1 status.c
--- hccontrol/status.c 20 Nov 2002 23:01:55 -0000 1.1
+++ hccontrol/status.c 21 Nov 2002 12:22:05 -0000
@@ -32,7 +32,7 @@
#include <sys/types.h>
#include <sys/endian.h>
#include <errno.h>
-#include <ng_hci.h>
+#include <netgraph/bluetooth/include/ng_hci.h>
#include <stdio.h>
#include "hccontrol.h"
=20
Index: hcseriald/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/usr.sbin/bluetooth/hcseriald/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- hcseriald/Makefile 20 Nov 2002 23:01:55 -0000 1.1
+++ hcseriald/Makefile 21 Nov 2002 12:22:05 -0000
@@ -1,15 +1,7 @@
-# $Id: Makefile,v 1.4 2002/09/04 21:29:58 max Exp $
# $FreeBSD: src/usr.sbin/bluetooth/hcseriald/Makefile,v 1.1 2002/11/20 23:=
01:55 julian Exp $
=20
-DESTDIR=3D /usr/sbin/
-MANDIR=3D ../share/man/man
-
PROG=3D hcseriald
-MAN8=3D hcseriald.8
-
-WARNS?=3D 2
-CFLAGS+=3D -Wall -O2 -I../../../sys/netgraph/bluetooth/include
-SRCS=3D hcseriald.c
+MAN=3D hcseriald.8
=20
DPADD=3D ${LIBNETGRAPH}
LDADD=3D -lnetgraph
Index: hcseriald/hcseriald.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/usr.sbin/bluetooth/hcseriald/hcseriald.c,v
retrieving revision 1.1
diff -u -r1.1 hcseriald.c
--- hcseriald/hcseriald.c 20 Nov 2002 23:01:55 -0000 1.1
+++ hcseriald/hcseriald.c 21 Nov 2002 12:22:05 -0000
@@ -34,7 +34,7 @@
=20
#include <netgraph/ng_message.h>
#include <netgraph.h>
-#include <ng_h4.h>
+#include <netgraph/bluetooth/include/ng_h4.h>
=20
#include <errno.h>
#include <fcntl.h>
Index: l2control/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/usr.sbin/bluetooth/l2control/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- l2control/Makefile 20 Nov 2002 23:01:55 -0000 1.1
+++ l2control/Makefile 21 Nov 2002 12:22:05 -0000
@@ -1,12 +1,7 @@
-# $Id: Makefile,v 1.3 2002/09/04 21:30:40 max Exp $
# $FreeBSD: src/usr.sbin/bluetooth/l2control/Makefile,v 1.1 2002/11/20 23:=
01:55 julian Exp $
=20
-DESTDIR=3D /usr/sbin/
-MANDIR=3D ../share/man/man
PROG=3D l2control
-MAN8=3D l2control.8
-WARNS?=3D 2
-CFLAGS+=3D -g -I../../../sys/netgraph/bluetooth/include
SRCS=3D l2cap.c l2control.c
+MAN=3D l2control.8
=20
.include <bsd.prog.mk>
Index: l2control/l2cap.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/usr.sbin/bluetooth/l2control/l2cap.c,v
retrieving revision 1.1
diff -u -r1.1 l2cap.c
--- l2control/l2cap.c 20 Nov 2002 23:01:55 -0000 1.1
+++ l2control/l2cap.c 21 Nov 2002 12:22:05 -0000
@@ -33,9 +33,9 @@
#include <sys/ioctl.h>
#include <bitstring.h>
#include <errno.h>
-#include <ng_hci.h>
-#include <ng_l2cap.h>
-#include <ng_btsocket.h>
+#include <netgraph/bluetooth/include/ng_hci.h>
+#include <netgraph/bluetooth/include/ng_l2cap.h>
+#include <netgraph/bluetooth/include/ng_btsocket.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Index: l2control/l2control.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/usr.sbin/bluetooth/l2control/l2control.c,v
retrieving revision 1.1
diff -u -r1.1 l2control.c
--- l2control/l2control.c 20 Nov 2002 23:01:55 -0000 1.1
+++ l2control/l2control.c 21 Nov 2002 12:22:05 -0000
@@ -35,9 +35,9 @@
#include <assert.h>
#include <err.h>
#include <errno.h>
-#include <ng_hci.h>
-#include <ng_l2cap.h>
-#include <ng_btsocket.h>
+#include <netgraph/bluetooth/include/ng_hci.h>
+#include <netgraph/bluetooth/include/ng_l2cap.h>
+#include <netgraph/bluetooth/include/ng_btsocket.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Index: l2ping/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/usr.sbin/bluetooth/l2ping/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- l2ping/Makefile 20 Nov 2002 23:01:55 -0000 1.1
+++ l2ping/Makefile 21 Nov 2002 12:22:05 -0000
@@ -1,12 +1,6 @@
-# $Id: Makefile,v 1.4 2002/09/04 21:28:05 max Exp $
# $FreeBSD: src/usr.sbin/bluetooth/l2ping/Makefile,v 1.1 2002/11/20 23:01:=
55 julian Exp $
=20
-DESTDIR=3D /usr/sbin/
-MANDIR=3D ../share/man/man
PROG=3D l2ping
-MAN8=3D l2ping.8
-SRCS=3D l2ping.c
-WARNS?=3D 2
-CFLAGS+=3D -g -I../../../sys/netgraph/bluetooth/include
+MAN=3D l2ping.8
=20
.include <bsd.prog.mk>
Index: l2ping/l2ping.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/usr.sbin/bluetooth/l2ping/l2ping.c,v
retrieving revision 1.1
diff -u -r1.1 l2ping.c
--- l2ping/l2ping.c 20 Nov 2002 23:01:55 -0000 1.1
+++ l2ping/l2ping.c 21 Nov 2002 12:22:05 -0000
@@ -43,9 +43,9 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <ng_hci.h>
-#include <ng_l2cap.h>
-#include <ng_btsocket.h>
+#include <netgraph/bluetooth/include/ng_hci.h>
+#include <netgraph/bluetooth/include/ng_l2cap.h>
+#include <netgraph/bluetooth/include/ng_btsocket.h>
=20
static void usage (void);
static void tv_sub (struct timeval *, struct timeval const *);
%%%
Cheers,
--=20
Ruslan Ermilov Sysadmin and DBA,
ru@sunbay.com Sunbay Software AG,
ru@FreeBSD.org FreeBSD committer,
+380.652.512.251 Simferopol, Ukraine
http://www.FreeBSD.org The Power To Serve
http://www.oracle.com Enabling The Information Age
--17pEHd4RhPHOinZp
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (FreeBSD)
iD8DBQE93NCTUkv4P6juNwoRApXFAJ0a3+wlPYSAPULTbYMaC2Hn/5sr9QCbB6w+
WRkv8IYWc38why/w1XAez8o=
=Ocr8
-----END PGP SIGNATURE-----
--17pEHd4RhPHOinZp--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021121122451.GA4922>