Merge git://oss.sgi.com:8090/oss/git/xfs-2.6

Linus Torvalds
2 parents 03981f2427 c9fc0d6a69
Showing 1 changed file Side-by-side Diff
fs/xfs/Makefile-linux-2.6
 #
-# Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
+# 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 version 2 of the GNU General Public License as
@@ -55,7 +55,18 @@
 endif
  
 obj-$(CONFIG_XFS_FS)		+= xfs.o
-xfs-$(CONFIG_XFS_QUOTA)		+= quota/
+
+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
1	1	#
2		-# Copyright (c) 2000-2004 Silicon Graphics, Inc. All Rights Reserved.
	2	+# Copyright (c) 2000-2005 Silicon Graphics, Inc. All Rights Reserved.
3	3	#
4	4	# This program is free software; you can redistribute it and/or modify it
5	5	# under the terms of version 2 of the GNU General Public License as
...	...	@@ -55,7 +55,18 @@
55	55	endif
56	56
57	57	obj-$(CONFIG_XFS_FS) += xfs.o
58		-xfs-$(CONFIG_XFS_QUOTA) += quota/
	58	+
	59	+xfs-$(CONFIG_XFS_QUOTA) += $(addprefix quota/, \
	60	+ xfs_dquot.o \
	61	+ xfs_dquot_item.o \
	62	+ xfs_trans_dquot.o \
	63	+ xfs_qm_syscalls.o \
	64	+ xfs_qm_bhv.o \
	65	+ xfs_qm.o)
	66	+
	67	+ifeq ($(CONFIG_XFS_QUOTA),y)
	68	+xfs-$(CONFIG_PROC_FS) += quota/xfs_qm_stats.o
	69	+endif
59	70
60	71	xfs-$(CONFIG_XFS_RT) += xfs_rtalloc.o
61	72	xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o