Date: Mon, 29 Oct 2007 02:31:51 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 128268 for review Message-ID: <200710290231.l9T2Vp6G086544@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.lib.mk> ==== //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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200710290231.l9T2Vp6G086544>