Wed Jan 23 21:03:16 2013 UTC ()
don't reuse the same variables


(christos)
diff -r1.1 -r1.2 src/usr.sbin/makefs/msdos/Makefile.inc
diff -r1.4 -r1.5 src/usr.sbin/makefs/v7fs/Makefile.inc
cvs diff -r1.1 -r1.2 src/usr.sbin/makefs/msdos/Makefile.inc (expand / switch to unified diff)

--- src/usr.sbin/makefs/msdos/Makefile.inc 2013/01/23 20:46:39 1.1
+++ src/usr.sbin/makefs/msdos/Makefile.inc 2013/01/23 21:03:15 1.2
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1# $NetBSD: Makefile.inc,v 1.1 2013/01/23 20:46:39 christos Exp $ 1# $NetBSD: Makefile.inc,v 1.2 2013/01/23 21:03:15 christos Exp $
2# 2#
3 3
4MSDOS= ${NETBSDSRCDIR}/sys/fs/msdosfs 4MSDOS= ${NETBSDSRCDIR}/sys/fs/msdosfs
5NEWFS= ${NETBSDSRCDIR}/sbin/newfs_msdos 5MSDOS_NEWFS= ${NETBSDSRCDIR}/sbin/newfs_msdos
6 6
7.PATH: ${.CURDIR}/v7fs ${MSDOS} ${NEWFS} 7.PATH: ${.CURDIR}/v7fs ${MSDOS} ${MSDOS_NEWFS}
8 8
9CPPFLAGS+= -DMSDOS_EI -I${MSDOS} -I${NEWFS} 9CPPFLAGS+= -DMSDOS_EI -I${MSDOS} -I${MSDOS_NEWFS}
cvs diff -r1.4 -r1.5 src/usr.sbin/makefs/v7fs/Makefile.inc (expand / switch to unified diff)

--- src/usr.sbin/makefs/v7fs/Makefile.inc 2011/07/19 18:29:41 1.4
+++ src/usr.sbin/makefs/v7fs/Makefile.inc 2013/01/23 21:03:15 1.5
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile.inc,v 1.4 2011/07/19 18:29:41 joerg Exp $ 1# $NetBSD: Makefile.inc,v 1.5 2013/01/23 21:03:15 christos Exp $
2# 2#
3 3
4V7FS= ${NETBSDSRCDIR}/sys/fs/v7fs 4V7FS= ${NETBSDSRCDIR}/sys/fs/v7fs
5NEWFS= ${NETBSDSRCDIR}/sbin/newfs_v7fs 5V7FS_NEWFS= ${NETBSDSRCDIR}/sbin/newfs_v7fs
6FSCK= ${NETBSDSRCDIR}/sbin/fsck # use progress meter. 6FSCK= ${NETBSDSRCDIR}/sbin/fsck # use progress meter.
7 7
8.PATH: ${.CURDIR}/v7fs ${V7FS} ${NEWFS} ${FSCK} 8.PATH: ${.CURDIR}/v7fs ${V7FS} ${V7FS_NEWFS} ${FSCK}
9 9
10CPPFLAGS+= -DV7FS_EI -I${V7FS} -I${NEWFS} -I${FSCK} 10CPPFLAGS+= -DV7FS_EI -I${V7FS} -I${V7FS_NEWFS} -I${FSCK}
11 11
12SRCS += v7fs_endian.c v7fs_superblock.c v7fs_superblock_util.c v7fs_inode.c \ 12SRCS += v7fs_endian.c v7fs_superblock.c v7fs_superblock_util.c v7fs_inode.c \
13v7fs_inode_util.c v7fs_datablock.c v7fs_dirent.c v7fs_io.c v7fs_file.c \ 13v7fs_inode_util.c v7fs_datablock.c v7fs_dirent.c v7fs_io.c v7fs_file.c \
14v7fs_file_util.c v7fs_io_user.c 14v7fs_file_util.c v7fs_io_user.c
15SRCS += main.c # newfs 15SRCS += main.c # newfs
16.if !defined(HOSTPROG) 16.if !defined(HOSTPROG)
17SRCS += progress.c # progress bar (fsck) 17SRCS += progress.c # progress bar (fsck)
18.endif 18.endif
19 19
20SRCS += v7fs_estimate.c v7fs_populate.c 20SRCS += v7fs_estimate.c v7fs_populate.c