Always include Makefile.dep, conditionally including it based on the
authorjsg <jsg@openbsd.org>
Fri, 23 Jun 2017 11:54:22 +0000 (11:54 +0000)
committerjsg <jsg@openbsd.org>
Fri, 23 Jun 2017 11:54:22 +0000 (11:54 +0000)
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

index 6ee5afc..120f2d5 100644 (file)
@@ -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 <bsd.own.mk>
 
@@ -533,9 +533,7 @@ CLEANFILES+=        ${GENSRCS} ${GENONLY} ${GENOBJS} ${GNTOOLS}
 
 #-----------------------------------------------------------------------
 # Manual dependencies.
-.if !exists(.depend)
 .include  "Makefile.dep"
-.endif
 
 .include <bsd.prog.mk>
 # DO NOT DELETE