From owner-p4-projects@FreeBSD.ORG Mon Oct 29 02:32:00 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E03116A421; Mon, 29 Oct 2007 02:31:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5263516A41B for ; Mon, 29 Oct 2007 02:31:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2F6E513C4B0 for ; Mon, 29 Oct 2007 02:31:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9T2Vqp5086547 for ; Mon, 29 Oct 2007 02:31:52 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9T2Vp6G086544 for perforce@freebsd.org; Mon, 29 Oct 2007 02:31:51 GMT (envelope-from jb@freebsd.org) Date: Mon, 29 Oct 2007 02:31:51 GMT Message-Id: <200710290231.l9T2Vp6G086544@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128268 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2007 02:32:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=128268 Change 128268 by jb@jb_freebsd1 on 2007/10/29 02:31:33 Revise the include search paths. Affected files ... .. //depot/projects/dtrace/src/cddl/lib/libctf/Makefile#5 edit .. //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#15 edit .. //depot/projects/dtrace/src/cddl/lib/libnvpair/Makefile#2 edit .. //depot/projects/dtrace/src/cddl/lib/libproc/Makefile#3 edit .. //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#14 edit .. //depot/projects/dtrace/src/cddl/usr.bin/ctfdump/Makefile#6 edit .. //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#11 edit .. //depot/projects/dtrace/src/cddl/usr.bin/sgsmsg/Makefile#10 edit .. //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#7 edit Differences ... ==== //depot/projects/dtrace/src/cddl/lib/libctf/Makefile#5 (text+ko) ==== @@ -23,8 +23,8 @@ CFLAGS+= -DCTF_OLD_VERSIONS -CFLAGS+= -I${.CURDIR}/../../../sys/contrib \ - -I${.CURDIR}/../../../contrib \ +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris \ + -I${.CURDIR}/../../../compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \ -I${OPENSOLARIS_SYS_DISTDIR}/common/ctf \ ==== //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#15 (text+ko) ==== @@ -54,9 +54,8 @@ CFLAGS+= -I${.OBJDIR} \ -I${.CURDIR}/../libproc \ - -I${.CURDIR}/../../../contrib \ - -I${.CURDIR}/../../../sys/contrib \ -I${.CURDIR}/../../../sys/compat/opensolaris \ + -I${.CURDIR}/../../../compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ ==== //depot/projects/dtrace/src/cddl/lib/libnvpair/Makefile#2 (text+ko) ==== @@ -10,8 +10,8 @@ nvpair_alloc_fixed.c \ nvpair.c +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../include # XXX CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common .include ==== //depot/projects/dtrace/src/cddl/lib/libproc/Makefile#3 (text+ko) ==== @@ -13,10 +13,8 @@ #.PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common -CFLAGS+= -I${.CURDIR}/../../../contrib \ - -I${.CURDIR}/../../../sys/contrib \ - -I${.CURDIR}/../../../sys \ - -I${.CURDIR}/../../../sys/compat/opensolaris \ +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris \ + -I${.CURDIR}/../../../compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#14 (text+ko) ==== @@ -31,10 +31,8 @@ WARNS?= 6 -CFLAGS+= -I${.CURDIR}/../../../contrib/libdwarf \ - -I${.CURDIR}/../../../contrib \ - -I${.CURDIR}/../../../sys/compat/opensolaris \ - -I${.CURDIR}/../../../sys/contrib \ +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris \ + -I${.CURDIR}/../../../compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR} \ -I${OPENSOLARIS_SYS_DISTDIR} \ -I${OPENSOLARIS_USR_DISTDIR}/head \ ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfdump/Makefile#6 (text+ko) ==== @@ -15,7 +15,7 @@ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/cmd/mdb/tools/common \ -I${.CURDIR}/../../../sys/compat/opensolaris \ - -I${.CURDIR}/../../../sys/contrib \ + -I${.CURDIR}/../../../compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#11 (text+ko) ==== @@ -28,10 +28,8 @@ WARNS?= 6 -CFLAGS+= -I${.CURDIR}/../../../contrib/libdwarf \ - -I${.CURDIR}/../../../contrib \ - -I${.CURDIR}/../../../sys/compat/opensolaris \ - -I${.CURDIR}/../../../sys/contrib \ +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris \ + -I${.CURDIR}/../../../compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR} \ -I${OPENSOLARIS_SYS_DISTDIR} \ -I${OPENSOLARIS_USR_DISTDIR}/head \ ==== //depot/projects/dtrace/src/cddl/usr.bin/sgsmsg/Makefile#10 (text+ko) ==== @@ -7,8 +7,8 @@ SRCS= avl.c sgsmsg.c string_table.c findprime.c -CFLAGS+= -I${.CURDIR}/../../../contrib \ - -I${.CURDIR}/../../../sys/contrib \ +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris \ + -I${.CURDIR}/../../../compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/include \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common ==== //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#7 (text+ko) ==== @@ -10,8 +10,8 @@ WARNS= 1 -CFLAGS+= -I${.CURDIR}/../../../contrib \ - -I${.CURDIR}/../../../sys/contrib \ +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris \ + -I${.CURDIR}/../../../compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common \