As far as I can tell, nothing in the build system generates .depend
files any longer, nor do they appear as prerequisites in any make
rules. The patch below removes all remaining mentions of .depend
(lists of files to clean, spurious .depend targets, etc) from the
src Makefiles.
This passed a make release on amd64.
OK?
Index: distrib/special/route/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/route/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- distrib/special/route/Makefile 12 Jun 2017 18:49:33 -0000 1.3
+++ distrib/special/route/Makefile 17 Oct 2017 11:39:21 -0000
@@ -6,7 +6,7 @@ SRCS= route.c show.c
CFLAGS+= -Wall -DSMALL
-route.o .depend tags: keywords.h
+route.o tags: keywords.h
.PATH: ${.CURDIR}/../../../sbin/route
.include <bsd.prog.mk>
Index: distrib/syspatch/bsd.syspatch.mk
===================================================================
RCS file: /cvs/src/distrib/syspatch/bsd.syspatch.mk,v
retrieving revision 1.18
diff -u -p -r1.18 bsd.syspatch.mk
--- distrib/syspatch/bsd.syspatch.mk 23 Aug 2017 13:13:37 -0000 1.18
+++ distrib/syspatch/bsd.syspatch.mk 17 Oct 2017 11:39:21 -0000
@@ -69,7 +69,7 @@ all: ${_BUILD_COOKIE}
.if !target(clean)
clean:
- rm -rf .depend ${ERRATA} ${SYSPATCH}
+ rm -rf ${ERRATA} ${SYSPATCH}
.endif
depend:
Index: lib/libedit/Makefile
===================================================================
RCS file: /cvs/src/lib/libedit/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- lib/libedit/Makefile 10 Jul 2017 21:30:37 -0000 1.29
+++ lib/libedit/Makefile 17 Oct 2017 11:39:21 -0000
@@ -17,7 +17,7 @@ INCS= histedit.h
INCSDIR=/usr/include
CLEANFILES+=common.h.tmp emacs.h.tmp fcns.h.tmp func.h.tmp
-CLEANFILES+=help.h.tmp vi.h.tmp tc1.o tc1 .depend
+CLEANFILES+=help.h.tmp vi.h.tmp tc1.o tc1
CFLAGS+=-Wall
CPPFLAGS+=-I. -I${LIBEDITDIR}
Index: share/mk/bsd.dep.mk
===================================================================
RCS file: /cvs/src/share/mk/bsd.dep.mk,v
retrieving revision 1.23
diff -u -p -r1.23 bsd.dep.mk
--- share/mk/bsd.dep.mk 12 Aug 2017 00:03:15 -0000 1.23
+++ share/mk/bsd.dep.mk 17 Oct 2017 11:39:21 -0000
@@ -55,7 +55,7 @@ cleandepend:
rm -f ${.CURDIR}/tags
.endif
-CLEANFILES += ${DEPS} .depend
+CLEANFILES += ${DEPS}
BUILDFIRST ?=
BUILDAFTER ?=
Index: sys/arch/amd64/stand/biosboot/Makefile
===================================================================
RCS file: /cvs/src/sys/arch/amd64/stand/biosboot/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- sys/arch/amd64/stand/biosboot/Makefile 30 May 2017 22:32:10 -0000
1.12
+++ sys/arch/amd64/stand/biosboot/Makefile 17 Oct 2017 11:39:21 -0000
@@ -13,7 +13,7 @@ LDFLAGS=-nostdlib -Ttext 0 -N -x -Bstati
LDFLAGS+=-melf_i386 -L/usr/libdata
INSTALL_STRIP=
-.depend biosboot.o: assym.h
+biosboot.o: assym.h
${PROG}: $(OBJS)
@rm -f $(PROG)
Index: sys/arch/amd64/stand/boot/Makefile
===================================================================
RCS file: /cvs/src/sys/arch/amd64/stand/boot/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- sys/arch/amd64/stand/boot/Makefile 19 Jun 2017 22:50:50 -0000 1.38
+++ sys/arch/amd64/stand/boot/Makefile 17 Oct 2017 11:39:21 -0000
@@ -56,7 +56,7 @@ boot.bin: boot
CLEANFILES+= ${PROG}.new
-.depend srt0.o gidt.o: assym.h
+srt0.o gidt.o: assym.h
${PROG}: $(OBJS)
$(LD) $(LDFLAGS) -o ${PROG}.new $(OBJS)
Index: sys/arch/amd64/stand/cdboot/Makefile
===================================================================
RCS file: /cvs/src/sys/arch/amd64/stand/cdboot/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- sys/arch/amd64/stand/cdboot/Makefile 30 May 2017 22:32:10 -0000
1.33
+++ sys/arch/amd64/stand/cdboot/Makefile 17 Oct 2017 11:39:22 -0000
@@ -41,7 +41,7 @@ SRCS+= divdi3.c moddi3.c qdivrem.c
.PATH: ${S}/lib/libz
SRCS+= adler32.c crc32.c inflate.c inftrees.c
-.depend srt0.o gidt.o: assym.h
+srt0.o gidt.o: assym.h
${PROG}: $(OBJS)
$(LD) $(LDFLAGS) -o ${PROG} $(OBJS)
Index: sys/arch/amd64/stand/mbr/Makefile
===================================================================
RCS file: /cvs/src/sys/arch/amd64/stand/mbr/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- sys/arch/amd64/stand/mbr/Makefile 30 Jul 2016 03:25:48 -0000 1.11
+++ sys/arch/amd64/stand/mbr/Makefile 17 Oct 2017 11:39:22 -0000
@@ -21,7 +21,7 @@ INSTALL_STRIP=
# Uncomment this to make mbr talk to a serial port.
#CPPFLAGS+=-DSERIAL=0
-.depend mbr.o: assym.h
+mbr.o: assym.h
${PROG}: $(OBJS)
$(LD) $(LDFLAGS) -o $(PROG) $(OBJS)
Index: sys/arch/amd64/stand/pxeboot/Makefile
===================================================================
RCS file: /cvs/src/sys/arch/amd64/stand/pxeboot/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- sys/arch/amd64/stand/pxeboot/Makefile 30 May 2017 22:32:10 -0000
1.31
+++ sys/arch/amd64/stand/pxeboot/Makefile 17 Oct 2017 11:39:22 -0000
@@ -47,7 +47,7 @@ SRCS+= divdi3.c moddi3.c qdivrem.c udivd
.PATH: ${S}/lib/libz
SRCS+= adler32.c crc32.c inflate.c inftrees.c
-.depend srt0.o gidt.o pxe_call.o: assym.h
+srt0.o gidt.o pxe_call.o: assym.h
${PROG}: $(OBJS)
$(LD) $(LDFLAGS) -o ${PROG} $(OBJS)
Index: sys/arch/i386/stand/biosboot/Makefile
===================================================================
RCS file: /cvs/src/sys/arch/i386/stand/biosboot/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- sys/arch/i386/stand/biosboot/Makefile 1 Jun 2017 11:18:53 -0000
1.28
+++ sys/arch/i386/stand/biosboot/Makefile 17 Oct 2017 11:39:22 -0000
@@ -12,7 +12,7 @@ LD=ld
LDFLAGS=-nostdlib -Ttext 0 -N -x -Bstatic -nopie -znorelro
INSTALL_STRIP=
-.depend biosboot.o: assym.h
+biosboot.o: assym.h
${PROG}: $(OBJS)
@rm -f $(PROG)
Index: sys/arch/i386/stand/boot/Makefile
===================================================================
RCS file: /cvs/src/sys/arch/i386/stand/boot/Makefile,v
retrieving revision 1.66
diff -u -p -r1.66 Makefile
--- sys/arch/i386/stand/boot/Makefile 19 Jun 2017 22:50:50 -0000 1.66
+++ sys/arch/i386/stand/boot/Makefile 17 Oct 2017 11:39:22 -0000
@@ -60,7 +60,7 @@ boot.bin: boot
CLEANFILES+= ${PROG}.new
-.depend srt0.o gidt.o: assym.h
+srt0.o gidt.o: assym.h
${PROG}: $(OBJS)
$(LD) $(LDFLAGS) -o ${PROG}.new $(OBJS)
Index: sys/arch/i386/stand/cdboot/Makefile
===================================================================
RCS file: /cvs/src/sys/arch/i386/stand/cdboot/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- sys/arch/i386/stand/cdboot/Makefile 1 Jun 2017 11:18:53 -0000 1.30
+++ sys/arch/i386/stand/cdboot/Makefile 17 Oct 2017 11:39:22 -0000
@@ -46,7 +46,7 @@ SRCS+= strlcpy.c
.PATH: ${S}/lib/libz
SRCS+= adler32.c crc32.c inflate.c inftrees.c
-.depend srt0.o gidt.o: assym.h
+srt0.o gidt.o: assym.h
${PROG}: $(OBJS)
$(LD) $(LDFLAGS) -o ${PROG} $(OBJS)
Index: sys/arch/i386/stand/mbr/Makefile
===================================================================
RCS file: /cvs/src/sys/arch/i386/stand/mbr/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- sys/arch/i386/stand/mbr/Makefile 30 Jul 2016 03:25:48 -0000 1.20
+++ sys/arch/i386/stand/mbr/Makefile 17 Oct 2017 11:39:22 -0000
@@ -19,7 +19,7 @@ INSTALL_STRIP=
# Uncomment this to make mbr talk to a serial port.
#CPPFLAGS+=-DSERIAL=0
-.depend mbr.o: assym.h
+mbr.o: assym.h
${PROG}: $(OBJS)
$(LD) $(LDFLAGS) -o $(PROG) $(OBJS)
Index: sys/arch/i386/stand/pxeboot/Makefile
===================================================================
RCS file: /cvs/src/sys/arch/i386/stand/pxeboot/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- sys/arch/i386/stand/pxeboot/Makefile 1 Jun 2017 11:18:53 -0000
1.27
+++ sys/arch/i386/stand/pxeboot/Makefile 17 Oct 2017 11:39:22 -0000
@@ -48,7 +48,7 @@ SRCS+= strlcpy.c
.PATH: ${S}/lib/libz
SRCS+= adler32.c crc32.c inflate.c inftrees.c
-.depend srt0.o gidt.o pxe_call.o: assym.h
+srt0.o gidt.o pxe_call.o: assym.h
${PROG}: $(OBJS)
$(LD) $(LDFLAGS) -o ${PROG} $(OBJS)
Index: sys/arch/sparc64/stand/bootblk/Makefile
===================================================================
RCS file: /cvs/src/sys/arch/sparc64/stand/bootblk/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- sys/arch/sparc64/stand/bootblk/Makefile 6 Nov 2016 16:04:20 -0000
1.13
+++ sys/arch/sparc64/stand/bootblk/Makefile 17 Oct 2017 11:39:22 -0000
@@ -39,9 +39,6 @@ bootblk.text: bootblk.fth assym.fth.h
bootblk: bootblk.fth assym.fth.h
fgen -o bootblk ${.CURDIR}/bootblk.fth
-beforedepend:
- @touch .depend
-
beforeinstall:
${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
bootblk ${DESTDIR}/usr/mdec
Index: sys/dev/microcode/aic7xxx/Makefile
===================================================================
RCS file: /cvs/src/sys/dev/microcode/aic7xxx/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- sys/dev/microcode/aic7xxx/Makefile 19 Jul 2017 12:50:32 -0000 1.12
+++ sys/dev/microcode/aic7xxx/Makefile 17 Oct 2017 11:39:22 -0000
@@ -15,10 +15,8 @@ LDADD+= -ll
CC=${HOSTCC}
# Correct path for kernel builds
-# Don't rely on the kernel's .depend file
.ifdef MAKESRCPATH
.PATH: ${MAKESRCPATH}
-DEPENDFILE=
.endif
CFLAGS+= -I. -I${.CURDIR}
Index: usr.bin/rdist/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/rdist/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- usr.bin/rdist/Makefile 9 Jul 2017 14:04:50 -0000 1.20
+++ usr.bin/rdist/Makefile 17 Oct 2017 11:39:22 -0000
@@ -8,5 +8,3 @@ SRCS= gram.y child.c client.c common.c d
WARNINGS=yes
.include <bsd.prog.mk>
-
-.depend: gram.c
--
Christian "naddy" Weisgerber na...@mips.inka.de
