Date: Thu, 14 Sep 2000 17:17:44 +0300 From: Ruslan Ermilov <ru@sunbay.com> To: "Jordan K. Hubbard" <jkh@FreeBSD.org> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/usr.bin/kdump Makefile Message-ID: <20000914171744.A46076@sunbay.com> In-Reply-To: <20000914121416.A28533@sunbay.com>; from ru@sunbay.com on Thu, Sep 14, 2000 at 12:14:16PM %2B0300 References: <200009140620.XAA68520@freefall.freebsd.org> <20000914121416.A28533@sunbay.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Thu, Sep 14, 2000 at 12:14:16PM +0300, Ruslan Ermilov wrote:
> On Wed, Sep 13, 2000 at 11:20:08PM -0700, Jordan K. Hubbard wrote:
> > jkh 2000/09/13 23:20:07 PDT
> >
> > Modified files:
> > usr.bin/kdump Makefile
> > Log:
> > remove .PHONY to avoid gratuitous rebuild of ioctl.c each time.
> >
> > Approved by: sef
> >
> Did you read the log for rev 1.5? The auto-generated ioctl.c potentially
> depends on every ${DESTDIR}/usr/include file, so this hack was required.
> The proper fix would probably be that ioctl.c is always regenerated for
> `depend' target only.
>
Here is the patch. It will cause ioctl.c to be always re-generated on
`make depend', and this is pretty enough for -DNOCLEAN worlds to succeed.
--
Ruslan Ermilov Oracle Developer/DBA,
ru@sunbay.com Sunbay Software AG,
ru@FreeBSD.org FreeBSD committer,
+380.652.512.251 Simferopol, Ukraine
http://www.FreeBSD.org The Power To Serve
http://www.oracle.com Enabling The Information Age
[-- Attachment #2 --]
Index: kdump/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.bin/kdump/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- kdump/Makefile 2000/09/14 06:20:07 1.6
+++ kdump/Makefile 2000/09/14 13:28:24
@@ -7,7 +7,11 @@ SRCS= kdump.c ioctl.c subr.c
.PATH: ${.CURDIR}/../ktrace
CLEANFILES+=ioctl.c
-ioctl.c:
- sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ioctl.c
+.if make(depend)
+ioctl.c: .PHONY
+.else
+ioctl.c: mkioctls
+.endif
+ sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
.include <bsd.prog.mk>
Index: truss/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.bin/truss/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- truss/Makefile 2000/09/14 06:20:19 1.12
+++ truss/Makefile 2000/09/14 13:28:24
@@ -28,7 +28,11 @@ syscalls.h: syscalls.master
/bin/sh ${.CURDIR}/../../sys/kern/makesyscalls.sh syscalls.master \
${.CURDIR}/i386.conf
-ioctl.c:
- sh ${.CURDIR}/../../usr.bin/kdump/mkioctls ${DESTDIR}/usr/include > ioctl.c
+.if make(depend)
+ioctl.c: .PHONY
+.else
+ioctl.c: ${.CURDIR}/../kdump/mkioctls
+.endif
+ sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
.include <bsd.prog.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000914171744.A46076>