aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/Makefile
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2011-08-12 17:21:35 -0400
committerAlex Elder <aelder@sgi.com>2011-08-12 17:21:35 -0400
commitc59d87c460767bc35dafd490139d3cfe78fb8da4 (patch)
tree2aad8261f86488e501d9645bd35d1398906da46d /fs/xfs/Makefile
parent06f8e2d6754dc631732415b741b5aa58a0f7133f (diff)
xfs: remove subdirectories
Use the move from Linux 2.6 to Linux 3.x as an excuse to kill the annoying subdirectories in the XFS source code. Besides the large amount of file rename the only changes are to the Makefile, a few files including headers with the subdirectory prefix, and the binary sysctl compat code that includes a header under fs/xfs/ from kernel/. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs/xfs/Makefile')
-rw-r--r--fs/xfs/Makefile117
1 files changed, 56 insertions, 61 deletions
diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile
index b100cf445880..ffce328309b8 100644
--- a/fs/xfs/Makefile
+++ b/fs/xfs/Makefile
@@ -16,44 +16,51 @@
16# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 16# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
17# 17#
18 18
19ccflags-y := -I$(src) -I$(src)/linux-2.6 -I$(src)/quota -I$(src)/support
20ccflags-$(CONFIG_XFS_DEBUG) += -g 19ccflags-$(CONFIG_XFS_DEBUG) += -g
21 20
22XFS_LINUX := linux-2.6
23
24obj-$(CONFIG_XFS_FS) += xfs.o 21obj-$(CONFIG_XFS_FS) += xfs.o
25 22
26xfs-y += linux-2.6/xfs_trace.o 23# this one should be compiled first, as the tracing macros can easily blow up
27 24xfs-y += xfs_trace.o
28xfs-$(CONFIG_XFS_QUOTA) += $(addprefix quota/, \
29 xfs_dquot.o \
30 xfs_dquot_item.o \
31 xfs_trans_dquot.o \
32 xfs_qm_syscalls.o \
33 xfs_qm_bhv.o \
34 xfs_qm.o)
35xfs-$(CONFIG_XFS_QUOTA) += linux-2.6/xfs_quotaops.o
36
37ifeq ($(CONFIG_XFS_QUOTA),y)
38xfs-$(CONFIG_PROC_FS) += quota/xfs_qm_stats.o
39endif
40
41xfs-$(CONFIG_XFS_RT) += xfs_rtalloc.o
42xfs-$(CONFIG_XFS_POSIX_ACL) += $(XFS_LINUX)/xfs_acl.o
43xfs-$(CONFIG_PROC_FS) += $(XFS_LINUX)/xfs_stats.o
44xfs-$(CONFIG_SYSCTL) += $(XFS_LINUX)/xfs_sysctl.o
45xfs-$(CONFIG_COMPAT) += $(XFS_LINUX)/xfs_ioctl32.o
46 25
26# highlevel code
27xfs-y += xfs_aops.o \
28 xfs_bit.o \
29 xfs_buf.o \
30 xfs_dfrag.o \
31 xfs_discard.o \
32 xfs_error.o \
33 xfs_export.o \
34 xfs_file.o \
35 xfs_filestream.o \
36 xfs_fsops.o \
37 xfs_fs_subr.o \
38 xfs_globals.o \
39 xfs_iget.o \
40 xfs_ioctl.o \
41 xfs_iomap.o \
42 xfs_iops.o \
43 xfs_itable.o \
44 xfs_message.o \
45 xfs_mru_cache.o \
46 xfs_super.o \
47 xfs_sync.o \
48 xfs_xattr.o \
49 xfs_rename.o \
50 xfs_rw.o \
51 xfs_utils.o \
52 xfs_vnodeops.o \
53 kmem.o \
54 uuid.o
47 55
56# code shared with libxfs
48xfs-y += xfs_alloc.o \ 57xfs-y += xfs_alloc.o \
49 xfs_alloc_btree.o \ 58 xfs_alloc_btree.o \
50 xfs_attr.o \ 59 xfs_attr.o \
51 xfs_attr_leaf.o \ 60 xfs_attr_leaf.o \
52 xfs_bit.o \
53 xfs_bmap.o \ 61 xfs_bmap.o \
54 xfs_bmap_btree.o \ 62 xfs_bmap_btree.o \
55 xfs_btree.o \ 63 xfs_btree.o \
56 xfs_buf_item.o \
57 xfs_da_btree.o \ 64 xfs_da_btree.o \
58 xfs_dir2.o \ 65 xfs_dir2.o \
59 xfs_dir2_block.o \ 66 xfs_dir2_block.o \
@@ -61,49 +68,37 @@ xfs-y += xfs_alloc.o \
61 xfs_dir2_leaf.o \ 68 xfs_dir2_leaf.o \
62 xfs_dir2_node.o \ 69 xfs_dir2_node.o \
63 xfs_dir2_sf.o \ 70 xfs_dir2_sf.o \
64 xfs_error.o \
65 xfs_extfree_item.o \
66 xfs_filestream.o \
67 xfs_fsops.o \
68 xfs_ialloc.o \ 71 xfs_ialloc.o \
69 xfs_ialloc_btree.o \ 72 xfs_ialloc_btree.o \
70 xfs_iget.o \
71 xfs_inode.o \ 73 xfs_inode.o \
72 xfs_inode_item.o \
73 xfs_iomap.o \
74 xfs_itable.o \
75 xfs_dfrag.o \
76 xfs_log.o \
77 xfs_log_cil.o \
78 xfs_log_recover.o \ 74 xfs_log_recover.o \
79 xfs_mount.o \ 75 xfs_mount.o \
80 xfs_mru_cache.o \ 76 xfs_trans.o
81 xfs_rename.o \ 77
82 xfs_trans.o \ 78# low-level transaction/log code
79xfs-y += xfs_log.o \
80 xfs_log_cil.o \
81 xfs_buf_item.o \
82 xfs_extfree_item.o \
83 xfs_inode_item.o \
83 xfs_trans_ail.o \ 84 xfs_trans_ail.o \
84 xfs_trans_buf.o \ 85 xfs_trans_buf.o \
85 xfs_trans_extfree.o \ 86 xfs_trans_extfree.o \
86 xfs_trans_inode.o \ 87 xfs_trans_inode.o \
87 xfs_utils.o \
88 xfs_vnodeops.o \
89 xfs_rw.o
90
91# Objects in linux/
92xfs-y += $(addprefix $(XFS_LINUX)/, \
93 kmem.o \
94 xfs_aops.o \
95 xfs_buf.o \
96 xfs_discard.o \
97 xfs_export.o \
98 xfs_file.o \
99 xfs_fs_subr.o \
100 xfs_globals.o \
101 xfs_ioctl.o \
102 xfs_iops.o \
103 xfs_message.o \
104 xfs_super.o \
105 xfs_sync.o \
106 xfs_xattr.o)
107 88
108# Objects in support/ 89# optional features
109xfs-y += support/uuid.o 90xfs-$(CONFIG_XFS_QUOTA) += xfs_dquot.o \
91 xfs_dquot_item.o \
92 xfs_trans_dquot.o \
93 xfs_qm_syscalls.o \
94 xfs_qm_bhv.o \
95 xfs_qm.o \
96 xfs_quotaops.o
97ifeq ($(CONFIG_XFS_QUOTA),y)
98xfs-$(CONFIG_PROC_FS) += xfs_qm_stats.o
99endif
100xfs-$(CONFIG_XFS_RT) += xfs_rtalloc.o
101xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o
102xfs-$(CONFIG_PROC_FS) += xfs_stats.o
103xfs-$(CONFIG_SYSCTL) += xfs_sysctl.o
104xfs-$(CONFIG_COMPAT) += xfs_ioctl32.o