[src/trunk]: src/external/gpl3/gcc/usr.bin/cpp make sure Makefile.inc is incl...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/edf1c9405bd1
branches:  trunk
changeset: 448787:edf1c9405bd1
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Feb 09 07:32:50 2019 +0000

description:
make sure Makefile.inc is included before Makefile.driver.

allows removing a depend hack and may also fix dtrace/ctf builds.

diffstat:

 external/gpl3/gcc/usr.bin/cpp/Makefile |  11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diffs (35 lines):

diff -r b91a66eb4a44 -r edf1c9405bd1 external/gpl3/gcc/usr.bin/cpp/Makefile
--- a/external/gpl3/gcc/usr.bin/cpp/Makefile    Sat Feb 09 07:20:21 2019 +0000
+++ b/external/gpl3/gcc/usr.bin/cpp/Makefile    Sat Feb 09 07:32:50 2019 +0000
@@ -1,8 +1,11 @@
-#      $NetBSD: Makefile,v 1.10 2019/02/01 10:36:33 mrg Exp $
+#      $NetBSD: Makefile,v 1.11 2019/02/09 07:32:50 mrg Exp $
+
+.include <bsd.init.mk>
 
 PROG=          cpp
 SRCS=          cppspec.c ${G_GCC_OBJS:.o=.c}
 
+.include "../Makefile.driver"
 .include "../Makefile.target-defines"
 
 COPTS+=                -Wno-stack-protector
@@ -18,11 +21,8 @@
 LDADD+=                -lintl
 DPADD+=                ${LIBINTL}
 
-.include <bsd.own.mk>
-
 ADD_FRONTEND_LIBRARY=  no
 .include "../Makefile.frontend"
-.include "../Makefile.driver"
 
 ${SRCS}: ${GCCARCH}/defs.mk
 
@@ -33,6 +33,3 @@
 .PATH: ${DIST}/gcc ${DIST}/gcc/c-family ${DIST}/gcc/doc
 
 cpp.info: gcc-vers.texi
-
-# XXX - driver-i386.o isn't built otherwise
-${PROG}: ${OBJS}