Module Name: src
Committed By: joerg
Date: Sun Apr 10 16:47:05 UTC 2011
Modified Files:
src/gnu/usr.bin/gdb6/gdb: Makefile
src/gnu/usr.bin/gdb6/gdbtui: Makefile
src/gnu/usr.bin/gdb6/libgdb: Makefile
src/sbin/mount_ffs: Makefile
src/sbin/mount_hfs: Makefile
src/sbin/mount_nfs: Makefile
Log Message:
Extend CPPFLAGS, don't replace it
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/gnu/usr.bin/gdb6/gdb/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/gdb6/gdbtui/Makefile
cvs rdiff -u -r1.10 -r1.11 src/gnu/usr.bin/gdb6/libgdb/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sbin/mount_ffs/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sbin/mount_hfs/Makefile
cvs rdiff -u -r1.23 -r1.24 src/sbin/mount_nfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/usr.bin/gdb6/gdb/Makefile
diff -u src/gnu/usr.bin/gdb6/gdb/Makefile:1.8 src/gnu/usr.bin/gdb6/gdb/Makefile:1.9
--- src/gnu/usr.bin/gdb6/gdb/Makefile:1.8 Wed Feb 3 15:34:39 2010
+++ src/gnu/usr.bin/gdb6/gdb/Makefile Sun Apr 10 16:47:04 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/02/03 15:34:39 roy Exp $
+# $NetBSD: Makefile,v 1.9 2011/04/10 16:47:04 joerg Exp $
.include "../Makefile.inc"
@@ -10,7 +10,7 @@
PROG= gdb
SRCS= gdb.c
-CPPFLAGS= -I${.CURDIR} \
+CPPFLAGS+= -I${.CURDIR} \
-I${.CURDIR}/../arch/${MACHINE_ARCH} \
-I${DIST}/gdb \
-I${DIST}/gdb/config \
Index: src/gnu/usr.bin/gdb6/gdbtui/Makefile
diff -u src/gnu/usr.bin/gdb6/gdbtui/Makefile:1.5 src/gnu/usr.bin/gdb6/gdbtui/Makefile:1.6
--- src/gnu/usr.bin/gdb6/gdbtui/Makefile:1.5 Sat Mar 27 19:46:57 2010
+++ src/gnu/usr.bin/gdb6/gdbtui/Makefile Sun Apr 10 16:47:04 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/03/27 19:46:57 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2011/04/10 16:47:04 joerg Exp $
.include "../Makefile.inc"
@@ -10,7 +10,7 @@
PROG= gdbtui
SRCS= tui-main.c
-CPPFLAGS= -I${.CURDIR} \
+CPPFLAGS+= -I${.CURDIR} \
-I${.CURDIR}/../arch/${MACHINE_ARCH} \
-I${DIST}/gdb \
-I${DIST}/gdb/config \
Index: src/gnu/usr.bin/gdb6/libgdb/Makefile
diff -u src/gnu/usr.bin/gdb6/libgdb/Makefile:1.10 src/gnu/usr.bin/gdb6/libgdb/Makefile:1.11
--- src/gnu/usr.bin/gdb6/libgdb/Makefile:1.10 Fri Feb 18 22:27:51 2011
+++ src/gnu/usr.bin/gdb6/libgdb/Makefile Sun Apr 10 16:47:04 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/02/18 22:27:51 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2011/04/10 16:47:04 joerg Exp $
.include <bsd.own.mk>
@@ -14,7 +14,7 @@
SRCS= ${G_LIBGDB_OBS:.o=.c}
GCPPFLAGS= ${G_INTERNAL_CFLAGS}
CPPFLAGS.bsd-kvm.c= -D_KMEMUSER
-CPPFLAGS= -I${.CURDIR} \
+CPPFLAGS+= -I${.CURDIR} \
-I${.CURDIR}/../arch/${MACHINE_ARCH} \
-I${DIST}/gdb \
-I${DIST}/gdb/config \
Index: src/sbin/mount_ffs/Makefile
diff -u src/sbin/mount_ffs/Makefile:1.9 src/sbin/mount_ffs/Makefile:1.10
--- src/sbin/mount_ffs/Makefile:1.9 Tue Aug 5 20:57:45 2008
+++ src/sbin/mount_ffs/Makefile Sun Apr 10 16:47:05 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/08/05 20:57:45 pooka Exp $
+# $NetBSD: Makefile,v 1.10 2011/04/10 16:47:05 joerg Exp $
.include <bsd.own.mk>
@@ -10,7 +10,7 @@
LINKS= ${BINDIR}/mount_ffs ${BINDIR}/mount_ufs
MOUNT= ${NETBSDSRCDIR}/sbin/mount
-CPPFLAGS=-I${MOUNT}
+CPPFLAGS+=-I${MOUNT}
.PATH: ${MOUNT}
DPADD+=${LIBUTIL}
Index: src/sbin/mount_hfs/Makefile
diff -u src/sbin/mount_hfs/Makefile:1.3 src/sbin/mount_hfs/Makefile:1.4
--- src/sbin/mount_hfs/Makefile:1.3 Tue Aug 5 20:57:45 2008
+++ src/sbin/mount_hfs/Makefile Sun Apr 10 16:47:05 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/08/05 20:57:45 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2011/04/10 16:47:05 joerg Exp $
.include <bsd.own.mk>
@@ -7,7 +7,7 @@
MAN= mount_hfs.8
MOUNT= ${NETBSDSRCDIR}/sbin/mount
-CPPFLAGS=-I${MOUNT}
+CPPFLAGS+=-I${MOUNT}
.PATH: ${MOUNT}
DPADD+=${LIBUTIL}
Index: src/sbin/mount_nfs/Makefile
diff -u src/sbin/mount_nfs/Makefile:1.23 src/sbin/mount_nfs/Makefile:1.24
--- src/sbin/mount_nfs/Makefile:1.23 Fri Mar 5 19:53:37 2010
+++ src/sbin/mount_nfs/Makefile Sun Apr 10 16:47:05 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2010/03/05 19:53:37 pooka Exp $
+# $NetBSD: Makefile,v 1.24 2011/04/10 16:47:05 joerg Exp $
# @(#)Makefile 8.2 (Berkeley) 3/27/94
.include <bsd.own.mk>
@@ -9,7 +9,7 @@
MAN= mount_nfs.8
MOUNT= ${NETBSDSRCDIR}/sbin/mount
-CPPFLAGS=-I${MOUNT}
+CPPFLAGS+=-I${MOUNT}
.PATH: ${MOUNT}
.ifndef SMALLPROG
