Module Name: src
Committed By: tron
Date: Mon Jul 18 21:22:55 UTC 2011
Modified Files:
src/usr.sbin/makefs: Makefile
src/usr.sbin/makefs/v7fs: Makefile.inc
Log Message:
Define "USE_V7FS" in the makefile of the directory with the actual source.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/makefs/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/makefs/v7fs/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/makefs/Makefile
diff -u src/usr.sbin/makefs/Makefile:1.27 src/usr.sbin/makefs/Makefile:1.28
--- src/usr.sbin/makefs/Makefile:1.27 Mon Jul 18 17:15:51 2011
+++ src/usr.sbin/makefs/Makefile Mon Jul 18 21:22:55 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2011/07/18 17:15:51 tron Exp $
+# $NetBSD: Makefile,v 1.28 2011/07/18 21:22:55 tron Exp $
#
WARNS?= 3 # XXX -Wsign-compare
@@ -24,7 +24,9 @@
.include "${.CURDIR}/ffs/Makefile.inc"
.if !defined(HOSTPROG)
-SRCS+= v7fs.c
+SRCS+= v7fs.c
+CPPFLAGS+= -DUSE_V7FS
+
.include "${.CURDIR}/v7fs/Makefile.inc"
DPADD+= ${LIBUTIL}
Index: src/usr.sbin/makefs/v7fs/Makefile.inc
diff -u src/usr.sbin/makefs/v7fs/Makefile.inc:1.2 src/usr.sbin/makefs/v7fs/Makefile.inc:1.3
--- src/usr.sbin/makefs/v7fs/Makefile.inc:1.2 Mon Jul 18 17:15:07 2011
+++ src/usr.sbin/makefs/v7fs/Makefile.inc Mon Jul 18 21:22:55 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2011/07/18 17:15:07 tron Exp $
+# $NetBSD: Makefile.inc,v 1.3 2011/07/18 21:22:55 tron Exp $
#
V7FS= ${NETBSDSRCDIR}/sys/fs/v7fs
@@ -7,7 +7,7 @@
.PATH: ${.CURDIR}/v7fs ${V7FS} ${NEWFS} ${FSCK}
-CPPFLAGS+= -DUSE_V7FS -DV7FS_EI -I${V7FS} -I${NEWFS} -I${FSCK}
+CPPFLAGS+= -DV7FS_EI -I${V7FS} -I${NEWFS} -I${FSCK}
SRCS += v7fs_endian.c v7fs_superblock.c v7fs_superblock_util.c v7fs_inode.c \
v7fs_inode_util.c v7fs_datablock.c v7fs_dirent.c v7fs_io.c v7fs_file.c \
