diff options
-rw-r--r-- | fs/xfs/Kbuild | 6 | ||||
-rw-r--r-- | fs/xfs/Makefile | 118 | ||||
-rw-r--r-- | fs/xfs/Makefile-linux-2.6 | 117 |
3 files changed, 117 insertions, 124 deletions
diff --git a/fs/xfs/Kbuild b/fs/xfs/Kbuild deleted file mode 100644 index 2566e96706f1..000000000000 --- a/fs/xfs/Kbuild +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | # | ||
2 | # The xfs people like to share Makefile with 2.6 and 2.4. | ||
3 | # Utilise file named Kbuild file which has precedence over Makefile. | ||
4 | # | ||
5 | |||
6 | include $(srctree)/$(obj)/Makefile-linux-2.6 | ||
diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile index 49e3e7e5e3dc..36ec614e699a 100644 --- a/fs/xfs/Makefile +++ b/fs/xfs/Makefile | |||
@@ -1 +1,117 @@ | |||
1 | include $(TOPDIR)/fs/xfs/Makefile-linux-$(VERSION).$(PATCHLEVEL) | 1 | # |
2 | # Copyright (c) 2000-2005 Silicon Graphics, Inc. | ||
3 | # All Rights Reserved. | ||
4 | # | ||
5 | # This program is free software; you can redistribute it and/or | ||
6 | # modify it under the terms of the GNU General Public License as | ||
7 | # published by the Free Software Foundation. | ||
8 | # | ||
9 | # This program is distributed in the hope that it would be useful, | ||
10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | # GNU General Public License for more details. | ||
13 | # | ||
14 | # You should have received a copy of the GNU General Public License | ||
15 | # along with this program; if not, write the Free Software Foundation, | ||
16 | # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
17 | # | ||
18 | |||
19 | EXTRA_CFLAGS += -I$(src) -I$(src)/linux-2.6 -funsigned-char | ||
20 | |||
21 | XFS_LINUX := linux-2.6 | ||
22 | |||
23 | ifeq ($(CONFIG_XFS_DEBUG),y) | ||
24 | EXTRA_CFLAGS += -g | ||
25 | endif | ||
26 | |||
27 | obj-$(CONFIG_XFS_FS) += xfs.o | ||
28 | |||
29 | xfs-$(CONFIG_XFS_QUOTA) += $(addprefix quota/, \ | ||
30 | xfs_dquot.o \ | ||
31 | xfs_dquot_item.o \ | ||
32 | xfs_trans_dquot.o \ | ||
33 | xfs_qm_syscalls.o \ | ||
34 | xfs_qm_bhv.o \ | ||
35 | xfs_qm.o) | ||
36 | |||
37 | ifeq ($(CONFIG_XFS_QUOTA),y) | ||
38 | xfs-$(CONFIG_PROC_FS) += quota/xfs_qm_stats.o | ||
39 | endif | ||
40 | |||
41 | xfs-$(CONFIG_XFS_RT) += xfs_rtalloc.o | ||
42 | xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o | ||
43 | xfs-$(CONFIG_PROC_FS) += $(XFS_LINUX)/xfs_stats.o | ||
44 | xfs-$(CONFIG_SYSCTL) += $(XFS_LINUX)/xfs_sysctl.o | ||
45 | xfs-$(CONFIG_COMPAT) += $(XFS_LINUX)/xfs_ioctl32.o | ||
46 | |||
47 | |||
48 | xfs-y += xfs_alloc.o \ | ||
49 | xfs_alloc_btree.o \ | ||
50 | xfs_attr.o \ | ||
51 | xfs_attr_leaf.o \ | ||
52 | xfs_bit.o \ | ||
53 | xfs_bmap.o \ | ||
54 | xfs_bmap_btree.o \ | ||
55 | xfs_btree.o \ | ||
56 | xfs_buf_item.o \ | ||
57 | xfs_da_btree.o \ | ||
58 | xfs_dir2.o \ | ||
59 | xfs_dir2_block.o \ | ||
60 | xfs_dir2_data.o \ | ||
61 | xfs_dir2_leaf.o \ | ||
62 | xfs_dir2_node.o \ | ||
63 | 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 \ | ||
69 | xfs_ialloc_btree.o \ | ||
70 | xfs_iget.o \ | ||
71 | 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_recover.o \ | ||
78 | xfs_mount.o \ | ||
79 | xfs_mru_cache.o \ | ||
80 | xfs_rename.o \ | ||
81 | xfs_trans.o \ | ||
82 | xfs_trans_ail.o \ | ||
83 | xfs_trans_buf.o \ | ||
84 | xfs_trans_extfree.o \ | ||
85 | xfs_trans_inode.o \ | ||
86 | xfs_trans_item.o \ | ||
87 | xfs_utils.o \ | ||
88 | xfs_vfsops.o \ | ||
89 | xfs_vnodeops.o \ | ||
90 | xfs_rw.o \ | ||
91 | xfs_dmops.o \ | ||
92 | xfs_qmops.o | ||
93 | |||
94 | xfs-$(CONFIG_XFS_TRACE) += xfs_dir2_trace.o | ||
95 | |||
96 | # Objects in linux/ | ||
97 | xfs-y += $(addprefix $(XFS_LINUX)/, \ | ||
98 | kmem.o \ | ||
99 | xfs_aops.o \ | ||
100 | xfs_buf.o \ | ||
101 | xfs_export.o \ | ||
102 | xfs_file.o \ | ||
103 | xfs_fs_subr.o \ | ||
104 | xfs_globals.o \ | ||
105 | xfs_ioctl.o \ | ||
106 | xfs_iops.o \ | ||
107 | xfs_lrw.o \ | ||
108 | xfs_super.o \ | ||
109 | xfs_vnode.o) | ||
110 | |||
111 | # Objects in support/ | ||
112 | xfs-y += $(addprefix support/, \ | ||
113 | debug.o \ | ||
114 | uuid.o) | ||
115 | |||
116 | xfs-$(CONFIG_XFS_TRACE) += support/ktrace.o | ||
117 | |||
diff --git a/fs/xfs/Makefile-linux-2.6 b/fs/xfs/Makefile-linux-2.6 index 97316451fc6d..e69de29bb2d1 100644 --- a/fs/xfs/Makefile-linux-2.6 +++ b/fs/xfs/Makefile-linux-2.6 | |||
@@ -1,117 +0,0 @@ | |||
1 | # | ||
2 | # Copyright (c) 2000-2005 Silicon Graphics, Inc. | ||
3 | # All Rights Reserved. | ||
4 | # | ||
5 | # This program is free software; you can redistribute it and/or | ||
6 | # modify it under the terms of the GNU General Public License as | ||
7 | # published by the Free Software Foundation. | ||
8 | # | ||
9 | # This program is distributed in the hope that it would be useful, | ||
10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | # GNU General Public License for more details. | ||
13 | # | ||
14 | # You should have received a copy of the GNU General Public License | ||
15 | # along with this program; if not, write the Free Software Foundation, | ||
16 | # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
17 | # | ||
18 | |||
19 | EXTRA_CFLAGS += -Ifs/xfs -Ifs/xfs/linux-2.6 -funsigned-char | ||
20 | |||
21 | XFS_LINUX := linux-2.6 | ||
22 | |||
23 | ifeq ($(CONFIG_XFS_DEBUG),y) | ||
24 | EXTRA_CFLAGS += -g | ||
25 | endif | ||
26 | |||
27 | obj-$(CONFIG_XFS_FS) += xfs.o | ||
28 | |||
29 | xfs-$(CONFIG_XFS_QUOTA) += $(addprefix quota/, \ | ||
30 | xfs_dquot.o \ | ||
31 | xfs_dquot_item.o \ | ||
32 | xfs_trans_dquot.o \ | ||
33 | xfs_qm_syscalls.o \ | ||
34 | xfs_qm_bhv.o \ | ||
35 | xfs_qm.o) | ||
36 | |||
37 | ifeq ($(CONFIG_XFS_QUOTA),y) | ||
38 | xfs-$(CONFIG_PROC_FS) += quota/xfs_qm_stats.o | ||
39 | endif | ||
40 | |||
41 | xfs-$(CONFIG_XFS_RT) += xfs_rtalloc.o | ||
42 | xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o | ||
43 | xfs-$(CONFIG_PROC_FS) += $(XFS_LINUX)/xfs_stats.o | ||
44 | xfs-$(CONFIG_SYSCTL) += $(XFS_LINUX)/xfs_sysctl.o | ||
45 | xfs-$(CONFIG_COMPAT) += $(XFS_LINUX)/xfs_ioctl32.o | ||
46 | |||
47 | |||
48 | xfs-y += xfs_alloc.o \ | ||
49 | xfs_alloc_btree.o \ | ||
50 | xfs_attr.o \ | ||
51 | xfs_attr_leaf.o \ | ||
52 | xfs_bit.o \ | ||
53 | xfs_bmap.o \ | ||
54 | xfs_bmap_btree.o \ | ||
55 | xfs_btree.o \ | ||
56 | xfs_buf_item.o \ | ||
57 | xfs_da_btree.o \ | ||
58 | xfs_dir2.o \ | ||
59 | xfs_dir2_block.o \ | ||
60 | xfs_dir2_data.o \ | ||
61 | xfs_dir2_leaf.o \ | ||
62 | xfs_dir2_node.o \ | ||
63 | 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 \ | ||
69 | xfs_ialloc_btree.o \ | ||
70 | xfs_iget.o \ | ||
71 | 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_recover.o \ | ||
78 | xfs_mount.o \ | ||
79 | xfs_mru_cache.o \ | ||
80 | xfs_rename.o \ | ||
81 | xfs_trans.o \ | ||
82 | xfs_trans_ail.o \ | ||
83 | xfs_trans_buf.o \ | ||
84 | xfs_trans_extfree.o \ | ||
85 | xfs_trans_inode.o \ | ||
86 | xfs_trans_item.o \ | ||
87 | xfs_utils.o \ | ||
88 | xfs_vfsops.o \ | ||
89 | xfs_vnodeops.o \ | ||
90 | xfs_rw.o \ | ||
91 | xfs_dmops.o \ | ||
92 | xfs_qmops.o | ||
93 | |||
94 | xfs-$(CONFIG_XFS_TRACE) += xfs_dir2_trace.o | ||
95 | |||
96 | # Objects in linux/ | ||
97 | xfs-y += $(addprefix $(XFS_LINUX)/, \ | ||
98 | kmem.o \ | ||
99 | xfs_aops.o \ | ||
100 | xfs_buf.o \ | ||
101 | xfs_export.o \ | ||
102 | xfs_file.o \ | ||
103 | xfs_fs_subr.o \ | ||
104 | xfs_globals.o \ | ||
105 | xfs_ioctl.o \ | ||
106 | xfs_iops.o \ | ||
107 | xfs_lrw.o \ | ||
108 | xfs_super.o \ | ||
109 | xfs_vnode.o) | ||
110 | |||
111 | # Objects in support/ | ||
112 | xfs-y += $(addprefix support/, \ | ||
113 | debug.o \ | ||
114 | uuid.o) | ||
115 | |||
116 | xfs-$(CONFIG_XFS_TRACE) += support/ktrace.o | ||
117 | |||