From c6063d0da8e1f8d8452b0c2ee1c7ad718c1a7052 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Tue, 6 May 2014 04:22:01 +0000 Subject: Use src.opts.mk in preference to bsd.own.mk except where we need stuff from the latter. --- gnu/usr.bin/Makefile | 2 +- gnu/usr.bin/binutils/as/Makefile | 2 +- gnu/usr.bin/binutils/ld/Makefile | 2 +- gnu/usr.bin/cc/Makefile | 2 +- gnu/usr.bin/cc/Makefile.inc | 1 + gnu/usr.bin/cc/c++/Makefile | 2 +- gnu/usr.bin/cc/cc/Makefile | 2 +- gnu/usr.bin/cc/cc1/Makefile | 2 +- gnu/usr.bin/cc/cc1plus/Makefile | 2 +- gnu/usr.bin/cc/cc_tools/Makefile | 2 +- gnu/usr.bin/cc/cpp/Makefile | 2 +- gnu/usr.bin/dialog/Makefile | 2 +- gnu/usr.bin/grep/Makefile | 2 +- 13 files changed, 13 insertions(+), 12 deletions(-) (limited to 'gnu/usr.bin') diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index 7e96a6f4829f3..76330699dffa3 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include SUBDIR= ${_binutils} \ ${_cc} \ diff --git a/gnu/usr.bin/binutils/as/Makefile b/gnu/usr.bin/binutils/as/Makefile index 4436394f5de43..c058727069e7e 100644 --- a/gnu/usr.bin/binutils/as/Makefile +++ b/gnu/usr.bin/binutils/as/Makefile @@ -4,7 +4,7 @@ # BINDIR .include "${.CURDIR}/../../Makefile.inc" .include "${.CURDIR}/../Makefile.inc0" -.include +.include .PATH: ${SRCDIR}/gas ${SRCDIR}/gas/config diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile index dff112169eba2..81a46d5d21b0b 100644 --- a/gnu/usr.bin/binutils/ld/Makefile +++ b/gnu/usr.bin/binutils/ld/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ .include "../Makefile.inc0" -.include +.include .PATH: ${SRCDIR}/ld diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile index bf6d20c79ce4c..313aaf2da84f4 100644 --- a/gnu/usr.bin/cc/Makefile +++ b/gnu/usr.bin/cc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include # The order of some of these are rather important. Some depend on previous # subdirs. diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc index 39adc91308e7f..dc9779973210d 100644 --- a/gnu/usr.bin/cc/Makefile.inc +++ b/gnu/usr.bin/cc/Makefile.inc @@ -1,5 +1,6 @@ # $FreeBSD$ +.include .include "../Makefile.inc" # Sometimes this is .include'd several times... diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile index 1e7f33959f36a..39f372b2d8886 100644 --- a/gnu/usr.bin/cc/c++/Makefile +++ b/gnu/usr.bin/cc/c++/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ MAN= -.include +.include .include "../Makefile.inc" .include "../Makefile.fe" diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile index ba53565c35f71..0fd82e092db4a 100644 --- a/gnu/usr.bin/cc/cc/Makefile +++ b/gnu/usr.bin/cc/cc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include .include "../Makefile.inc" .include "../Makefile.fe" diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile index e73b2c9911940..368517c1be009 100644 --- a/gnu/usr.bin/cc/cc1/Makefile +++ b/gnu/usr.bin/cc/cc1/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ MAN= -.include +.include .include "../Makefile.inc" diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile index 742d7c6d41f2b..64a07255e0110 100644 --- a/gnu/usr.bin/cc/cc1plus/Makefile +++ b/gnu/usr.bin/cc/cc1plus/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ MAN= -.include +.include .include "../Makefile.inc" diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile index 8f75f43aadda0..ae7f8b82d17d1 100644 --- a/gnu/usr.bin/cc/cc_tools/Makefile +++ b/gnu/usr.bin/cc/cc_tools/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include CFLAGS+= -I. diff --git a/gnu/usr.bin/cc/cpp/Makefile b/gnu/usr.bin/cc/cpp/Makefile index a8e48af2d02c1..a3ac04b909e33 100644 --- a/gnu/usr.bin/cc/cpp/Makefile +++ b/gnu/usr.bin/cc/cpp/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include .include "../Makefile.inc" .include "../Makefile.fe" diff --git a/gnu/usr.bin/dialog/Makefile b/gnu/usr.bin/dialog/Makefile index 7c98cfc062c84..a7e0a57ad594f 100644 --- a/gnu/usr.bin/dialog/Makefile +++ b/gnu/usr.bin/dialog/Makefile @@ -10,7 +10,7 @@ CFLAGS+= -I${.CURDIR} -I${DIALOG} WARNS?= 6 -.include +.include .if ${MK_NCURSESW} == "no" DPADD+= ${LIBNCURSES} diff --git a/gnu/usr.bin/grep/Makefile b/gnu/usr.bin/grep/Makefile index 7d3b60769b8d2..d412dfdfd0ed9 100644 --- a/gnu/usr.bin/grep/Makefile +++ b/gnu/usr.bin/grep/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include GREP_LIBZ=YES -- cgit v1.3