Module Name: src
Committed By: martin
Date: Fri Jan 10 15:00:16 UTC 2014
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile
src/lib/librumphijack: Makefile
src/regress/sys/kern/ras/ras1: Makefile
src/regress/sys/kern/ras/ras2: Makefile
src/regress/sys/kern/ras/ras3: Makefile
src/sys/sys: Makefile
Log Message:
ACTIVE_CC can only be used after include of bsd.own.mk
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
cvs rdiff -u -r1.13 -r1.14 src/lib/librumphijack/Makefile
cvs rdiff -u -r1.6 -r1.7 src/regress/sys/kern/ras/ras1/Makefile
cvs rdiff -u -r1.6 -r1.7 src/regress/sys/kern/ras/ras2/Makefile
cvs rdiff -u -r1.6 -r1.7 src/regress/sys/kern/ras/ras3/Makefile
cvs rdiff -u -r1.145 -r1.146 src/sys/sys/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.18 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.19
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.18 Wed Apr 13 16:18:14 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Fri Jan 10 15:00:16 2014
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2011/04/13 16:18:14 macallan Exp $
+# $NetBSD: Makefile,v 1.19 2014/01/10 15:00:16 martin Exp $
+.include <bsd.own.mk> # prerequisite for bsd.sys.mk
.include <bsd.sys.mk> # for HOST_SH
.include "../../../Makefile.serverlib"
Index: src/lib/librumphijack/Makefile
diff -u src/lib/librumphijack/Makefile:1.13 src/lib/librumphijack/Makefile:1.14
--- src/lib/librumphijack/Makefile:1.13 Tue Sep 10 16:53:06 2013
+++ src/lib/librumphijack/Makefile Fri Jan 10 15:00:16 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2013/09/10 16:53:06 pooka Exp $
+# $NetBSD: Makefile,v 1.14 2014/01/10 15:00:16 martin Exp $
#
LIB= rumphijack
@@ -18,6 +18,7 @@ WARNS?= 5
# a stack frame
COPTS.hijackdlsym.c+= -O0
+.include <bsd.own.mk> # prerequisite for bsd.sys.mk
.include <bsd.sys.mk>
CPPFLAGS+= -U_FORTIFY_SOURCE
Index: src/regress/sys/kern/ras/ras1/Makefile
diff -u src/regress/sys/kern/ras/ras1/Makefile:1.6 src/regress/sys/kern/ras/ras1/Makefile:1.7
--- src/regress/sys/kern/ras/ras1/Makefile:1.6 Wed Apr 4 10:59:47 2012
+++ src/regress/sys/kern/ras/ras1/Makefile Fri Jan 10 15:00:16 2014
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2012/04/04 10:59:47 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2014/01/10 15:00:16 martin Exp $
+
+.include <bsd.own.mk> # ACVTIVE_CC
NOMAN= #defined
Index: src/regress/sys/kern/ras/ras2/Makefile
diff -u src/regress/sys/kern/ras/ras2/Makefile:1.6 src/regress/sys/kern/ras/ras2/Makefile:1.7
--- src/regress/sys/kern/ras/ras2/Makefile:1.6 Wed Apr 4 10:59:47 2012
+++ src/regress/sys/kern/ras/ras2/Makefile Fri Jan 10 15:00:16 2014
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2012/04/04 10:59:47 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2014/01/10 15:00:16 martin Exp $
+
+.include <bsd.own.mk> # ACVTIVE_CC
NOMAN= #defined
Index: src/regress/sys/kern/ras/ras3/Makefile
diff -u src/regress/sys/kern/ras/ras3/Makefile:1.6 src/regress/sys/kern/ras/ras3/Makefile:1.7
--- src/regress/sys/kern/ras/ras3/Makefile:1.6 Wed Apr 4 10:59:47 2012
+++ src/regress/sys/kern/ras/ras3/Makefile Fri Jan 10 15:00:16 2014
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2012/04/04 10:59:47 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2014/01/10 15:00:16 martin Exp $
+
+.include <bsd.own.mk> # ACVTIVE_CC
NOMAN= #defined
PROG= ras3
Index: src/sys/sys/Makefile
diff -u src/sys/sys/Makefile:1.145 src/sys/sys/Makefile:1.146
--- src/sys/sys/Makefile:1.145 Wed Dec 11 01:24:08 2013
+++ src/sys/sys/Makefile Fri Jan 10 15:00:16 2014
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.145 2013/12/11 01:24:08 joerg Exp $
+# $NetBSD: Makefile,v 1.146 2014/01/10 15:00:16 martin Exp $
+.include <bsd.own.mk> # prerequisite for bsd.sys.mk
.include <bsd.sys.mk>
INCSDIR= /usr/include/sys
