From owner-p4-projects@FreeBSD.ORG  Tue May  9 21:07:56 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 0FBC016A4E7; Tue,  9 May 2006 21:07:56 +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 C0E3C16A4CF
	for <perforce@freebsd.org>; Tue,  9 May 2006 21:07:55 +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 5D67943D4C
	for <perforce@freebsd.org>; Tue,  9 May 2006 21:07:55 +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 k49L7t5Q097908
	for <perforce@freebsd.org>; Tue, 9 May 2006 21:07:55 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k49L7tof097902
	for perforce@freebsd.org; Tue, 9 May 2006 21:07:55 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 9 May 2006 21:07:55 GMT
Message-Id: <200605092107.k49L7tof097902@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 96881 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: Tue, 09 May 2006 21:07:56 -0000

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

Change 96881 by jb@jb_freebsd2 on 2006/05/09 21:07:10

	Move the load/unload developer convenience targets to a common
	include. We need to load and unload the set in the right order.

Affected files ...

.. //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#13 edit
.. //depot/projects/dtrace/src/sys/modules/dtrace/Makefile.inc#1 add
.. //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#5 edit
.. //depot/projects/dtrace/src/sys/modules/dtrace/profile/Makefile#3 edit
.. //depot/projects/dtrace/src/sys/modules/dtrace/systrace/Makefile#1 add

Differences ...

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

@@ -1,21 +1,10 @@
-# $FreeBSD#
+# $FreeBSD$
 
 .include <bsd.own.mk>
+.include "Makefile.inc"
 
 SUBDIR=	dtrace \
 	profile \
 	systrace
 
-load	:
-	-kldload dtrace
-	-kldload profile
-	-kldload systrace
-	kldstat
-
-unload	:
-	-kldunload systrace
-	-kldunload profile
-	-kldunload dtrace
-	kldstat
-
 .include <bsd.subdir.mk>

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

@@ -1,4 +1,4 @@
-# $FreeBSD#
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../cddl/dev/dtrace
 .PATH: ${.CURDIR}/../../../cddl/dev/dtrace/${MACHINE_ARCH}
@@ -24,14 +24,4 @@
 		dtrace_unregister \
 		dtrace_probe_lookup
 
-load	:
-	-kldload dtrace
-	kldstat
-
-unload	:
-	-kldunload systrace
-	-kldunload fasttrap
-	-kldunload dtrace
-	kldstat
-
 .include <bsd.kmod.mk>

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

@@ -1,4 +1,4 @@
-# $FreeBSD#
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../cddl/dev/profile
 
@@ -12,14 +12,4 @@
 		-I${.CURDIR}/../../../contrib \
 		-I${.CURDIR}/../../.. -D_SOLARIS_C_SOURCE
 
-load	:
-	-kldload dtrace
-	-kldload profile
-	kldstat
-
-unload	:
-	-kldunload profile
-	-kldunload dtrace
-	kldstat
-
 .include <bsd.kmod.mk>