tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

fs: change to new flag variable

Replace EXTRA_CFLAGS with ccflags-y. And change ntfs-objs to ntfs-y
for cleaner conditional inclusion.

Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>

authored by

matt mooney and committed by
Michal Marek 0ccd234c 3996eabb

+19 -29
+1 -1
fs/affs/Makefile
··· 2 2 # Makefile for the Linux affs filesystem routines. 3 3 # 4 4 5 - #EXTRA_CFLAGS=-DDEBUG=1 5 + #ccflags-y := -DDEBUG=1 6 6 7 7 obj-$(CONFIG_AFFS_FS) += affs.o 8 8
+1 -1
fs/coda/Makefile
··· 9 9 10 10 # If you want debugging output, please uncomment the following line. 11 11 12 - # EXTRA_CFLAGS += -DDEBUG -DDEBUG_SMB_MALLOC=1 12 + # ccflags-y := -DDEBUG -DDEBUG_SMB_MALLOC=1
+1 -1
fs/gfs2/Makefile
··· 1 - EXTRA_CFLAGS := -I$(src) 1 + ccflags-y := -I$(src) 2 2 obj-$(CONFIG_GFS2_FS) += gfs2.o 3 3 gfs2-y := acl.o bmap.o dir.o xattr.o glock.o \ 4 4 glops.o inode.o log.o lops.o main.o meta_io.o \
+1 -1
fs/jfs/Makefile
··· 13 13 14 14 jfs-$(CONFIG_JFS_POSIX_ACL) += acl.o 15 15 16 - EXTRA_CFLAGS += -D_JFS_4K 16 + ccflags-y := -D_JFS_4K
+1 -1
fs/ncpfs/Makefile
··· 11 11 ncpfs-$(CONFIG_NCPFS_NFS_NS) += symlink.o 12 12 13 13 # If you want debugging output, please uncomment the following line 14 - # EXTRA_CFLAGS += -DDEBUG_NCP=1 14 + # ccflags-y := -DDEBUG_NCP=1 15 15 16 16 CFLAGS_ncplib_kernel.o := -finline-functions
+7 -12
fs/ntfs/Makefile
··· 2 2 3 3 obj-$(CONFIG_NTFS_FS) += ntfs.o 4 4 5 - ntfs-objs := aops.o attrib.o collate.o compress.o debug.o dir.o file.o \ 6 - index.o inode.o mft.o mst.o namei.o runlist.o super.o sysctl.o \ 7 - unistr.o upcase.o 5 + ntfs-y := aops.o attrib.o collate.o compress.o debug.o dir.o file.o \ 6 + index.o inode.o mft.o mst.o namei.o runlist.o super.o sysctl.o \ 7 + unistr.o upcase.o 8 8 9 - EXTRA_CFLAGS = -DNTFS_VERSION=\"2.1.30\" 9 + ntfs-$(CONFIG_NTFS_RW) += bitmap.o lcnalloc.o logfile.o quota.o usnjrnl.o 10 10 11 - ifeq ($(CONFIG_NTFS_DEBUG),y) 12 - EXTRA_CFLAGS += -DDEBUG 13 - endif 11 + ccflags-y := -DNTFS_VERSION=\"2.1.30\" 12 + ccflags-$(CONFIG_NTFS_DEBUG) += -DDEBUG 13 + ccflags-$(CONFIG_NTFS_RW) += -DNTFS_RW 14 14 15 - ifeq ($(CONFIG_NTFS_RW),y) 16 - EXTRA_CFLAGS += -DNTFS_RW 17 - 18 - ntfs-objs += bitmap.o lcnalloc.o logfile.o quota.o usnjrnl.o 19 - endif
+2 -2
fs/ocfs2/Makefile
··· 1 - EXTRA_CFLAGS += -Ifs/ocfs2 1 + ccflags-y := -Ifs/ocfs2 2 2 3 - EXTRA_CFLAGS += -DCATCH_BH_JBD_RACES 3 + ccflags-y += -DCATCH_BH_JBD_RACES 4 4 5 5 obj-$(CONFIG_OCFS2_FS) += \ 6 6 ocfs2.o \
+1 -1
fs/ocfs2/dlm/Makefile
··· 1 - EXTRA_CFLAGS += -Ifs/ocfs2 1 + ccflags-y := -Ifs/ocfs2 2 2 3 3 obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_dlm.o 4 4
+1 -1
fs/ocfs2/dlmfs/Makefile
··· 1 - EXTRA_CFLAGS += -Ifs/ocfs2 1 + ccflags-y := -Ifs/ocfs2 2 2 3 3 obj-$(CONFIG_OCFS2_FS) += ocfs2_dlmfs.o 4 4
+1 -3
fs/reiserfs/Makefile
··· 31 31 # and causing a panic. Since this behavior only affects ppc32, this ifeq 32 32 # will work around it. If any other architecture displays this behavior, 33 33 # add it here. 34 - ifeq ($(CONFIG_PPC32),y) 35 - EXTRA_CFLAGS := $(call cc-ifversion, -lt, 0400, -O1) 36 - endif 34 + ccflags-$(CONFIG_PPC32) := $(call cc-ifversion, -lt, 0400, -O1) 37 35 38 36 TAGS: 39 37 etags *.c
+2 -5
fs/xfs/Makefile
··· 16 16 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 17 17 # 18 18 19 - EXTRA_CFLAGS += -I$(src) -I$(src)/linux-2.6 19 + ccflags-y := -I$(src) -I$(src)/linux-2.6 20 + ccflags-$(CONFIG_XFS_DEBUG) += -g 20 21 21 22 XFS_LINUX := linux-2.6 22 - 23 - ifeq ($(CONFIG_XFS_DEBUG),y) 24 - EXTRA_CFLAGS += -g 25 - endif 26 23 27 24 obj-$(CONFIG_XFS_FS) += xfs.o 28 25