diff options
| -rw-r--r-- | fs/devpts/Makefile | 12 | ||||
| -rw-r--r-- | fs/ext2/Makefile | 18 | ||||
| -rw-r--r-- | fs/ext3/Makefile | 18 | ||||
| -rw-r--r-- | fs/jfs/Makefile | 6 | ||||
| -rw-r--r-- | fs/ncpfs/Makefile | 11 | ||||
| -rw-r--r-- | fs/proc/Makefile | 15 |
6 files changed, 24 insertions, 56 deletions
diff --git a/fs/devpts/Makefile b/fs/devpts/Makefile index f47e29c13987..1d5a2697b969 100644 --- a/fs/devpts/Makefile +++ b/fs/devpts/Makefile @@ -4,12 +4,6 @@ obj-$(CONFIG_DEVPTS_FS) += devpts.o -devpts-objs := inode.o - -ifeq ($(CONFIG_DEVPTS_FS_XATTR),y) -devpts-objs += xattr.o -endif - -ifeq ($(CONFIG_DEVPTS_FS_SECURITY),y) -devpts-objs += xattr_security.o -endif +devpts-y := inode.o +devpts-$(CONFIG_DEVPTS_FS_XATTR) += xattr.o +devpts-$(CONFIG_DEVPTS_FS_SECURITY) += xattr_security.o diff --git a/fs/ext2/Makefile b/fs/ext2/Makefile index 891d1bfa772f..ee240a14e70f 100644 --- a/fs/ext2/Makefile +++ b/fs/ext2/Makefile @@ -4,17 +4,9 @@ obj-$(CONFIG_EXT2_FS) += ext2.o -ext2-objs := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \ - ioctl.o namei.o super.o symlink.o +ext2-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \ + ioctl.o namei.o super.o symlink.o -ifeq ($(CONFIG_EXT2_FS_XATTR),y) -ext2-objs += xattr.o xattr_user.o xattr_trusted.o -endif - -ifeq ($(CONFIG_EXT2_FS_POSIX_ACL),y) -ext2-objs += acl.o -endif - -ifeq ($(CONFIG_EXT2_FS_SECURITY),y) -ext2-objs += xattr_security.o -endif +ext2-$(CONFIG_EXT2_FS_XATTR) += xattr.o xattr_user.o xattr_trusted.o +ext2-$(CONFIG_EXT2_FS_POSIX_ACL) += acl.o +ext2-$(CONFIG_EXT2_FS_SECURITY) += xattr_security.o diff --git a/fs/ext3/Makefile b/fs/ext3/Makefile index e1872684be41..92deb0d952a5 100644 --- a/fs/ext3/Makefile +++ b/fs/ext3/Makefile @@ -4,17 +4,9 @@ obj-$(CONFIG_EXT3_FS) += ext3.o -ext3-objs := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \ - ioctl.o namei.o super.o symlink.o hash.o +ext3-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \ + ioctl.o namei.o super.o symlink.o hash.o -ifeq ($(CONFIG_EXT3_FS_XATTR),y) -ext3-objs += xattr.o xattr_user.o xattr_trusted.o -endif - -ifeq ($(CONFIG_EXT3_FS_POSIX_ACL),y) -ext3-objs += acl.o -endif - -ifeq ($(CONFIG_EXT3_FS_SECURITY),y) -ext3-objs += xattr_security.o -endif +ext3-$(CONFIG_EXT3_FS_XATTR) += xattr.o xattr_user.o xattr_trusted.o +ext3-$(CONFIG_EXT3_FS_POSIX_ACL) += acl.o +ext3-$(CONFIG_EXT3_FS_SECURITY) += xattr_security.o diff --git a/fs/jfs/Makefile b/fs/jfs/Makefile index a2d8c2a27c52..6f1e0e95587a 100644 --- a/fs/jfs/Makefile +++ b/fs/jfs/Makefile @@ -4,14 +4,12 @@ obj-$(CONFIG_JFS_FS) += jfs.o -jfs-objs := super.o file.o inode.o namei.o jfs_mount.o jfs_umount.o \ +jfs-y := super.o file.o inode.o namei.o jfs_mount.o jfs_umount.o \ jfs_xtree.o jfs_imap.o jfs_debug.o jfs_dmap.o \ jfs_unicode.o jfs_dtree.o jfs_inode.o \ jfs_extent.o symlink.o jfs_metapage.o \ jfs_logmgr.o jfs_txnmgr.o jfs_uniupr.o resize.o xattr.o -ifeq ($(CONFIG_JFS_POSIX_ACL),y) -jfs-objs += acl.o -endif +jfs-$(CONFIG_JFS_POSIX_ACL) += acl.o EXTRA_CFLAGS += -D_JFS_4K diff --git a/fs/ncpfs/Makefile b/fs/ncpfs/Makefile index 41b66a5e5350..68ea095100a8 100644 --- a/fs/ncpfs/Makefile +++ b/fs/ncpfs/Makefile @@ -4,14 +4,11 @@ obj-$(CONFIG_NCP_FS) += ncpfs.o -ncpfs-objs := dir.o file.o inode.o ioctl.o mmap.o ncplib_kernel.o sock.o \ +ncpfs-y := dir.o file.o inode.o ioctl.o mmap.o ncplib_kernel.o sock.o \ ncpsign_kernel.o getopt.o -ifeq ($(CONFIG_NCPFS_EXTRAS),y) -ncpfs-objs += symlink.o -endif -ifeq ($(CONFIG_NCPFS_NFS_NS),y) -ncpfs-objs += symlink.o -endif + +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 diff --git a/fs/proc/Makefile b/fs/proc/Makefile index 7131ac9aa1c0..0f6a6a83d2a3 100644 --- a/fs/proc/Makefile +++ b/fs/proc/Makefile @@ -4,15 +4,10 @@ obj-$(CONFIG_PROC_FS) += proc.o -proc-objs := inode.o root.o base.o generic.o array.o \ - kmsg.o proc_tty.o proc_misc.o kcore.o +proc-y := task_nommu.o +proc-$(CONFIG_MMU) := task_mmu.o -ifeq ($(CONFIG_MMU),y) -proc-objs += task_mmu.o -else -proc-objs += task_nommu.o -endif +proc-y += inode.o root.o base.o generic.o array.o \ + kmsg.o proc_tty.o proc_misc.o kcore.o -ifeq ($(CONFIG_PROC_DEVICETREE),y) -proc-objs += proc_devtree.o -endif +proc-$(CONFIG_PROC_DEVICETREE) += proc_devtree.o |