I now don't seem to be able to reproduce the -DNOCLEAN buildworld

breakage with ioctl.c.  The .depend file should track dependencies
just fine, and the worst we can have is to miss new ioctls.

But I still think it's a good idea to have -DNOCLEAN build produce
the same ioctl.c as it would without -DNOCLEAN.

Prodded for a long time by:	bde

3 files changed, 5 insertions, 9 deletions

diff --git a/Makefile.inc1 b/Makefile.inc1
index 0ee0922..38e2c97 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -246,6 +246,10 @@ buildworld:
 	@echo "--------------------------------------------------------------"
 .if !defined(NOCLEAN)
 	rm -rf ${WORLDTMP}
+.else
+	# XXX - These two can depend on any header file.
+	rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/ioctl.c
+	rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c
 .endif
 .for _dir in ${USRDIRS}
 	mkdir -p ${WORLDTMP}/${_dir}
diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile
index ddafcc0..cc7bfbe 100644
--- a/usr.bin/kdump/Makefile
+++ b/usr.bin/kdump/Makefile
@@ -7,11 +7,7 @@ SRCS=	kdump.c ioctl.c subr.c
 .PATH:	${.CURDIR}/../ktrace
 CLEANFILES+=ioctl.c
 
-.if make(depend)
-ioctl.c: .PHONY
-.else
 ioctl.c: mkioctls
-.endif
 	sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/truss/Makefile b/usr.bin/truss/Makefile
index 9b43792..679f694 100644
--- a/usr.bin/truss/Makefile
+++ b/usr.bin/truss/Makefile
@@ -28,11 +28,7 @@ syscalls.h:	syscalls.master
 	/bin/sh ${.CURDIR}/../../sys/kern/makesyscalls.sh syscalls.master \
 		${.CURDIR}/i386.conf
 
-.if make(depend)
-ioctl.c:	.PHONY
-.else
-ioctl.c:	${.CURDIR}/../kdump/mkioctls
-.endif
+ioctl.c: ${.CURDIR}/../kdump/mkioctls
 	sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
 
 .include <bsd.prog.mk>