aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Scott <nathans@bruce>2005-09-08 15:38:52 +1000
committerNathan Scott <nathans@bruce>2005-09-08 15:38:52 +1000
commiteccdfcd6f8265300380fa14a83aeb14e69830323 (patch)
tree04449986928d7666798a269080545d296f465b8b
parent20ba02879bc78cdf1ed89a1c6a92ee55d31ee103 (diff)
[XFS] Fix modular XFS builds (Makefile botch).
Signed-off-by: Nathan Scott <nathans@sgi.com>
-rw-r--r--fs/xfs/Makefile-linux-2.62
-rw-r--r--fs/xfs/quota/Makefile-linux-2.68
2 files changed, 5 insertions, 5 deletions
diff --git a/fs/xfs/Makefile-linux-2.6 b/fs/xfs/Makefile-linux-2.6
index fbfcbe5a7cd..8e18ff15724 100644
--- a/fs/xfs/Makefile-linux-2.6
+++ b/fs/xfs/Makefile-linux-2.6
@@ -55,7 +55,7 @@ ifeq ($(CONFIG_XFS_TRACE),y)
endif
obj-$(CONFIG_XFS_FS) += xfs.o
-obj-$(CONFIG_XFS_QUOTA) += quota/
+xfs-$(CONFIG_XFS_QUOTA) += quota/
xfs-$(CONFIG_XFS_RT) += xfs_rtalloc.o
xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o
diff --git a/fs/xfs/quota/Makefile-linux-2.6 b/fs/xfs/quota/Makefile-linux-2.6
index 8b7b676718b..93e60e83935 100644
--- a/fs/xfs/quota/Makefile-linux-2.6
+++ b/fs/xfs/quota/Makefile-linux-2.6
@@ -41,13 +41,13 @@ ifeq ($(CONFIG_XFS_TRACE),y)
EXTRA_CFLAGS += -DXFS_VNODE_TRACE
endif
-obj-$(CONFIG_XFS_QUOTA) += xfs_quota.o
-
-xfs_quota-y += xfs_dquot.o \
+xfs-$(CONFIG_XFS_QUOTA) += xfs_dquot.o \
xfs_dquot_item.o \
xfs_trans_dquot.o \
xfs_qm_syscalls.o \
xfs_qm_bhv.o \
xfs_qm.o
-xfs_quota-$(CONFIG_PROC_FS) += xfs_qm_stats.o
+ifeq ($(CONFIG_XFS_QUOTA),y)
+xfs-$(CONFIG_PROC_FS) += xfs_qm_stats.o
+endif