From b66f60be62bc104c1885bbdb0b757a79a597b229 Mon Sep 17 00:00:00 2001 From: jsg Date: Fri, 23 Jun 2017 11:54:22 +0000 Subject: [PATCH] Always include Makefile.dep, conditionally including it based on the existence of a .depend file can lead to various problems. The logic before rev 1.15 resulted in Makefile.dep always being included as DEPENDSFILE was never set so this returns to the old behaviour. ok espie@ --- gnu/usr.bin/cc/cc_tools/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile index 6ee5afcf63d..120f2d5675b 100644 --- a/gnu/usr.bin/cc/cc_tools/Makefile +++ b/gnu/usr.bin/cc/cc_tools/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.88.8.1 2009/04/15 03:14:26 kensmith Exp $ -# $OpenBSD: Makefile,v 1.15 2017/06/21 00:10:23 espie Exp $ +# $OpenBSD: Makefile,v 1.16 2017/06/23 11:54:22 jsg Exp $ .include @@ -533,9 +533,7 @@ CLEANFILES+= ${GENSRCS} ${GENONLY} ${GENOBJS} ${GNTOOLS} #----------------------------------------------------------------------- # Manual dependencies. -.if !exists(.depend) .include "Makefile.dep" -.endif .include # DO NOT DELETE -- 2.20.1