From owner-cvs-all@FreeBSD.ORG Mon Apr 25 23:03:16 2005 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 334CB16A4CE; Mon, 25 Apr 2005 23:03:16 +0000 (GMT) Received: from kane.otenet.gr (kane.otenet.gr [195.170.0.27]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5938843D58; Mon, 25 Apr 2005 23:03:15 +0000 (GMT) (envelope-from keramida@freebsd.org) Received: from gothmog.gr (patr530-a172.otenet.gr [212.205.215.172]) j3PN1wTx032557; Tue, 26 Apr 2005 02:01:58 +0300 Received: from gothmog.gr (gothmog [127.0.0.1]) by gothmog.gr (8.13.3/8.13.3) with ESMTP id j3PN2wZZ043825; Tue, 26 Apr 2005 02:02:58 +0300 (EEST) (envelope-from keramida@freebsd.org) Received: (from giorgos@localhost) by gothmog.gr (8.13.3/8.13.3/Submit) id j3PN2waR043824; Tue, 26 Apr 2005 02:02:58 +0300 (EEST) (envelope-from keramida@freebsd.org) Date: Tue, 26 Apr 2005 02:02:58 +0300 From: Giorgos Keramidas To: Darren Reed Message-ID: <20050425230258.GA43254@gothmog.gr> References: <200504251855.j3PItq62024205@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200504251855.j3PItq62024205@repoman.freebsd.org> cc: cvs-src@freebsd.org cc: src-committers@freebsd.org cc: cvs-all@freebsd.org Subject: Re: cvs commit: src/sbin/ipf Makefile Makefile.inc src/sbin/ipf/ipf Makefile src/sbin/ipf/ipfs Makefile src/sbin/ipf/ipfstat Makefile src/sbin/ipf/ipftest Makefile src/sbin/ipf/ipmon Makefile src/sbin/ipf/ipnat Makefile src/sbin/ipf/ippool Makefile ... X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Apr 2005 23:03:16 -0000 On 2005-04-25 18:55, Darren Reed wrote: >create a new build heirarchy for ipfilter tools > >Revision Changes Path >1.16 +6 -16 src/sbin/ipf/Makefile >1.1 +24 -0 src/sbin/ipf/Makefile.inc (new) >1.1 +44 -0 src/sbin/ipf/ipf/Makefile (new) >[...] Hi Darren, this breaks the src/rescue/rescue build, because one more level is introduced for the IP Filter tools and the ipl.h header cannot be located without src/sys/contrib/ipfilter/netinet/ in the include path too. The following seems to fix the build of at least src/rescue here, at least until the link stage. Then it breaks again because of a missing libipf :-( %%% Index: rescue/rescue/Makefile =================================================================== RCS file: /home/ncvs/src/rescue/rescue/Makefile,v retrieving revision 1.42 diff -u -r1.42 Makefile --- rescue/rescue/Makefile 18 Mar 2005 12:55:07 -0000 1.42 +++ rescue/rescue/Makefile 25 Apr 2005 22:05:19 -0000 @@ -124,7 +124,8 @@ .endif .if !defined(NO_IPFILTER) -CRUNCH_PROGS_sbin+= ipf ipfs ipfstat ipmon ipnat +CRUNCH_SRCDIRS += sbin/ipf +CRUNCH_PROGS_sbin/ipf += ipf ipfs ipfstat ipmon ipnat .endif # crunchgen does not like C++ programs; this should be fixed someday Index: sbin/ipf/Makefile.inc =================================================================== RCS file: /home/ncvs/src/sbin/ipf/Makefile.inc,v retrieving revision 1.1 diff -u -r1.1 Makefile.inc --- sbin/ipf/Makefile.inc 25 Apr 2005 18:55:50 -0000 1.1 +++ sbin/ipf/Makefile.inc 25 Apr 2005 21:57:36 -0000 @@ -6,6 +6,7 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ipfilter/tools CFLAGS+= -I${.CURDIR}/../../../sys CFLAGS+= -I${.CURDIR}/../../../sys/contrib/ipfilter +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/ipfilter/netinet CFLAGS+= -DSTATETOP -D__UIO_EXPOSE IPFOBJDIR= ${.OBJDIR}/../libipf %%%