From 2118f42afd6189d38de35003e029021c0917f7e8 Mon Sep 17 00:00:00 2001 From: imp 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/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 +- 8 files changed, 8 insertions(+), 7 deletions(-) (limited to 'gnu/usr.bin/cc') diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile index bf6d20c..313aaf2 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 39adc91..dc97799 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 1e7f339..39f372b 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 ba53565..0fd82e0 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 e73b2c9..368517c 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 742d7c6..64a0725 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 8f75f43..ae7f8b8 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 a8e48af..a3ac04b 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" -- cgit v1.1