-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6: [XFS] Added quota targets and removed dmapi directory [XFS] Fix up xfs out-of-tree builds. (a.k.a. external modules) [XFS] Remove Makefile wrappers in XFS
- Loading branch information
Showing
3 changed files
with
117 additions
and
124 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,117 @@ | ||
| include $(TOPDIR)/fs/xfs/Makefile-linux-$(VERSION).$(PATCHLEVEL) | ||
| # | ||
| # Copyright (c) 2000-2005 Silicon Graphics, Inc. | ||
| # All Rights Reserved. | ||
| # | ||
| # This program is free software; you can redistribute it and/or | ||
| # modify it under the terms of the GNU General Public License as | ||
| # published by the Free Software Foundation. | ||
| # | ||
| # This program is distributed in the hope that it would be useful, | ||
| # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| # GNU General Public License for more details. | ||
| # | ||
| # You should have received a copy of the GNU General Public License | ||
| # along with this program; if not, write the Free Software Foundation, | ||
| # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
| # | ||
|
|
||
| EXTRA_CFLAGS += -I$(src) -I$(src)/linux-2.6 -funsigned-char | ||
|
|
||
| XFS_LINUX := linux-2.6 | ||
|
|
||
| ifeq ($(CONFIG_XFS_DEBUG),y) | ||
| EXTRA_CFLAGS += -g | ||
| endif | ||
|
|
||
| obj-$(CONFIG_XFS_FS) += xfs.o | ||
|
|
||
| xfs-$(CONFIG_XFS_QUOTA) += $(addprefix quota/, \ | ||
| xfs_dquot.o \ | ||
| xfs_dquot_item.o \ | ||
| xfs_trans_dquot.o \ | ||
| xfs_qm_syscalls.o \ | ||
| xfs_qm_bhv.o \ | ||
| xfs_qm.o) | ||
|
|
||
| ifeq ($(CONFIG_XFS_QUOTA),y) | ||
| xfs-$(CONFIG_PROC_FS) += quota/xfs_qm_stats.o | ||
| endif | ||
|
|
||
| xfs-$(CONFIG_XFS_RT) += xfs_rtalloc.o | ||
| xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o | ||
| xfs-$(CONFIG_PROC_FS) += $(XFS_LINUX)/xfs_stats.o | ||
| xfs-$(CONFIG_SYSCTL) += $(XFS_LINUX)/xfs_sysctl.o | ||
| xfs-$(CONFIG_COMPAT) += $(XFS_LINUX)/xfs_ioctl32.o | ||
|
|
||
|
|
||
| xfs-y += xfs_alloc.o \ | ||
| xfs_alloc_btree.o \ | ||
| xfs_attr.o \ | ||
| xfs_attr_leaf.o \ | ||
| xfs_bit.o \ | ||
| xfs_bmap.o \ | ||
| xfs_bmap_btree.o \ | ||
| xfs_btree.o \ | ||
| xfs_buf_item.o \ | ||
| xfs_da_btree.o \ | ||
| xfs_dir2.o \ | ||
| xfs_dir2_block.o \ | ||
| xfs_dir2_data.o \ | ||
| xfs_dir2_leaf.o \ | ||
| xfs_dir2_node.o \ | ||
| xfs_dir2_sf.o \ | ||
| xfs_error.o \ | ||
| xfs_extfree_item.o \ | ||
| xfs_filestream.o \ | ||
| xfs_fsops.o \ | ||
| xfs_ialloc.o \ | ||
| xfs_ialloc_btree.o \ | ||
| xfs_iget.o \ | ||
| xfs_inode.o \ | ||
| xfs_inode_item.o \ | ||
| xfs_iomap.o \ | ||
| xfs_itable.o \ | ||
| xfs_dfrag.o \ | ||
| xfs_log.o \ | ||
| xfs_log_recover.o \ | ||
| xfs_mount.o \ | ||
| xfs_mru_cache.o \ | ||
| xfs_rename.o \ | ||
| xfs_trans.o \ | ||
| xfs_trans_ail.o \ | ||
| xfs_trans_buf.o \ | ||
| xfs_trans_extfree.o \ | ||
| xfs_trans_inode.o \ | ||
| xfs_trans_item.o \ | ||
| xfs_utils.o \ | ||
| xfs_vfsops.o \ | ||
| xfs_vnodeops.o \ | ||
| xfs_rw.o \ | ||
| xfs_dmops.o \ | ||
| xfs_qmops.o | ||
|
|
||
| xfs-$(CONFIG_XFS_TRACE) += xfs_dir2_trace.o | ||
|
|
||
| # Objects in linux/ | ||
| xfs-y += $(addprefix $(XFS_LINUX)/, \ | ||
| kmem.o \ | ||
| xfs_aops.o \ | ||
| xfs_buf.o \ | ||
| xfs_export.o \ | ||
| xfs_file.o \ | ||
| xfs_fs_subr.o \ | ||
| xfs_globals.o \ | ||
| xfs_ioctl.o \ | ||
| xfs_iops.o \ | ||
| xfs_lrw.o \ | ||
| xfs_super.o \ | ||
| xfs_vnode.o) | ||
|
|
||
| # Objects in support/ | ||
| xfs-y += $(addprefix support/, \ | ||
| debug.o \ | ||
| uuid.o) | ||
|
|
||
| xfs-$(CONFIG_XFS_TRACE) += support/ktrace.o | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,117 +0,0 @@ | ||
| # | ||
| # Copyright (c) 2000-2005 Silicon Graphics, Inc. | ||
| # All Rights Reserved. | ||
| # | ||
| # This program is free software; you can redistribute it and/or | ||
| # modify it under the terms of the GNU General Public License as | ||
| # published by the Free Software Foundation. | ||
| # | ||
| # This program is distributed in the hope that it would be useful, | ||
| # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| # GNU General Public License for more details. | ||
| # | ||
| # You should have received a copy of the GNU General Public License | ||
| # along with this program; if not, write the Free Software Foundation, | ||
| # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
| # | ||
|
|
||
| EXTRA_CFLAGS += -Ifs/xfs -Ifs/xfs/linux-2.6 -funsigned-char | ||
|
|
||
| XFS_LINUX := linux-2.6 | ||
|
|
||
| ifeq ($(CONFIG_XFS_DEBUG),y) | ||
| EXTRA_CFLAGS += -g | ||
| endif | ||
|
|
||
| obj-$(CONFIG_XFS_FS) += xfs.o | ||
|
|
||
| xfs-$(CONFIG_XFS_QUOTA) += $(addprefix quota/, \ | ||
| xfs_dquot.o \ | ||
| xfs_dquot_item.o \ | ||
| xfs_trans_dquot.o \ | ||
| xfs_qm_syscalls.o \ | ||
| xfs_qm_bhv.o \ | ||
| xfs_qm.o) | ||
|
|
||
| ifeq ($(CONFIG_XFS_QUOTA),y) | ||
| xfs-$(CONFIG_PROC_FS) += quota/xfs_qm_stats.o | ||
| endif | ||
|
|
||
| xfs-$(CONFIG_XFS_RT) += xfs_rtalloc.o | ||
| xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o | ||
| xfs-$(CONFIG_PROC_FS) += $(XFS_LINUX)/xfs_stats.o | ||
| xfs-$(CONFIG_SYSCTL) += $(XFS_LINUX)/xfs_sysctl.o | ||
| xfs-$(CONFIG_COMPAT) += $(XFS_LINUX)/xfs_ioctl32.o | ||
|
|
||
|
|
||
| xfs-y += xfs_alloc.o \ | ||
| xfs_alloc_btree.o \ | ||
| xfs_attr.o \ | ||
| xfs_attr_leaf.o \ | ||
| xfs_bit.o \ | ||
| xfs_bmap.o \ | ||
| xfs_bmap_btree.o \ | ||
| xfs_btree.o \ | ||
| xfs_buf_item.o \ | ||
| xfs_da_btree.o \ | ||
| xfs_dir2.o \ | ||
| xfs_dir2_block.o \ | ||
| xfs_dir2_data.o \ | ||
| xfs_dir2_leaf.o \ | ||
| xfs_dir2_node.o \ | ||
| xfs_dir2_sf.o \ | ||
| xfs_error.o \ | ||
| xfs_extfree_item.o \ | ||
| xfs_filestream.o \ | ||
| xfs_fsops.o \ | ||
| xfs_ialloc.o \ | ||
| xfs_ialloc_btree.o \ | ||
| xfs_iget.o \ | ||
| xfs_inode.o \ | ||
| xfs_inode_item.o \ | ||
| xfs_iomap.o \ | ||
| xfs_itable.o \ | ||
| xfs_dfrag.o \ | ||
| xfs_log.o \ | ||
| xfs_log_recover.o \ | ||
| xfs_mount.o \ | ||
| xfs_mru_cache.o \ | ||
| xfs_rename.o \ | ||
| xfs_trans.o \ | ||
| xfs_trans_ail.o \ | ||
| xfs_trans_buf.o \ | ||
| xfs_trans_extfree.o \ | ||
| xfs_trans_inode.o \ | ||
| xfs_trans_item.o \ | ||
| xfs_utils.o \ | ||
| xfs_vfsops.o \ | ||
| xfs_vnodeops.o \ | ||
| xfs_rw.o \ | ||
| xfs_dmops.o \ | ||
| xfs_qmops.o | ||
|
|
||
| xfs-$(CONFIG_XFS_TRACE) += xfs_dir2_trace.o | ||
|
|
||
| # Objects in linux/ | ||
| xfs-y += $(addprefix $(XFS_LINUX)/, \ | ||
| kmem.o \ | ||
| xfs_aops.o \ | ||
| xfs_buf.o \ | ||
| xfs_export.o \ | ||
| xfs_file.o \ | ||
| xfs_fs_subr.o \ | ||
| xfs_globals.o \ | ||
| xfs_ioctl.o \ | ||
| xfs_iops.o \ | ||
| xfs_lrw.o \ | ||
| xfs_super.o \ | ||
| xfs_vnode.o) | ||
|
|
||
| # Objects in support/ | ||
| xfs-y += $(addprefix support/, \ | ||
| debug.o \ | ||
| uuid.o) | ||
|
|
||
| xfs-$(CONFIG_XFS_TRACE) += support/ktrace.o | ||
|
|
||