From owner-cvs-src@FreeBSD.ORG Tue Oct 25 06:17:05 2005 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 473C716A41F; Tue, 25 Oct 2005 06:17:05 +0000 (GMT) (envelope-from nate@root.org) Received: from ylpvm12.prodigy.net (ylpvm12-ext.prodigy.net [207.115.57.43]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A4EF43D48; Tue, 25 Oct 2005 06:17:03 +0000 (GMT) (envelope-from nate@root.org) Received: from pimout5-ext.prodigy.net (pimout5-int.prodigy.net [207.115.4.21]) by ylpvm12.prodigy.net (8.12.10 outbound/8.12.10) with ESMTP id j9P6HSTl012716; Tue, 25 Oct 2005 02:17:28 -0400 X-ORBL: [71.139.0.107] Received: from [10.0.0.242] (ppp-71-139-0-107.dsl.snfc21.pacbell.net [71.139.0.107]) by pimout5-ext.prodigy.net (8.13.4 outbound domainkey aix/8.13.4) with ESMTP id j9P6GwxW158370; Tue, 25 Oct 2005 02:16:59 -0400 Message-ID: <435DCDE7.4010101@root.org> Date: Mon, 24 Oct 2005 23:17:11 -0700 From: Nate Lawson User-Agent: Mozilla Thunderbird 1.0.7 (Windows/20050923) X-Accept-Language: en-us, en MIME-Version: 1.0 To: obrien@FreeBSD.org References: <200510240440.j9O4ecBQ063762@repoman.freebsd.org> <435D0798.2090306@samsco.org> <20051025054935.GH55418@dragon.NUXI.org> In-Reply-To: <20051025054935.GH55418@dragon.NUXI.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: cvs-src@FreeBSD.org, Scott Long , src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/conf kern.pre.mk X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Oct 2005 06:17:05 -0000 David O'Brien wrote: > On Mon, Oct 24, 2005 at 10:11:04AM -0600, Scott Long wrote: > >>David E. O'Brien wrote: >> >>>obrien 2005-10-24 04:40:38 UTC >>> >>> FreeBSD src repository >>> >>> Modified files: >>> sys/conf kern.pre.mk >>> Log: >>> We no longer need INCLUDES+= -I$S/contrib/dev/acpica. >>> >>> Revision Changes Path >>> 1.73 +2 -5 src/sys/conf/kern.pre.mk >> >>Why is this so important? Why is it worth conflicts with vendor code? > > > How does it conflict with vendor code? > See the recient archives of why it is wrong to have -I's in kern.pre.mk > and how it only started in BSD .mk files when msmith imported acpica > (Makefile.i386 rev 2.111). > [only to later start mundging the files before importing them.] > > Warner also seems to have thought it wasn't good to polute the build of > all files with global -I's: > > RCS file: /home/ncvs/src/sys/conf/Makefile.i386,v > .. > revision 1.265 > date: 2005/04/13 14:49:57; author: imp; state: Exp; lines: +0 -2 > .. > Also, move the -I stuff to the centralized kern.pre.mk. However, it > might be better to add these flags to files.conf. > .. I think this is a pretty minor gain also. There are other similar areas that could benefit much more from some Makefile-reworking (especially the handling for .m files at the top of sys/conf/files). However, since we already bash the acpi-ca distro with a hammer (see acpica_prep.sh), this was a minor enough change to tolerate. -Nate