Commit 58b7983d authored by Andi Kleen's avatar Andi Kleen Committed by Lachlan McIlroy
Browse files

[XFS] Remove Makefile wrappers in XFS 



Makefile (and Kbuild) would include Makefile-linux-26 I doubt XFS will
really still compile on 2.4; so drop that. This moves Makefile-linux-26
into Makefile and drops Kbuild. Also having wrappers as both Kbuild and
Makefile seemed redundant anyways.

The patch is relatively large because it renames a file, but no functional
changes.

SGI-PV: 971050
SGI-Modid: xfs-linux-melb:xfs-kern:29781a

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarDonald Douwsma <donaldd@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent de2eeea6

fs/xfs/Kbuild

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#

# The xfs people like to share Makefile with 2.6 and 2.4.

# Utilise file named Kbuild file which has precedence over Makefile.

#



include $(srctree)/$(obj)/Makefile-linux-2.6

fs/xfs/Makefile

+122 −1
Original line number Diff line number Diff line 
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 +=	 -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

obj-$(CONFIG_XFS_QUOTA)		+= quota/

obj-$(CONFIG_XFS_DMAPI)		+= dmapi/



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 \

				   xfs_ksyms.o)



# Objects in support/

xfs-y				+= $(addprefix support/, \

				   debug.o \

				   uuid.o)



xfs-$(CONFIG_XFS_TRACE)		+= support/ktrace.o



# If both xfs and kdb modules are built in then xfsidbg is built in.  If xfs is

# a module and kdb modules are being compiled then xfsidbg must be a module, to

# follow xfs.  If xfs is built in then xfsidbg tracks the kdb module state.

# This must come after the main xfs code so xfs initialises before xfsidbg.

# KAO

ifneq ($(CONFIG_KDB_MODULES),)

  ifeq ($(CONFIG_XFS_FS),y)

    obj-$(CONFIG_KDB_MODULES)	+= xfsidbg.o

  else

    obj-$(CONFIG_XFS_FS)	+= xfsidbg.o

  endif

endif



CFLAGS_xfsidbg.o += -Iarch/$(ARCH)/kdb

fs/xfs/Makefile-linux-2.6

+0 −117
Original line number Diff line number Diff line 
#

# 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

CRA Git | Maintained and supported by SUSTech CRA and CCSE