Module Name: src
Committed By: christos
Date: Sun Feb 5 18:46:05 UTC 2012
Modified Files:
src/sys/modules/dm/dm_target_error: Makefile
src/sys/modules/dm/dm_target_mirror: Makefile
src/sys/modules/dm/dm_target_snapshot: Makefile
src/sys/modules/dm/dm_target_zero: Makefile
src/sys/modules/zfs: Makefile.zfsmod
Log Message:
-D flags belong in CPPFLAGS
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/dm/dm_target_error/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/dm/dm_target_mirror/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/dm/dm_target_snapshot/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/dm/dm_target_zero/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/zfs/Makefile.zfsmod
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/dm/dm_target_error/Makefile
diff -u src/sys/modules/dm/dm_target_error/Makefile:1.1 src/sys/modules/dm/dm_target_error/Makefile:1.2
--- src/sys/modules/dm/dm_target_error/Makefile:1.1 Thu Jan 1 20:06:16 2009
+++ src/sys/modules/dm/dm_target_error/Makefile Sun Feb 5 13:46:04 2012
@@ -1,11 +1,11 @@
-#$NetBSD: Makefile,v 1.1 2009/01/02 01:06:16 haad Exp $
+#$NetBSD: Makefile,v 1.2 2012/02/05 18:46:04 christos Exp $
.include "../../Makefile.inc"
S!= cd ${.CURDIR}/../../..;pwd
.PATH: ${S}/dev/dm
-CFLAGS += -DDM_TARGET_MODULE
+CPPFLAGS += -DDM_TARGET_MODULE
KMOD= dm_target_error
SRCS= dm_target_error.c
Index: src/sys/modules/dm/dm_target_mirror/Makefile
diff -u src/sys/modules/dm/dm_target_mirror/Makefile:1.1 src/sys/modules/dm/dm_target_mirror/Makefile:1.2
--- src/sys/modules/dm/dm_target_mirror/Makefile:1.1 Fri Jan 2 06:03:24 2009
+++ src/sys/modules/dm/dm_target_mirror/Makefile Sun Feb 5 13:46:05 2012
@@ -1,11 +1,11 @@
-#$NetBSD: Makefile,v 1.1 2009/01/02 11:03:24 haad Exp $
+#$NetBSD: Makefile,v 1.2 2012/02/05 18:46:05 christos Exp $
.include "../../Makefile.inc"
S!= cd ${.CURDIR}/../../..;pwd
.PATH: ${S}/dev/dm
-CFLAGS += -DDM_TARGET_MODULE
+CPPFLAGS += -DDM_TARGET_MODULE
KMOD= dm_target_mirror
SRCS= dm_target_mirror.c
Index: src/sys/modules/dm/dm_target_snapshot/Makefile
diff -u src/sys/modules/dm/dm_target_snapshot/Makefile:1.1 src/sys/modules/dm/dm_target_snapshot/Makefile:1.2
--- src/sys/modules/dm/dm_target_snapshot/Makefile:1.1 Thu Jan 1 20:06:16 2009
+++ src/sys/modules/dm/dm_target_snapshot/Makefile Sun Feb 5 13:46:05 2012
@@ -1,11 +1,11 @@
-#$NetBSD: Makefile,v 1.1 2009/01/02 01:06:16 haad Exp $
+#$NetBSD: Makefile,v 1.2 2012/02/05 18:46:05 christos Exp $
.include "../../Makefile.inc"
S!= cd ${.CURDIR}/../../..;pwd
.PATH: ${S}/dev/dm
-CFLAGS += -DDM_TARGET_MODULE
+CPPFLAGS += -DDM_TARGET_MODULE
KMOD= dm_target_snapshot
SRCS= dm_target_snapshot.c
Index: src/sys/modules/dm/dm_target_zero/Makefile
diff -u src/sys/modules/dm/dm_target_zero/Makefile:1.1 src/sys/modules/dm/dm_target_zero/Makefile:1.2
--- src/sys/modules/dm/dm_target_zero/Makefile:1.1 Thu Jan 1 20:06:16 2009
+++ src/sys/modules/dm/dm_target_zero/Makefile Sun Feb 5 13:46:05 2012
@@ -1,11 +1,11 @@
-#$NetBSD: Makefile,v 1.1 2009/01/02 01:06:16 haad Exp $
+#$NetBSD: Makefile,v 1.2 2012/02/05 18:46:05 christos Exp $
.include "../../Makefile.inc"
S!= cd ${.CURDIR}/../../..;pwd
.PATH: ${S}/dev/dm
-CFLAGS += -DDM_TARGET_MODULE
+CPPFLAGS += -DDM_TARGET_MODULE
KMOD= dm_target_zero
SRCS= dm_target_zero.c
Index: src/sys/modules/zfs/Makefile.zfsmod
diff -u src/sys/modules/zfs/Makefile.zfsmod:1.2 src/sys/modules/zfs/Makefile.zfsmod:1.3
--- src/sys/modules/zfs/Makefile.zfsmod:1.2 Sat Feb 4 13:28:53 2012
+++ src/sys/modules/zfs/Makefile.zfsmod Sun Feb 5 13:46:05 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.zfsmod,v 1.2 2012/02/04 18:28:53 christos Exp $
+# $NetBSD: Makefile.zfsmod,v 1.3 2012/02/05 18:46:05 christos Exp $
ZFSDIR= ${S}/../external/cddl/osnet
@@ -126,5 +126,5 @@ CPPFLAGS+= -std=c99
CPPFLAGS+= -D_NFS_NFS_H_
CPPFLAGS+= -D_PROPLIB_ZFS_CONFLICT
-CFLAGS+= -DDIAGNOSTIC
+CPPFLAGS+= -DDIAGNOSTIC
# -DZFS_DEBUG