diff options
author | sjg <sjg@FreeBSD.org> | 2014-05-08 23:54:15 +0000 |
---|---|---|
committer | sjg <sjg@FreeBSD.org> | 2014-05-08 23:54:15 +0000 |
commit | ed3fc70bf5a8edaf648093b11acca450802244ef (patch) | |
tree | 8ce0ddd0e6f508bd20c77429c448969589170fae /gnu | |
parent | d4e443e0426fee44056ba3c1123455666d083aef (diff) | |
parent | a2e6be0add027bf3e713c0d56ba9715b83a01144 (diff) | |
download | FreeBSD-src-ed3fc70bf5a8edaf648093b11acca450802244ef.zip FreeBSD-src-ed3fc70bf5a8edaf648093b11acca450802244ef.tar.gz |
Merge from head
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/Makefile | 2 | ||||
-rw-r--r-- | gnu/lib/Makefile | 2 | ||||
-rw-r--r-- | gnu/lib/csu/Makefile | 2 | ||||
-rw-r--r-- | gnu/lib/libgcc/Makefile | 2 | ||||
-rw-r--r-- | gnu/lib/libgcov/Makefile | 2 | ||||
-rw-r--r-- | gnu/lib/libstdc++/Makefile | 2 | ||||
-rw-r--r-- | gnu/lib/libsupc++/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/binutils/as/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/binutils/ld/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/cc/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/cc/Makefile.inc | 1 | ||||
-rw-r--r-- | gnu/usr.bin/cc/c++/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/cc/cc/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/cc/cc1/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/cc/cc1plus/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/cc/cc_tools/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/cc/cpp/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/dialog/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/grep/Makefile | 2 |
20 files changed, 20 insertions, 19 deletions
diff --git a/gnu/Makefile b/gnu/Makefile index b460590..25480c7 100644 --- a/gnu/Makefile +++ b/gnu/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 5.33.1.1 (Berkeley) 5/6/91 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> SUBDIR= lib ${_tests} usr.bin diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 0a607d7..2651eef 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> SUBDIR= csu libgcc libgcov libdialog libgomp libregex libreadline diff --git a/gnu/lib/csu/Makefile b/gnu/lib/csu/Makefile index 5aba49f..0a2c7d3 100644 --- a/gnu/lib/csu/Makefile +++ b/gnu/lib/csu/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> MK_SSP= no GCCDIR= ${.CURDIR}/../../../contrib/gcc diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile index d3befcb..11af430 100644 --- a/gnu/lib/libgcc/Makefile +++ b/gnu/lib/libgcc/Makefile @@ -6,7 +6,7 @@ GCCLIB= ${.CURDIR}/../../../contrib/gcclibs SHLIB_NAME= libgcc_s.so.1 SHLIBDIR?= /lib -.include <bsd.own.mk> +.include <src.opts.mk> # # libgcc is linked in last and thus cannot depend on ssp symbols coming # from earlier libraries. Disable stack protection for this library. diff --git a/gnu/lib/libgcov/Makefile b/gnu/lib/libgcov/Makefile index aab6241..5292f9f 100644 --- a/gnu/lib/libgcov/Makefile +++ b/gnu/lib/libgcov/Makefile @@ -3,7 +3,7 @@ MK_PROFILE= no MK_SSP= no -.include <bsd.own.mk> +.include <src.opts.mk> .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt" GCCDIR= ${.CURDIR}/../../../contrib/gcc diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile index b0d45d6..d19f9f3 100644 --- a/gnu/lib/libstdc++/Makefile +++ b/gnu/lib/libstdc++/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> GCCVER= 4.2 GCCDIR= ${.CURDIR}/../../../contrib/gcc diff --git a/gnu/lib/libsupc++/Makefile b/gnu/lib/libsupc++/Makefile index acf1b58..5cc5f04 100644 --- a/gnu/lib/libsupc++/Makefile +++ b/gnu/lib/libsupc++/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> GCCVER= 4.2 GCCDIR= ${.CURDIR}/../../../contrib/gcc diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index 7e96a6f..7633069 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> SUBDIR= ${_binutils} \ ${_cc} \ diff --git a/gnu/usr.bin/binutils/as/Makefile b/gnu/usr.bin/binutils/as/Makefile index 4436394..c058727 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 <bsd.own.mk> +.include <src.opts.mk> .PATH: ${SRCDIR}/gas ${SRCDIR}/gas/config diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile index dff1121..81a46d5 100644 --- a/gnu/usr.bin/binutils/ld/Makefile +++ b/gnu/usr.bin/binutils/ld/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ .include "../Makefile.inc0" -.include <bsd.own.mk> +.include <src.opts.mk> .PATH: ${SRCDIR}/ld 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 <bsd.own.mk> +.include <src.opts.mk> # 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 <src.opts.mk> .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 <bsd.own.mk> +.include <src.opts.mk> .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 <bsd.own.mk> +.include <src.opts.mk> .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 <bsd.own.mk> +.include <src.opts.mk> .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 <bsd.own.mk> +.include <src.opts.mk> .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 <bsd.own.mk> +.include <src.opts.mk> 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 <bsd.own.mk> +.include <src.opts.mk> .include "../Makefile.inc" .include "../Makefile.fe" diff --git a/gnu/usr.bin/dialog/Makefile b/gnu/usr.bin/dialog/Makefile index 7c98cfc..a7e0a57 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 <bsd.own.mk> +.include <src.opts.mk> .if ${MK_NCURSESW} == "no" DPADD+= ${LIBNCURSES} diff --git a/gnu/usr.bin/grep/Makefile b/gnu/usr.bin/grep/Makefile index 7d3b607..d412dfd 100644 --- a/gnu/usr.bin/grep/Makefile +++ b/gnu/usr.bin/grep/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> GREP_LIBZ=YES |