head	1.8;
access;
symbols
	RELENG_8_4:1.7.0.2
	RELENG_9_1_0_RELEASE:1.5.2.2.2.2
	RELENG_9_1:1.5.2.2.0.2
	RELENG_9_1_BP:1.5.2.2
	RELENG_8_3_0_RELEASE:1.1.4.2.4.1
	RELENG_8_3:1.1.4.2.0.4
	RELENG_8_3_BP:1.1.4.2
	RELENG_9_0_0_RELEASE:1.5.2.1.2.2
	RELENG_9_0:1.5.2.1.0.2
	RELENG_9_0_BP:1.5.2.1
	RELENG_9:1.5.0.2
	RELENG_9_BP:1.5
	RELENG_7_4_0_RELEASE:1.1.2.1.8.1
	RELENG_8_2_0_RELEASE:1.1.4.2.2.1
	RELENG_7_4:1.1.2.1.0.8
	RELENG_7_4_BP:1.1.2.1
	RELENG_8_2:1.1.4.2.0.2
	RELENG_8_2_BP:1.1.4.2
	RELENG_8_1_0_RELEASE:1.1.4.1.4.1
	RELENG_8_1:1.1.4.1.0.4
	RELENG_8_1_BP:1.1.4.1
	RELENG_7_3_0_RELEASE:1.1.2.1.6.1
	RELENG_7_3:1.1.2.1.0.6
	RELENG_7_3_BP:1.1.2.1
	RELENG_8_0_0_RELEASE:1.1.4.1.2.1
	RELENG_8_0:1.1.4.1.0.2
	RELENG_8_0_BP:1.1.4.1
	RELENG_8:1.1.0.4
	RELENG_8_BP:1.1
	RELENG_7_2_0_RELEASE:1.1.2.1.4.1
	RELENG_7_2:1.1.2.1.0.4
	RELENG_7_2_BP:1.1.2.1
	RELENG_7_1_0_RELEASE:1.1.2.1.2.1
	RELENG_7_1:1.1.2.1.0.2
	RELENG_7_1_BP:1.1.2.1
	RELENG_7:1.1.0.2;
locks; strict;
comment	@# @;


1.8
date	2013.05.08.00.38.56;	author svnexp;	state Exp;
branches;
next	1.7;

1.7
date	2012.11.17.01.48.40;	author svnexp;	state Exp;
branches
	1.7.2.1;
next	1.6;

1.6
date	2011.11.28.10.01.36;	author rwatson;	state Exp;
branches;
next	1.5;

1.5
date	2010.10.27.18.46.56;	author rpaulo;	state Exp;
branches
	1.5.2.1;
next	1.4;

1.4
date	2010.08.21.17.29.59;	author rpaulo;	state Exp;
branches;
next	1.3;

1.3
date	2010.08.21.13.48.04;	author rpaulo;	state Exp;
branches;
next	1.2;

1.2
date	2010.03.02.19.04.07;	author uqs;	state Exp;
branches;
next	1.1;

1.1
date	2008.05.22.04.26.42;	author jb;	state Exp;
branches
	1.1.2.1
	1.1.4.1;
next	;

1.7.2.1
date	2012.11.17.01.48.40;	author svnexp;	state dead;
branches;
next	1.7.2.2;

1.7.2.2
date	2013.03.28.13.00.15;	author svnexp;	state Exp;
branches;
next	;

1.5.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.5.2.1.2.1;
next	1.5.2.2;

1.5.2.2
date	2011.11.28.15.09.31;	author rwatson;	state Exp;
branches
	1.5.2.2.2.1;
next	1.5.2.3;

1.5.2.3
date	2012.11.17.11.36.04;	author svnexp;	state Exp;
branches;
next	1.5.2.4;

1.5.2.4
date	2013.05.12.01.01.43;	author svnexp;	state Exp;
branches;
next	;

1.5.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.5.2.1.2.2;

1.5.2.1.2.2
date	2011.11.28.22.30.19;	author rwatson;	state Exp;
branches;
next	1.5.2.1.2.3;

1.5.2.1.2.3
date	2012.11.17.08.36.05;	author svnexp;	state Exp;
branches;
next	;

1.5.2.2.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.5.2.2.2.2;

1.5.2.2.2.2
date	2012.11.17.08.46.54;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1
date	2008.08.27.04.41.15;	author jb;	state Exp;
branches
	1.1.2.1.2.1
	1.1.2.1.4.1
	1.1.2.1.6.1
	1.1.2.1.8.1;
next	1.1.2.2;

1.1.2.2
date	2012.11.17.08.00.53;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1.2.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.1.2.1.4.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.1.2.1.6.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.1.2.1.8.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.1.2.1.8.2;

1.1.2.1.8.2
date	2012.11.17.08.16.32;	author svnexp;	state Exp;
branches;
next	;

1.1.4.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.1.4.1.2.1
	1.1.4.1.4.1;
next	1.1.4.2;

1.1.4.2
date	2010.11.08.12.54.55;	author rpaulo;	state Exp;
branches
	1.1.4.2.2.1
	1.1.4.2.4.1;
next	1.1.4.3;

1.1.4.3
date	2012.11.17.10.35.49;	author svnexp;	state Exp;
branches;
next	;

1.1.4.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.1.4.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.1.4.2.2.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.1.4.2.4.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.1.4.2.4.2;

1.1.4.2.4.2
date	2012.11.17.08.24.32;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.8
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/250337
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@# $FreeBSD: head/cddl/lib/drti/Makefile 250337 2013-05-07 22:05:57Z brooks $

.PATH:		${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/common

SRCS=		drti.c
FILES=		${SRCS:R:S/$/.o/g}
FILESOWN=	${LIBOWN}
FILESGRP=	${LIBGRP}
FILESMODE=	${LIBMODE}
FILESDIR=	${LIBDIR}/dtrace
CLEANFILES=	${FILES}
LIB=		drti-dummy
INTERNALLIB=

CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
		-I${OPENSOLARIS_USR_DISTDIR}/head \
		-I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \
		-I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \
		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
		-DPIC ${PICFLAG}

.if make(install) && defined(LIBRARIES_ONLY)
install:
	${INSTALL} -o ${FILESOWN} -g ${FILESGRP} -m ${FILESMODE} \
	    ${FILES} ${DESTDIR}${FILESDIR}
.endif

.include <bsd.lib.mk>
@


1.7
log
@Switching exporter and resync
@
text
@d1 1
a1 1
# $FreeBSD: head/cddl/lib/drti/Makefile 228057 2011-11-28 10:01:36Z rwatson $
d12 2
d23 6
@


1.7.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:00:15 +0000
@
text
@d1 21
@


1.7.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 24
# $FreeBSD: releng/8.4/cddl/lib/drti/Makefile 214983 2010-11-08 12:54:55Z rpaulo $

.include	"../../Makefile.inc"

.PATH:		${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common

SRCS=		drti.c
FILES=		${SRCS:R:S/$/.o/g}
FILESOWN=	${LIBOWN}
FILESGRP=	${LIBGRP}
FILESMODE=	${LIBMODE}
FILESDIR=	${LIBDIR}/dtrace
WARNS?=		6
CLEANFILES=	${FILES}

CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
		-I${OPENSOLARIS_USR_DISTDIR}/head \
		-I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \
		-I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \
		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
		-DPIC -fpic

.include <bsd.prog.mk>
@


1.6
log
@SVN rev 228057 on 2011-11-28 10:01:36Z by rwatson

Change the Makefile in cddl/lib/drti to use bsd.lib.mk instead of
bsd.prog.mk -- we need to compile PIC, which requires a library build.
With this change, USDT (userspace DTrace probes) work from within
shared libraries.

PR:		kern/159046
Submitted by:	Alex Samorukov <samm at os2.kiev.ua>
Comments by:	Scott Lystig Fritchie <slfritchie at snookles.com>
MFC after:	3 days
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.5
log
@SVN rev 214430 on 2010-10-27 18:46:56Z by rpaulo

Use ${PICFLAG} instead of -fpic.
@
text
@d21 1
a21 1
.include <bsd.prog.mk>
@


1.5.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.5.2.2
log
@SVN rev 228073 on 2011-11-28 15:09:31Z by rwatson

Merge r228057 from head to stable/9:

  Change the Makefile in cddl/lib/drti to use bsd.lib.mk instead of
  bsd.prog.mk -- we need to compile PIC, which requires a library build.
  With this change, USDT (userspace DTrace probes) work from within
  shared libraries.

  PR:             kern/159046
  Submitted by:   Alex Samorukov <samm at os2.kiev.ua>
  Comments by:    Scott Lystig Fritchie <slfritchie at snookles.com>

Approved by:	re (xxx)
@
text
@d21 1
a21 1
.include <bsd.lib.mk>
@


1.5.2.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/cddl/lib/drti/Makefile 228073 2011-11-28 15:09:31Z rwatson $
@


1.5.2.4
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/250534
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/cddl/lib/drti/Makefile 250534 2013-05-12 00:35:57Z brooks $
a11 2
LIB=		drti-dummy
INTERNALLIB=
a20 6
.if make(install) && defined(LIBRARIES_ONLY)
install:
	${INSTALL} -o ${FILESOWN} -g ${FILESGRP} -m ${FILESMODE} \
	    ${FILES} ${DESTDIR}${FILESDIR}
.endif

@


1.5.2.2.2.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.5.2.2.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/cddl/lib/drti/Makefile 228073 2011-11-28 15:09:31Z rwatson $
@


1.5.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.5.2.1.2.2
log
@SVN rev 228107 on 2011-11-28 22:30:19Z by rwatson

Merge r228057 from head to releng/9.0:

  Change the Makefile in cddl/lib/drti to use bsd.lib.mk instead of
  bsd.prog.mk -- we need to compile PIC, which requires a library build.
  With this change, USDT (userspace DTrace probes) work from within
  shared libraries.

  PR:             kern/159046
  Submitted by:   Alex Samorukov <samm at os2.kiev.ua>
  Comments by:    Scott Lystig Fritchie <slfritchie at snookles.com>

Approved by:	re (bz)
@
text
@d21 1
a21 1
.include <bsd.lib.mk>
@


1.5.2.1.2.3
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/cddl/lib/drti/Makefile 228107 2011-11-28 22:30:19Z rwatson $
@


1.4
log
@SVN rev 211577 on 2010-08-21 17:29:59Z by rpaulo

Don't link drti.o with libelf_pic.a. This means that all software with
userland SDT probes must be linked with libelf explicitly.

Requested by:	kib
Sponsored by:	The FreeBSD Foundation
@
text
@d19 1
a19 1
		-DPIC -fpic
@


1.3
log
@SVN rev 211561 on 2010-08-21 13:48:04Z by rpaulo

Link drti.o with a PIC version of libelf. This is needed because
drti.o depends on libelf and this avoids linking every other drti.o
program (namely programs with USDT probes) with libelf.

Sponsored by:	The FreeBSD Foundation
@
text
@d11 1
a11 1
CLEANFILES=	${FILES} ${FILES}.tmp
a20 6
.c.o:
	${CC} ${CFLAGS} -c ${.IMPSRC}
	mv ${FILES} ${FILES}.tmp
	${LD} -o ${FILES} -r ${FILES}.tmp ${LIBELF_PIC}
	rm -f ${FILES}.tmp

@


1.2
log
@SVN rev 204597 on 2010-03-02 19:04:07Z by uqs

Remove manual .includes in cddl Makefiles

- Break the dependency on ../Makefile.inc for .PATH, and include
  ../Makefile.inc implicitly. This is required to ...
- Set WARNS?=6 in top-level Makefile.inc
- Remove now redundant WARNS settings, add WARNS?=0 where appropriate
- Remove redundant SHLIB_MAJOR overrides
- Use NO_MAN, not MK_MAN=no
- Remove redundant inclusion of bsd.own.mk
- Order Makefiles more according to style.Makefile(9)
- Reduce diff of cddl Makefiles against each other

No objection:	pjd
Approved by:	ed (co-mentor)
@
text
@d11 1
a11 1
CLEANFILES=	${FILES}
d18 8
a25 1
		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
@


1.1
log
@Add the DTrace libraries and D library scripts.
@
text
@d3 1
a3 3
.include	"../../Makefile.inc"

.PATH:		${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common
a10 1
WARNS?=		6
@


1.1.4.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.1.4.2
log
@SVN rev 214983 on 2010-11-08 12:54:55Z by rpaulo

MFC r210688 r210689 r210694 r211184 r212831 r210682 r210683 r210690 r209539
    r210199 r210237 r210692 r210695 r210767 r210775 r210776 r211545 r211554
    r211562 r212092 r212358 r212414 r212462 r212495 r210693 r211547 r211550
    r211554 r211561 r211577 r210691 r210697 r211563 r211564 r211841 r211842
    r211562 r212649 r211187 r211555:

Userland DTrace MFC. This only includes the userland side of userland DTrace.
@
text
@d21 1
a21 2
		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
		-DPIC -fpic
@


1.1.4.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/cddl/lib/drti/Makefile 214983 2010-11-08 12:54:55Z rpaulo $
@


1.1.4.2.4.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.1.4.2.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/cddl/lib/drti/Makefile 214983 2010-11-08 12:54:55Z rpaulo $
@


1.1.4.2.2.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.1.4.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.1.4.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.1.2.1
log
@SVN rev 182231 on 2008-08-27 04:41:15Z by jb

MFC

DTrace support.

Note that this defaults the 'make buildkernel' to build with CTF data so
that the release kernel and modules are DTrace-able.
@
text
@@


1.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/cddl/lib/drti/Makefile 182231 2008-08-27 04:41:15Z jb $
@


1.1.2.1.8.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.1.2.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/cddl/lib/drti/Makefile 182231 2008-08-27 04:41:15Z jb $
@


1.1.2.1.6.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.1.2.1.4.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.1.2.1.2.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


