From owner-p4-projects@FreeBSD.ORG  Sun Apr 30 00:13:20 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8E2F416A407; Sun, 30 Apr 2006 00:13:20 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 692A816A400
	for <perforce@freebsd.org>; Sun, 30 Apr 2006 00:13:20 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2FFB043D6E
	for <perforce@freebsd.org>; Sun, 30 Apr 2006 00:13:20 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3U0DK43032990
	for <perforce@freebsd.org>; Sun, 30 Apr 2006 00:13:20 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3U0DJCl032982
	for perforce@freebsd.org; Sun, 30 Apr 2006 00:13:19 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 30 Apr 2006 00:13:19 GMT
Message-Id: <200604300013.k3U0DJCl032982@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 96386 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Apr 2006 00:13:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=96386

Change 96386 by jb@jb_freebsd2 on 2006/04/30 00:12:19

	Put all the DTrace providers under one directory. It makes more
	sense to keep them grouped this way because most people won't
	recognise them as DTrace providers from their names.

Affected files ...

.. //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#9 edit

Differences ...

==== //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#9 (text+ko) ====

@@ -1,26 +1,7 @@
 # $FreeBSD#
 
-.PATH: ${.CURDIR}/../../cddl/dev/dtrace
-.PATH: ${.CURDIR}/../../cddl/dev/dtrace/${MACHINE_ARCH}
+.include <bsd.own.mk>
 
-KMOD=	dtrace
-SRCS=	dtrace.c dtrace_mutex.c dtrace_asm.S dis_tables.c instr_size.c
-SRCS+=	bus_if.h device_if.h vnode_if.h
+SUBDIR=	dtrace
 
-CFLAGS+=	-I${.CURDIR}/../../cddl/dev/dtrace \
-		-I${.CURDIR}/../../cddl/dev/dtrace/${MACHINE_ARCH} \
-		-I${.CURDIR}/../../contrib/opensolaris/uts/common \
-		-I${.CURDIR}/../../contrib \
-		-I${.CURDIR}/../.. -DDIS_MEM -D_SOLARIS_C_SOURCE
-
-CFLAGS+=	-DDEBUG
-
-load	:
-	kldload dtrace
-	kldstat
-
-unload	:
-	kldunload dtrace
-	kldstat
-
-.include <bsd.kmod.mk>
+.include <bsd.subdir.mk>