Browse Source

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>
master
matt mooney 11 years ago
committed by Michal Marek
parent
commit
0ccd234ca0
  1. 2
      fs/affs/Makefile
  2. 2
      fs/coda/Makefile
  3. 2
      fs/gfs2/Makefile
  4. 2
      fs/jfs/Makefile
  5. 2
      fs/ncpfs/Makefile
  6. 19
      fs/ntfs/Makefile
  7. 4
      fs/ocfs2/Makefile
  8. 2
      fs/ocfs2/dlm/Makefile
  9. 2
      fs/ocfs2/dlmfs/Makefile
  10. 4
      fs/reiserfs/Makefile
  11. 7
      fs/xfs/Makefile

2
fs/affs/Makefile

@ -2,7 +2,7 @@
# Makefile for the Linux affs filesystem routines.
#
#EXTRA_CFLAGS=-DDEBUG=1
#ccflags-y := -DDEBUG=1
obj-$(CONFIG_AFFS_FS) += affs.o

2
fs/coda/Makefile

@ -9,4 +9,4 @@ coda-objs := psdev.o cache.o cnode.o inode.o dir.o file.o upcall.o \
# If you want debugging output, please uncomment the following line.
# EXTRA_CFLAGS += -DDEBUG -DDEBUG_SMB_MALLOC=1
# ccflags-y := -DDEBUG -DDEBUG_SMB_MALLOC=1

2
fs/gfs2/Makefile

@ -1,4 +1,4 @@
EXTRA_CFLAGS := -I$(src)
ccflags-y := -I$(src)
obj-$(CONFIG_GFS2_FS) += gfs2.o
gfs2-y := acl.o bmap.o dir.o xattr.o glock.o \
glops.o inode.o log.o lops.o main.o meta_io.o \

2
fs/jfs/Makefile

@ -13,4 +13,4 @@ jfs-y := super.o file.o inode.o namei.o jfs_mount.o jfs_umount.o \
jfs-$(CONFIG_JFS_POSIX_ACL) += acl.o
EXTRA_CFLAGS += -D_JFS_4K
ccflags-y := -D_JFS_4K

2
fs/ncpfs/Makefile

@ -11,6 +11,6 @@ ncpfs-$(CONFIG_NCPFS_EXTRAS) += symlink.o
ncpfs-$(CONFIG_NCPFS_NFS_NS) += symlink.o
# If you want debugging output, please uncomment the following line
# EXTRA_CFLAGS += -DDEBUG_NCP=1
# ccflags-y := -DDEBUG_NCP=1
CFLAGS_ncplib_kernel.o := -finline-functions

19
fs/ntfs/Makefile

@ -2,18 +2,13 @@
obj-$(CONFIG_NTFS_FS) += ntfs.o
ntfs-objs := aops.o attrib.o collate.o compress.o debug.o dir.o file.o \
index.o inode.o mft.o mst.o namei.o runlist.o super.o sysctl.o \
unistr.o upcase.o
ntfs-y := aops.o attrib.o collate.o compress.o debug.o dir.o file.o \
index.o inode.o mft.o mst.o namei.o runlist.o super.o sysctl.o \
unistr.o upcase.o
EXTRA_CFLAGS = -DNTFS_VERSION=\"2.1.30\"
ntfs-$(CONFIG_NTFS_RW) += bitmap.o lcnalloc.o logfile.o quota.o usnjrnl.o
ifeq ($(CONFIG_NTFS_DEBUG),y)
EXTRA_CFLAGS += -DDEBUG
endif
ccflags-y := -DNTFS_VERSION=\"2.1.30\"
ccflags-$(CONFIG_NTFS_DEBUG) += -DDEBUG
ccflags-$(CONFIG_NTFS_RW) += -DNTFS_RW
ifeq ($(CONFIG_NTFS_RW),y)
EXTRA_CFLAGS += -DNTFS_RW
ntfs-objs += bitmap.o lcnalloc.o logfile.o quota.o usnjrnl.o
endif

4
fs/ocfs2/Makefile

@ -1,6 +1,6 @@
EXTRA_CFLAGS += -Ifs/ocfs2
ccflags-y := -Ifs/ocfs2
EXTRA_CFLAGS += -DCATCH_BH_JBD_RACES
ccflags-y += -DCATCH_BH_JBD_RACES
obj-$(CONFIG_OCFS2_FS) += \
ocfs2.o \

2
fs/ocfs2/dlm/Makefile

@ -1,4 +1,4 @@
EXTRA_CFLAGS += -Ifs/ocfs2
ccflags-y := -Ifs/ocfs2
obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_dlm.o

2
fs/ocfs2/dlmfs/Makefile

@ -1,4 +1,4 @@
EXTRA_CFLAGS += -Ifs/ocfs2
ccflags-y := -Ifs/ocfs2
obj-$(CONFIG_OCFS2_FS) += ocfs2_dlmfs.o

4
fs/reiserfs/Makefile

@ -31,9 +31,7 @@ endif
# and causing a panic. Since this behavior only affects ppc32, this ifeq
# will work around it. If any other architecture displays this behavior,
# add it here.
ifeq ($(CONFIG_PPC32),y)
EXTRA_CFLAGS := $(call cc-ifversion, -lt, 0400, -O1)
endif
ccflags-$(CONFIG_PPC32) := $(call cc-ifversion, -lt, 0400, -O1)
TAGS:
etags *.c

7
fs/xfs/Makefile

@ -16,14 +16,11 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
EXTRA_CFLAGS += -I$(src) -I$(src)/linux-2.6
ccflags-y := -I$(src) -I$(src)/linux-2.6
ccflags-$(CONFIG_XFS_DEBUG) += -g
XFS_LINUX := linux-2.6
ifeq ($(CONFIG_XFS_DEBUG),y)
EXTRA_CFLAGS += -g
endif
obj-$(CONFIG_XFS_FS) += xfs.o
xfs-y += linux-2.6/xfs_trace.o

Loading…
Cancel
Save